Revert "Merge pull request #9879 from appwrite/revert-9865-feat-sequence"

This reverts commit d8904af909, reversing changes made to a366feba80. # Conflicts: # composer.lock
Merge branch 'feat-sync' of github.com:appwrite/appwrite into feat-sync
2026-05-26 13:51:13 +00:00 · 2025-05-26 17:07:35 +12:00 · 2025-05-26 17:05:37 +12:00 · 2025-05-26 17:00:55 +12:00 · 2025-05-25 11:15:06 -07:00 · 2025-05-25 19:45:23 +02:00
22866 changed files with 141145 additions and 37979 deletions
@@ -15,6 +15,7 @@ _APP_SYSTEM_TEAM_EMAIL=team@appwrite.io
 _APP_EMAIL_SECURITY=security@appwrite.io
 _APP_EMAIL_CERTIFICATES=certificates@appwrite.io
 _APP_SYSTEM_RESPONSE_FORMAT=
+_APP_CUSTOM_DOMAIN_DENY_LIST=
 _APP_OPTIONS_ABUSE=disabled
 _APP_OPTIONS_ROUTER_PROTECTION=disabled
 _APP_OPTIONS_FORCE_HTTPS=disabled
@@ -23,7 +24,7 @@ _APP_OPENSSL_KEY_V1=your-secret-key
 _APP_DOMAIN=traefik
 _APP_DOMAIN_FUNCTIONS=functions.localhost
 _APP_DOMAIN_SITES=sites.localhost
-_APP_DOMAIN_TARGET_CNAME=test.appwrite.io
+_APP_DOMAIN_TARGET_CNAME=test.localhost
 _APP_DOMAIN_TARGET_A=127.0.0.1
 _APP_DOMAIN_TARGET_AAAA=::1
 _APP_RULES_FORMAT=md5
@@ -86,7 +87,7 @@ _APP_EXECUTOR_HOST=http://exc1/v1
 _APP_FUNCTIONS_RUNTIMES=php-8.0,node-18.0,python-3.9,ruby-3.1
 _APP_SITES_RUNTIMES=static-1,node-22,flutter-3.29
 _APP_MAINTENANCE_INTERVAL=86400
-_APP_MAINTENANCE_DELAY=
+_APP_MAINTENANCE_START_TIME=12:00
 _APP_MAINTENANCE_RETENTION_CACHE=2592000
 _APP_MAINTENANCE_RETENTION_EXECUTION=1209600
 _APP_MAINTENANCE_RETENTION_ABUSE=86400
@@ -1,25 +1,46 @@
-name: "Console SDK Preview"
+name: "SDK Preview"

 on:
  pull_request:
    paths:
      - 'app/config/specs/*-latest-console.json'
-
+  workflow_dispatch:
+    inputs:
+      platform:
+        type: choice
+        description: "Platform to build"
+        options:
+          - client
+          - server

 jobs:
  setup:
-    name: Setup & Build Console SDK
+    name: Setup & Build SDK
    runs-on: ubuntu-latest
    steps:
      - name: Checkout repository
        uses: actions/checkout@v4
+
+      - name: Set SDK type
+        id: set-sdk
+        run: |
+          PLATFORM="${{ github.event.inputs.platform }}"
+          if [ -z "$PLATFORM" ]; then
+            PLATFORM="console"
+          fi
+          if [ "$PLATFORM" = "server" ]; then
+            echo "sdk_type=nodejs" >> $GITHUB_OUTPUT
+          else
+            echo "sdk_type=web" >> $GITHUB_OUTPUT
+          fi
+          echo "platform=$PLATFORM" >> $GITHUB_OUTPUT
        
      - name: Load and Start Appwrite
        run: |
          docker compose build
          docker compose up -d
-          docker compose exec appwrite sdks --platform=console --sdk=web --version=latest --git=no
-          sudo chown -R $USER:$USER ./app/sdks/console-web
+          docker compose exec appwrite sdks --platform=${{ steps.set-sdk.outputs.platform }} --sdk=${{ steps.set-sdk.outputs.sdk_type }} --version=latest --git=no
+          sudo chown -R $USER:$USER ./app/sdks/${{ steps.set-sdk.outputs.platform }}-${{ steps.set-sdk.outputs.sdk_type }}
          
      - uses: actions/setup-node@v4
        with:
@@ -156,6 +156,7 @@ jobs:
          Sites,
          Proxy,
          Storage,
+          Tokens,
          Teams,
          Users,
          Webhooks,
@@ -302,7 +303,7 @@ jobs:
          docker compose up -d
          sleep 30

-      - name: Run Projects tests with dev keys in ${{ matrix.tables-mode }} table mode
+      - name: Run Projects tests with dev keys in dedicated table mode
        run: |
          echo "Using project tables"
          export _APP_DATABASE_SHARED_TABLES=
@@ -1,3 +1,267 @@
+# Version 1.6.2
+
+## What's Changed
+
+### Notable changes
+
+* Delete git folder to reduce build size in [9076](https://github.com/appwrite/appwrite/pull/9076)
+* Upgrade assistant in [9100](https://github.com/appwrite/appwrite/pull/9100)
+* Use redis adapter for abuse in [9121](https://github.com/appwrite/appwrite/pull/9121)
+* Set base specification CPUs to 0.5 again in [9146](https://github.com/appwrite/appwrite/pull/9146)
+* Add new push message parameters in [9060](https://github.com/appwrite/appwrite/pull/9060)
+* Update audits to include user type in [9211](https://github.com/appwrite/appwrite/pull/9211)
+* Enable HEIC in [9251](https://github.com/appwrite/appwrite/pull/9251)
+* Added teamName to membership redirect url in [9269](https://github.com/appwrite/appwrite/pull/9269)
+* Add support endpoint url for S3 in [9303](https://github.com/appwrite/appwrite/pull/9303)
+* Added RuPay Credit Card Icon in Avatars Service in [5046](https://github.com/appwrite/appwrite/pull/5046)
+* Add figma oauth provider in [9623](https://github.com/appwrite/appwrite/pull/9623)
+* Update console to version 5.2.58 in [9637](https://github.com/appwrite/appwrite/pull/9637)
+
+### Fixes
+
+* Remove failed attribute in [9032](https://github.com/appwrite/appwrite/pull/9032)
+* Fix delete notFound attribute in [9038](https://github.com/appwrite/appwrite/pull/9038)
+* 🇮🇸 Added missing Icelandic translations for email strings. in [4848](https://github.com/appwrite/appwrite/pull/4848)
+* fix doc comment for filter method in [5769](https://github.com/appwrite/appwrite/pull/5769)
+* Delete attribute No throwing Exception on not found in [9157](https://github.com/appwrite/appwrite/pull/9157)
+* Fix VCS identity collision in [9138](https://github.com/appwrite/appwrite/pull/9138)
+* Fix disabling of email-otp when user wants to in [9200](https://github.com/appwrite/appwrite/pull/9200)
+* Ensure user can delete session in [9209](https://github.com/appwrite/appwrite/pull/9209)
+* Fix resend invitation in [9218](https://github.com/appwrite/appwrite/pull/9218)
+* Fix phone number parsing exception handling in [9246](https://github.com/appwrite/appwrite/pull/9246)
+* Fix amazon oauth in [9253](https://github.com/appwrite/appwrite/pull/9253)
+* Fix slack oauth scopes, and updated to v2 in [9228](https://github.com/appwrite/appwrite/pull/9228)
+* Fix forwarded user agent in [9271](https://github.com/appwrite/appwrite/pull/9271)
+* Fix WEBP File Preview Rendering Issue in [9321](https://github.com/appwrite/appwrite/pull/9321)
+* Fix build memory specifications in [9360](https://github.com/appwrite/appwrite/pull/9360)
+* Fix Self Hosting functions by adding missed config in [9373](https://github.com/appwrite/appwrite/pull/9373)
+* Fix resend team invite if already accepted in [9348](https://github.com/appwrite/appwrite/pull/9348)
+* Fix null errors on team invite in [9391](https://github.com/appwrite/appwrite/pull/9391)
+* Fix email (smtp) to multiple recipients in [9243](https://github.com/appwrite/appwrite/pull/9243)
+* Fix stats timing by using receivedAt date when available in [9428](https://github.com/appwrite/appwrite/pull/9428)
+* Make min/max params optional for attribute update in [9387](https://github.com/appwrite/appwrite/pull/9387)
+* Fix blocking of phone sessions when disabled on console in [9447](https://github.com/appwrite/appwrite/pull/9447)
+* Fix logging config in [9467](https://github.com/appwrite/appwrite/pull/9467)
+* Update audit timestamp origin in [9481](https://github.com/appwrite/appwrite/pull/9481)
+* Fix certificates in deletes worker in [9466](https://github.com/appwrite/appwrite/pull/9466)
+* Fix console audits delete in [9547](https://github.com/appwrite/appwrite/pull/9547)
+* Fix migrations in [9633](https://github.com/appwrite/appwrite/pull/9633)
+* Ensure all 4xx errors in OAuth redirect lead to the failure URL in [9679](https://github.com/appwrite/appwrite/pull/9679)
+* Treat 0 as unlimited for CPUs and memory in [9638](https://github.com/appwrite/appwrite/pull/9638)
+* Add contextual dispatch logic to fix high CPU usage in [9687](https://github.com/appwrite/appwrite/pull/9687)
+
+### Miscellaneous
+
+* Merge 1.6.x into feat-custom-cf-hostnames in [8904](https://github.com/appwrite/appwrite/pull/8904)
+* Improve compression param checks in [8922](https://github.com/appwrite/appwrite/pull/8922)
+* upgrade utopia storage in [8930](https://github.com/appwrite/appwrite/pull/8930)
+* Feat migration in [8797](https://github.com/appwrite/appwrite/pull/8797)
+* feat fix web routes in [8962](https://github.com/appwrite/appwrite/pull/8962)
+* Fix no pool access in [9027](https://github.com/appwrite/appwrite/pull/9027)
+* feat: use environment variable to check rules format in [9039](https://github.com/appwrite/appwrite/pull/9039)
+* Update storage.php in [9037](https://github.com/appwrite/appwrite/pull/9037)
+* Upgrade db 0.53.200 in [9050](https://github.com/appwrite/appwrite/pull/9050)
+* Chore: upgrade utopia storage in [9066](https://github.com/appwrite/appwrite/pull/9066)
+* Update usage-dump payload in [9085](https://github.com/appwrite/appwrite/pull/9085)
+* GitHub Workflows security hardening in [3728](https://github.com/appwrite/appwrite/pull/3728)
+* Update add-oauth2-provider.md in [4313](https://github.com/appwrite/appwrite/pull/4313)
+* update readme-cn some doc in [5278](https://github.com/appwrite/appwrite/pull/5278)
+* Add accessibility features in [7042](https://github.com/appwrite/appwrite/pull/7042)
+* Add Appwrite Cloud to read me. in [5445](https://github.com/appwrite/appwrite/pull/5445)
+* Migration throw error in [9092](https://github.com/appwrite/appwrite/pull/9092)
+* Fix usage payload bug in [9097](https://github.com/appwrite/appwrite/pull/9097)
+* chore: replace occurrences of dbForConsole to dbForPlatform in [9096](https://github.com/appwrite/appwrite/pull/9096)
+* fix(realtime): decrement connectionCounter only if connection is known in [9055](https://github.com/appwrite/appwrite/pull/9055)
+* payload bug fix in [9098](https://github.com/appwrite/appwrite/pull/9098)
+* Fix usage payload bug in [9099](https://github.com/appwrite/appwrite/pull/9099)
+* Usage payload debug in [9101](https://github.com/appwrite/appwrite/pull/9101)
+* Usage payload debug in [9103](https://github.com/appwrite/appwrite/pull/9103)
+* Usage payload debug in [9104](https://github.com/appwrite/appwrite/pull/9104)
+* Feat: createFunction abuse labels in [9102](https://github.com/appwrite/appwrite/pull/9102)
+* Docs-create-document in [9105](https://github.com/appwrite/appwrite/pull/9105)
+* Docs: Create document and unknown attribute error messages. in [5427](https://github.com/appwrite/appwrite/pull/5427)
+* Fix: update project accessed at from router and schedulers in [9109](https://github.com/appwrite/appwrite/pull/9109)
+* chore: initial commit in [9111](https://github.com/appwrite/appwrite/pull/9111)
+* chore: optimise webhooks payload in [9115](https://github.com/appwrite/appwrite/pull/9115)
+* Revert "chore: initial commit" in [9117](https://github.com/appwrite/appwrite/pull/9117)
+* chore: fix attribute name in [9118](https://github.com/appwrite/appwrite/pull/9118)
+* Migrate to redis abuse in [9124](https://github.com/appwrite/appwrite/pull/9124)
+* Added webhooks usage stats in [9125](https://github.com/appwrite/appwrite/pull/9125)
+* chore remove abuse cleanup in [9137](https://github.com/appwrite/appwrite/pull/9137)
+* fix: remove abuse delete trigger in [9139](https://github.com/appwrite/appwrite/pull/9139)
+* Remove firebase OAuth API endpoints in [9144](https://github.com/appwrite/appwrite/pull/9144)
+* chore: release client sdks in [9112](https://github.com/appwrite/appwrite/pull/9112)
+* Update general.php in [9155](https://github.com/appwrite/appwrite/pull/9155)
+* feat(swoole): allow configuration override of available cpus in [9177](https://github.com/appwrite/appwrite/pull/9177)
+* Usage databases api read writes addition in [9142](https://github.com/appwrite/appwrite/pull/9142)
+* Fix dead connections in [9190](https://github.com/appwrite/appwrite/pull/9190)
+* Add hostname to audits in [9165](https://github.com/appwrite/appwrite/pull/9165)
+* chore: shifted authphone usage tracking to api calls in [9191](https://github.com/appwrite/appwrite/pull/9191)
+* Revert "Fix dead connections" in [9201](https://github.com/appwrite/appwrite/pull/9201)
+* Add assertEventually to messaging provider logs test in [9192](https://github.com/appwrite/appwrite/pull/9192)
+* feat project sms usage in [9198](https://github.com/appwrite/appwrite/pull/9198)
+* chore: add audit labels to project resources in [9056](https://github.com/appwrite/appwrite/pull/9056)
+* fix sms usage in [9207](https://github.com/appwrite/appwrite/pull/9207)
+* Update database in [9202](https://github.com/appwrite/appwrite/pull/9202)
+* Fix dead connections in [9213](https://github.com/appwrite/appwrite/pull/9213)
+* Revert "Fix dead connections" in [9214](https://github.com/appwrite/appwrite/pull/9214)
+* Add logs db init for consistency in [9163](https://github.com/appwrite/appwrite/pull/9163)
+* Split the collection definitions in [9153](https://github.com/appwrite/appwrite/pull/9153)
+* Log path with populated parameters in [9220](https://github.com/appwrite/appwrite/pull/9220)
+* Add missing scope on function template in [9208](https://github.com/appwrite/appwrite/pull/9208)
+* Add relatedCollection default in [9225](https://github.com/appwrite/appwrite/pull/9225)
+* fix: function usage in [9235](https://github.com/appwrite/appwrite/pull/9235)
+* feat: optimise events payloads in [9232](https://github.com/appwrite/appwrite/pull/9232)
+* Optimise webhook events in [9168](https://github.com/appwrite/appwrite/pull/9168)
+* fix: maintenance job missing type in [9238](https://github.com/appwrite/appwrite/pull/9238)
+* Update Fetch to 0.3.0 in [9245](https://github.com/appwrite/appwrite/pull/9245)
+* Fix maintenance job in [9247](https://github.com/appwrite/appwrite/pull/9247)
+* chore: add missing case for executions in [9248](https://github.com/appwrite/appwrite/pull/9248)
+* Add index dependency exception in [9226](https://github.com/appwrite/appwrite/pull/9226)
+* chore: fix benchmarking test when made from fork in [9233](https://github.com/appwrite/appwrite/pull/9233)
+* Update SDK Generator versions in [9188](https://github.com/appwrite/appwrite/pull/9188)
+* chore: skipped job instead of throwing error in [9250](https://github.com/appwrite/appwrite/pull/9250)
+* Implement new SDK Class on 1.6.x in [9237](https://github.com/appwrite/appwrite/pull/9237)
+* Delete collection before Appwrite's attributes in [9256](https://github.com/appwrite/appwrite/pull/9256)
+* Feat batch usage dump in [9255](https://github.com/appwrite/appwrite/pull/9255)
+* Fix cloud tests in [9261](https://github.com/appwrite/appwrite/pull/9261)
+* Usage: Databases reads writes in [9260](https://github.com/appwrite/appwrite/pull/9260)
+* Update: Latest sdk specs in [9274](https://github.com/appwrite/appwrite/pull/9274)
+* Revert "Feat batch usage dump" in [9276](https://github.com/appwrite/appwrite/pull/9276)
+* feat: add fast2SMS adapter in [9263](https://github.com/appwrite/appwrite/pull/9263)
+* Update Sdk Generator dependency in [9280](https://github.com/appwrite/appwrite/pull/9280)
+* Transformed at addition in [9281](https://github.com/appwrite/appwrite/pull/9281)
+* Docs: clarify update endpoints only work on draft messages in [9236](https://github.com/appwrite/appwrite/pull/9236)
+* Update sdk generator dependency in [9282](https://github.com/appwrite/appwrite/pull/9282)
+* Revert "Transformed at addition" in [9284](https://github.com/appwrite/appwrite/pull/9284)
+* replaced init for cloud link in [9285](https://github.com/appwrite/appwrite/pull/9285)
+* Add transformed at in [9289](https://github.com/appwrite/appwrite/pull/9289)
+* Make migrations use Dynamic keys for destination in [9291](https://github.com/appwrite/appwrite/pull/9291)
+* Make sessions limit tests assert eventually in [9298](https://github.com/appwrite/appwrite/pull/9298)
+* Chore update database in [9306](https://github.com/appwrite/appwrite/pull/9306)
+* feat: add AMQP queues in [9287](https://github.com/appwrite/appwrite/pull/9287)
+* fix(test): use assertEventually instead of while(true) in [9308](https://github.com/appwrite/appwrite/pull/9308)
+* fix(certificate worker): events are published without queue name in [9309](https://github.com/appwrite/appwrite/pull/9309)
+* chore: update utopia-php/queue to 0.8.1 in [9311](https://github.com/appwrite/appwrite/pull/9311)
+* chore: update utopia-php/queue to 0.8.2 in [9312](https://github.com/appwrite/appwrite/pull/9312)
+* fix(schedule-tasks): revert back to direct pool usage in [9313](https://github.com/appwrite/appwrite/pull/9313)
+* feat: custom app schemes in [9262](https://github.com/appwrite/appwrite/pull/9262)
+* Revert "feat: custom app schemes" in [9319](https://github.com/appwrite/appwrite/pull/9319)
+* Restore "feat: custom app schemes"" in [9320](https://github.com/appwrite/appwrite/pull/9320)
+* Revert "Restore "feat: custom app schemes""" in [9323](https://github.com/appwrite/appwrite/pull/9323)
+* chore: update dependencies in [9330](https://github.com/appwrite/appwrite/pull/9330)
+* Feat: logs DB in [9272](https://github.com/appwrite/appwrite/pull/9272)
+* Catch invalid index in [9329](https://github.com/appwrite/appwrite/pull/9329)
+* Fix: missing call for image transformations counting in [9342](https://github.com/appwrite/appwrite/pull/9342)
+* Fix drop abuse on shared table project delete in [9346](https://github.com/appwrite/appwrite/pull/9346)
+* Only run all table mode tests on db update in [9338](https://github.com/appwrite/appwrite/pull/9338)
+* Fix: missing periodic metric in [9350](https://github.com/appwrite/appwrite/pull/9350)
+* feat(builds): check if function is blocked before building in [9332](https://github.com/appwrite/appwrite/pull/9332)
+* feat: batch create audit logs in [9347](https://github.com/appwrite/appwrite/pull/9347)
+* Chore: Update migrations in [9355](https://github.com/appwrite/appwrite/pull/9355)
+* Fix: metric time was not being written to DB in [9354](https://github.com/appwrite/appwrite/pull/9354)
+* Fix patch index validation in [9356](https://github.com/appwrite/appwrite/pull/9356)
+* Fix image trnasformation metrics in [9370](https://github.com/appwrite/appwrite/pull/9370)
+* Use batch delete in worker in [9375](https://github.com/appwrite/appwrite/pull/9375)
+* Fix Model Platform is missing response key: store  in [9361](https://github.com/appwrite/appwrite/pull/9361)
+* Feat key segmented usage in [9336](https://github.com/appwrite/appwrite/pull/9336)
+* Feat messaging metrics in [9353](https://github.com/appwrite/appwrite/pull/9353)
+* Fix removed audits for shared v2 in [9388](https://github.com/appwrite/appwrite/pull/9388)
+* chore: bump utopia-php/image to 0.8.0 in [9390](https://github.com/appwrite/appwrite/pull/9390)
+* Fix outdated CLI commands in documentation in [9122](https://github.com/appwrite/appwrite/pull/9122)
+* disable logs display in [9398](https://github.com/appwrite/appwrite/pull/9398)
+* Log batches per project in [9403](https://github.com/appwrite/appwrite/pull/9403)
+* Batch per project in [9410](https://github.com/appwrite/appwrite/pull/9410)
+* Fix: stats resources only queue projects accessed in last 3 hours in [9411](https://github.com/appwrite/appwrite/pull/9411)
+* Track options requests in [9397](https://github.com/appwrite/appwrite/pull/9397)
+* chore: bump docker-base in [9406](https://github.com/appwrite/appwrite/pull/9406)
+* refactor: migrate Realtime::send calls to queueForRealtime in [9325](https://github.com/appwrite/appwrite/pull/9325)
+* Revert "Fix: stats resources only queue projects accessed in last 3 hours" in [9424](https://github.com/appwrite/appwrite/pull/9424)
+* Remove usage and usage dump in favor of stats-usage and stats-usage-dump in [9339](https://github.com/appwrite/appwrite/pull/9339)
+* Fix: disable dual writing in [9429](https://github.com/appwrite/appwrite/pull/9429)
+* Disable transformedAt update for console users in [9425](https://github.com/appwrite/appwrite/pull/9425)
+* chore: add image transformation stats to usage endpoint in [9393](https://github.com/appwrite/appwrite/pull/9393)
+* chore: added timeout to deployment builds in tests in [9426](https://github.com/appwrite/appwrite/pull/9426)
+* fix: model for image transformations in usage project in [9442](https://github.com/appwrite/appwrite/pull/9442)
+* Feat: calculate database storage in stats-resources in [9443](https://github.com/appwrite/appwrite/pull/9443)
+* Activities batch writes in [9438](https://github.com/appwrite/appwrite/pull/9438)
+* chore: bump cache 0.12.x in [9412](https://github.com/appwrite/appwrite/pull/9412)
+* chore: queue console project for maintenance delete in [9479](https://github.com/appwrite/appwrite/pull/9479)
+* chore: added logsdb for deletes worker in [9462](https://github.com/appwrite/appwrite/pull/9462)
+* Feat: calculate and log time taken for each project in [9491](https://github.com/appwrite/appwrite/pull/9491)
+* chore: update initializing dbForLogs in [9494](https://github.com/appwrite/appwrite/pull/9494)
+* Feat bulk audit delete in [9487](https://github.com/appwrite/appwrite/pull/9487)
+* Prepare 1.6.2 release in [9499](https://github.com/appwrite/appwrite/pull/9499)
+* Regenerate specs in [9497](https://github.com/appwrite/appwrite/pull/9497)
+* Regenerate examples in [9498](https://github.com/appwrite/appwrite/pull/9498)
+* chore: bump sdk in [9414](https://github.com/appwrite/appwrite/pull/9414)
+* update queue to 0.9.* in [9505](https://github.com/appwrite/appwrite/pull/9505)
+* Feat improve delete queries in [9507](https://github.com/appwrite/appwrite/pull/9507)
+* Feat: Add rule attributes in [9508](https://github.com/appwrite/appwrite/pull/9508)
+* Sync main into 1.6.x in [9496](https://github.com/appwrite/appwrite/pull/9496)
+* Bump console to version 5.2.53 in [9495](https://github.com/appwrite/appwrite/pull/9495)
+* Prepare 1.6.1 release in [9294](https://github.com/appwrite/appwrite/pull/9294)
+* Improve delete ordering in [9512](https://github.com/appwrite/appwrite/pull/9512)
+* Cleanups in [9511](https://github.com/appwrite/appwrite/pull/9511)
+* Feat dynamic regions in [9408](https://github.com/appwrite/appwrite/pull/9408)
+* Feat env vars to system lib in [9515](https://github.com/appwrite/appwrite/pull/9515)
+* Feat: domains count in [9514](https://github.com/appwrite/appwrite/pull/9514)
+* Migration read from db in [9529](https://github.com/appwrite/appwrite/pull/9529)
+* feat: add pool telemetry in [9530](https://github.com/appwrite/appwrite/pull/9530)
+* Disable PDO persistence since we manage our own pool in [9526](https://github.com/appwrite/appwrite/pull/9526)
+* chore: set min operations to 1 for reads and writes in [9536](https://github.com/appwrite/appwrite/pull/9536)
+* Remove default region in [9430](https://github.com/appwrite/appwrite/pull/9430)
+* Use cursor pagination with bigger limit for maintenance project loop in [9546](https://github.com/appwrite/appwrite/pull/9546)
+* chore: stop tests on failure in [9525](https://github.com/appwrite/appwrite/pull/9525)
+* chore: only update total count for privileged users in [9554](https://github.com/appwrite/appwrite/pull/9554)
+* refactor: initialization of audit retention in [9563](https://github.com/appwrite/appwrite/pull/9563)
+* Delete worker queries fixes in [9523](https://github.com/appwrite/appwrite/pull/9523)
+* Bump database 0.62.x in [9568](https://github.com/appwrite/appwrite/pull/9568)
+* Fix: schedules region filtering in [9577](https://github.com/appwrite/appwrite/pull/9577)
+* Deletes worker fix selects for pagination in [9578](https://github.com/appwrite/appwrite/pull/9578)
+* Add $permissions for delete documents selects in [9579](https://github.com/appwrite/appwrite/pull/9579)
+* chore(audits): return queue pre-fetch results in [9533](https://github.com/appwrite/appwrite/pull/9533)
+* Revert "chore(audits): return queue pre-fetch results" in [9586](https://github.com/appwrite/appwrite/pull/9586)
+* Feat multi tenant insert in [9573](https://github.com/appwrite/appwrite/pull/9573)
+* Add order by for cursor in [9588](https://github.com/appwrite/appwrite/pull/9588)
+* Feat update fetch in [9592](https://github.com/appwrite/appwrite/pull/9592)
+* Fix tenant casting in [9598](https://github.com/appwrite/appwrite/pull/9598)
+* Feat update ws in [9602](https://github.com/appwrite/appwrite/pull/9602)
+* Update database in [9603](https://github.com/appwrite/appwrite/pull/9603)
+* Fix: image transformation cache in [9608](https://github.com/appwrite/appwrite/pull/9608)
+* Remove audit payload in [9610](https://github.com/appwrite/appwrite/pull/9610)
+* Sample rate from DSN in [9559](https://github.com/appwrite/appwrite/pull/9559)
+* Restrict role change for sole org owner in [9615](https://github.com/appwrite/appwrite/pull/9615)
+* chore: update php image to 0.8.1 in [9616](https://github.com/appwrite/appwrite/pull/9616)
+* feat: refactor executor setup in [9420](https://github.com/appwrite/appwrite/pull/9420)
+* chore: update gitpod.yml config in [9561](https://github.com/appwrite/appwrite/pull/9561)
+* chore: update dependencies in [9625](https://github.com/appwrite/appwrite/pull/9625)
+* Update migrations lib in [9628](https://github.com/appwrite/appwrite/pull/9628)
+* feat: cache telemetry in [9624](https://github.com/appwrite/appwrite/pull/9624)
+* Bump console to version 5.2.56 in [9631](https://github.com/appwrite/appwrite/pull/9631)
+* Multi region support in [8667](https://github.com/appwrite/appwrite/pull/8667)
+* Revert "Multi region support" in [9632](https://github.com/appwrite/appwrite/pull/9632)
+* Revert "Revert "Multi region support"" in [9636](https://github.com/appwrite/appwrite/pull/9636)
+* Fix tasks in [9644](https://github.com/appwrite/appwrite/pull/9644)
+* chore: updated the migration version to 8.6 in [9646](https://github.com/appwrite/appwrite/pull/9646)
+* Fix: merge the working of StatsUsage and StatsUsageDump in [9585](https://github.com/appwrite/appwrite/pull/9585)
+* Update database in [9643](https://github.com/appwrite/appwrite/pull/9643)
+* chore: fix error logging for CLI tasks in [9651](https://github.com/appwrite/appwrite/pull/9651)
+* fix: usage test assertion in [9653](https://github.com/appwrite/appwrite/pull/9653)
+* Fix keys in [9656](https://github.com/appwrite/appwrite/pull/9656)
+* Feat: multi tenant dual writing in [9583](https://github.com/appwrite/appwrite/pull/9583)
+* Fix/throwing 400 for null order attributes  in [9657](https://github.com/appwrite/appwrite/pull/9657)
+* feat: sdk group attribute in [9596](https://github.com/appwrite/appwrite/pull/9596)
+* Add configurable function and build size in [9648](https://github.com/appwrite/appwrite/pull/9648)
+* feat: update API endpoint in the code examples in [8933](https://github.com/appwrite/appwrite/pull/8933)
+* chore: abstract token secret hiding to response model in [9574](https://github.com/appwrite/appwrite/pull/9574)
+* chore: update sdks in [9655](https://github.com/appwrite/appwrite/pull/9655)
+* feat: allow non-critical events to ignore exceptions when enqueuing the event in [9680](https://github.com/appwrite/appwrite/pull/9680)
+* Revert "Add configurable function and build size" in [9681](https://github.com/appwrite/appwrite/pull/9681)
+* core: introduce endpoint.docs in specs in [9685](https://github.com/appwrite/appwrite/pull/9685)
+* fix: remove content-type header from get request specs in [9666](https://github.com/appwrite/appwrite/pull/9666)
+* chore: update flutter sdk in [9691](https://github.com/appwrite/appwrite/pull/9691)
+
 # Version 1.6.1

 ## What's Changed
@@ -415,8 +415,8 @@ In addition, you will also need to add some logic to the `reduce()` method of th

 ```php
 case $document->getCollection() === 'buckets':
-       $files = $dbForProject->getDocument('stats', md5(self::INFINITY_PERIOD . str_replace('{bucketInternalId}', $document->getInternalId(), METRIC_BUCKET_ID_FILES)));
-       $storage = $dbForProject->getDocument('stats', md5(self::INFINITY_PERIOD . str_replace('{bucketInternalId}', $document->getInternalId(), METRIC_BUCKET_ID_FILES_STORAGE)));
+       $files = $dbForProject->getDocument('stats', md5(self::INFINITY_PERIOD . str_replace('{bucketInternalId}', $document->getSequence(), METRIC_BUCKET_ID_FILES)));
+       $storage = $dbForProject->getDocument('stats', md5(self::INFINITY_PERIOD . str_replace('{bucketInternalId}', $document->getSequence(), METRIC_BUCKET_ID_FILES_STORAGE)));

       if (!empty($files['value'])) {
           $metrics[] = [
@@ -463,9 +463,9 @@ $queueForStatsUsage
  ->addMetric(METRIC_BUILDS, 1)
  ->addMetric(METRIC_BUILDS_STORAGE, $build->getAttribute('size', 0))
  ->addMetric(METRIC_BUILDS_COMPUTE, (int)$build->getAttribute('duration', 0) * 1000)
-  ->addMetric(str_replace('{functionInternalId}', $function->getInternalId(), METRIC_FUNCTION_ID_BUILDS), 1) 
-  ->addMetric(str_replace('{functionInternalId}', $function->getInternalId(), METRIC_FUNCTION_ID_BUILDS_STORAGE), $build->getAttribute('size', 0))
-  ->addMetric(str_replace('{functionInternalId}', $function->getInternalId(), METRIC_FUNCTION_ID_BUILDS_COMPUTE), (int)$build->getAttribute('duration', 0) * 1000)
+  ->addMetric(str_replace('{functionInternalId}', $function->getSequence(), METRIC_FUNCTION_ID_BUILDS), 1) 
+  ->addMetric(str_replace('{functionInternalId}', $function->getSequence(), METRIC_FUNCTION_ID_BUILDS_STORAGE), $build->getAttribute('size', 0))
+  ->addMetric(str_replace('{functionInternalId}', $function->getSequence(), METRIC_FUNCTION_ID_BUILDS_COMPUTE), (int)$build->getAttribute('duration', 0) * 1000)
  ->setProject($project)
  ->trigger();
 ```
@@ -89,7 +89,6 @@ RUN chmod +x /usr/local/bin/doctor && \
    chmod +x /usr/local/bin/worker-migrations && \
    chmod +x /usr/local/bin/worker-webhooks && \
    chmod +x /usr/local/bin/worker-stats-usage && \
-    chmod +x /usr/local/bin/worker-stats-usage-dump && \
    chmod +x /usr/local/bin/stats-resources && \
    chmod +x /usr/local/bin/worker-stats-resources

@@ -72,7 +72,7 @@ docker run -it --rm \
    --volume /var/run/docker.sock:/var/run/docker.sock \
    --volume "$(pwd)"/appwrite:/usr/src/code/appwrite:rw \
    --entrypoint="install" \
-    appwrite/appwrite:1.6.2
+    appwrite/appwrite:1.7.4
 ```

 ### Windows
@@ -84,7 +84,7 @@ docker run -it --rm ^
    --volume //var/run/docker.sock:/var/run/docker.sock ^
    --volume "%cd%"/appwrite:/usr/src/code/appwrite:rw ^
    --entrypoint="install" ^
-    appwrite/appwrite:1.6.2
+    appwrite/appwrite:1.7.4
 ```

 #### PowerShell
@@ -94,7 +94,7 @@ docker run -it --rm `
    --volume /var/run/docker.sock:/var/run/docker.sock `
    --volume ${pwd}/appwrite:/usr/src/code/appwrite:rw `
    --entrypoint="install" `
-    appwrite/appwrite:1.6.2
+    appwrite/appwrite:1.7.4
 ```

 运行后，可以在浏览器上访问 http://localhost 找到 Appwrite 控制台。在非 Linux 的本机主机上完成安装后，服务器可能需要几分钟才能启动。
@@ -1,4 +1,5 @@
 > [Get started with Appwrite](https://apwr.dev/appcloud)
+> [Join the Init kick off event 19th of May: The future of Appwrite with Founder & CEO Eldad Fux](https://www.youtube.com/watch?v=1g8tuogsp7A)

 <br />
 <p align="center">
@@ -77,7 +78,7 @@ docker run -it --rm \
    --volume /var/run/docker.sock:/var/run/docker.sock \
    --volume "$(pwd)"/appwrite:/usr/src/code/appwrite:rw \
    --entrypoint="install" \
-    appwrite/appwrite:1.6.2
+    appwrite/appwrite:1.7.4
 ```

 ### Windows
@@ -89,7 +90,7 @@ docker run -it --rm ^
    --volume //var/run/docker.sock:/var/run/docker.sock ^
    --volume "%cd%"/appwrite:/usr/src/code/appwrite:rw ^
    --entrypoint="install" ^
-    appwrite/appwrite:1.6.2
+    appwrite/appwrite:1.7.4
 ```

 #### PowerShell
@@ -99,7 +100,7 @@ docker run -it --rm `
    --volume /var/run/docker.sock:/var/run/docker.sock `
    --volume ${pwd}/appwrite:/usr/src/code/appwrite:rw `
    --entrypoint="install" `
-    appwrite/appwrite:1.6.2
+    appwrite/appwrite:1.7.4
 ```

 Once the Docker installation is complete, go to http://localhost to access the Appwrite console from your browser. Please note that on non-Linux native hosts, the server might take a few minutes to start after completing the installation.
@@ -10,11 +10,15 @@ use Appwrite\Event\StatsUsage;
 use Appwrite\Platform\Appwrite;
 use Appwrite\Runtimes\Runtimes;
 use Executor\Executor;
+use Swoole\Runtime;
+use Swoole\Timer;
+use Utopia\Cache\Adapter\Pool as CachePool;
 use Utopia\Cache\Adapter\Sharding;
 use Utopia\Cache\Cache;
 use Utopia\CLI\CLI;
 use Utopia\CLI\Console;
 use Utopia\Config\Config;
+use Utopia\Database\Adapter\Pool as DatabasePool;
 use Utopia\Database\Database;
 use Utopia\Database\Document;
 use Utopia\Database\Validator\Authorization;
@@ -22,9 +26,13 @@ use Utopia\DSN\DSN;
 use Utopia\Logger\Log;
 use Utopia\Platform\Service;
 use Utopia\Pools\Group;
+use Utopia\Queue\Broker\Pool as BrokerPool;
 use Utopia\Queue\Publisher;
 use Utopia\Registry\Registry;
 use Utopia\System\System;
+use Utopia\Telemetry\Adapter\None as NoTelemetry;
+
+use function Swoole\Coroutine\run;

 // overwriting runtimes to be architecture agnostic for CLI
 Config::setParam('runtimes', (new Runtimes('v5'))->getAll(supported: false));
@@ -41,10 +49,7 @@ CLI::setResource('cache', function ($pools) {
    $adapters = [];

    foreach ($list as $value) {
-        $adapters[] = $pools
-            ->get($value)
-            ->pop()
-            ->getResource();
+        $adapters[] = new CachePool($pools->get($value));
    }

    return new Cache(new Sharding($adapters));
@@ -64,12 +69,8 @@ CLI::setResource('dbForPlatform', function ($pools, $cache) {
        $attempts++;
        try {
            // Prepare database connection
-            $dbAdapter = $pools
-                ->get('console')
-                ->pop()
-                ->getResource();
-
-            $dbForPlatform = new Database($dbAdapter, $cache);
+            $adapter = new DatabasePool($pools->get('console'));
+            $dbForPlatform = new Database($adapter, $cache);

            $dbForPlatform
                ->setNamespace('_console')
@@ -87,7 +88,6 @@ CLI::setResource('dbForPlatform', function ($pools, $cache) {
            $ready = true;
        } catch (\Throwable $err) {
            Console::warning($err->getMessage());
-            $pools->get('console')->reclaim();
            sleep($sleep);
        }
    } while ($attempts < $maxAttempts && !$ready);
@@ -125,37 +125,33 @@ CLI::setResource('getProjectDB', function (Group $pools, Database $dbForPlatform
            if (\in_array($dsn->getHost(), $sharedTables)) {
                $database
                    ->setSharedTables(true)
-                    ->setTenant($project->getInternalId())
+                    ->setTenant($project->getSequence())
                    ->setNamespace($dsn->getParam('namespace'));
            } else {
                $database
                    ->setSharedTables(false)
                    ->setTenant(null)
-                    ->setNamespace('_' . $project->getInternalId());
+                    ->setNamespace('_' . $project->getSequence());
            }

            return $database;
        }

-        $dbAdapter = $pools
-            ->get($dsn->getHost())
-            ->pop()
-            ->getResource();
-
-        $database = new Database($dbAdapter, $cache);
+        $adapter = new DatabasePool($pools->get($dsn->getHost()));
+        $database = new Database($adapter, $cache);
        $databases[$dsn->getHost()] = $database;
        $sharedTables = \explode(',', System::getEnv('_APP_DATABASE_SHARED_TABLES', ''));

        if (\in_array($dsn->getHost(), $sharedTables)) {
            $database
                ->setSharedTables(true)
-                ->setTenant($project->getInternalId())
+                ->setTenant($project->getSequence())
                ->setNamespace($dsn->getParam('namespace'));
        } else {
            $database
                ->setSharedTables(false)
                ->setTenant(null)
-                ->setNamespace('_' . $project->getInternalId());
+                ->setNamespace('_' . $project->getSequence());
        }

        $database
@@ -168,21 +164,15 @@ CLI::setResource('getProjectDB', function (Group $pools, Database $dbForPlatform

 CLI::setResource('getLogsDB', function (Group $pools, Cache $cache) {
    $database = null;
+
    return function (?Document $project = null) use ($pools, $cache, $database) {
        if ($database !== null && $project !== null && !$project->isEmpty() && $project->getId() !== 'console') {
-            $database->setTenant($project->getInternalId());
+            $database->setTenant($project->getSequence());
            return $database;
        }

-        $dbAdapter = $pools
-            ->get('logs')
-            ->pop()
-            ->getResource();
-
-        $database = new Database(
-            $dbAdapter,
-            $cache
-        );
+        $adapter = new DatabasePool($pools->get('logs'));
+        $database = new Database($adapter, $cache);

        $database
            ->setSharedTables(true)
@@ -192,21 +182,21 @@ CLI::setResource('getLogsDB', function (Group $pools, Cache $cache) {

        // set tenant
        if ($project !== null && !$project->isEmpty() && $project->getId() !== 'console') {
-            $database->setTenant($project->getInternalId());
+            $database->setTenant($project->getSequence());
        }

        return $database;
    };
 }, ['pools', 'cache']);

-CLI::setResource('queueForStatsUsage', function (Connection $publisher) {
+CLI::setResource('queueForStatsUsage', function (Publisher $publisher) {
    return new StatsUsage($publisher);
 }, ['publisher']);
 CLI::setResource('queueForStatsResources', function (Publisher $publisher) {
    return new StatsResources($publisher);
 }, ['publisher']);
 CLI::setResource('publisher', function (Group $pools) {
-    return $pools->get('publisher')->pop()->getResource();
+    return new BrokerPool(publisher: $pools->get('publisher'));
 }, ['pools']);
 CLI::setResource('queueForFunctions', function (Publisher $publisher) {
    return new Func($publisher);
@@ -219,6 +209,13 @@ CLI::setResource('queueForCertificates', function (Publisher $publisher) {
 }, ['publisher']);
 CLI::setResource('logError', function (Registry $register) {
    return function (Throwable $error, string $namespace, string $action) use ($register) {
+        Console::error('[Error] Timestamp: ' . date('c', time()));
+        Console::error('[Error] Type: ' . get_class($error));
+        Console::error('[Error] Message: ' . $error->getMessage());
+        Console::error('[Error] File: ' . $error->getFile());
+        Console::error('[Error] Line: ' . $error->getLine());
+        Console::error('[Error] Trace: ' . $error->getTraceAsString());
+
        $logger = $register->get('logger');

        if ($logger) {
@@ -237,6 +234,7 @@ CLI::setResource('logError', function (Registry $register) {
            $log->addExtra('file', $error->getFile());
            $log->addExtra('line', $error->getLine());
            $log->addExtra('trace', $error->getTraceAsString());
+            $log->addExtra('detailedTrace', $error->getTrace());

            $log->setAction($action);

@@ -250,24 +248,41 @@ CLI::setResource('logError', function (Registry $register) {
                Console::error('Error pushing log: ' . $th->getMessage());
            }
        }
-
-        Console::warning("Failed: {$error->getMessage()}");
-        Console::warning($error->getTraceAsString());
    };
 }, ['register']);

 CLI::setResource('executor', fn () => new Executor(fn (string $projectId, string $deploymentId) => System::getEnv('_APP_EXECUTOR_HOST')));

-$platform = new Appwrite();
-$platform->init(Service::TYPE_TASK);
+CLI::setResource('telemetry', fn () => new NoTelemetry());

+$platform = new Appwrite();
+$args = $platform->getEnv('argv');
+
+if (!isset($args[0])) {
+    Console::error('Missing task name');
+    Console::exit(1);
+}
+
+\array_shift($args);
+$taskName = $args[0];
+$platform->init(Service::TYPE_TASK);
 $cli = $platform->getCli();

 $cli
    ->error()
    ->inject('error')
-    ->action(function (Throwable $error) {
-        Console::error($error->getMessage());
+    ->inject('logError')
+    ->action(function (Throwable $error, callable $logError) use ($taskName) {
+        call_user_func_array($logError, [
+            $error,
+            'Task',
+            $taskName,
+        ]);
+
+        Timer::clearAll();
    });

-$cli->run();
+$cli->shutdown()->action(fn () => Timer::clearAll());
+
+Runtime::enableCoroutine(SWOOLE_HOOK_ALL);
+run($cli->run(...));
@@ -1101,6 +1101,28 @@ return [
                'array' => false,
                'filters' => ['json', 'encrypt'],
            ],
+            [
+                '$id' => ID::custom('scopes'),
+                'type' => Database::VAR_STRING,
+                'format' => '',
+                'size' => Database::LENGTH_KEY,
+                'signed' => true,
+                'required' => false,
+                'default' => null,
+                'array' => true,
+                'filters' => [],
+            ],
+            [
+                '$id' => ID::custom('expire'),
+                'type' => Database::VAR_DATETIME,
+                'format' => '',
+                'size' => 0,
+                'required' => false,
+                'signed' => false,
+                'default' => null,
+                'array' => false,
+                'filters' => ['datetime'],
+            ],
        ],
        'indexes' => [
            [
@@ -2359,6 +2381,20 @@ return [
                'lengths' => [],
                'orders' => [],
            ],
+            [
+                '$id' => ID::custom('_key_expired'),
+                'type' => Database::INDEX_KEY,
+                'attributes' => ['expired'],
+                'lengths' => [],
+                'orders' => [],
+            ],
+            [
+                '$id' => ID::custom('_key_session_internal_id'),
+                'type' => Database::INDEX_KEY,
+                'attributes' => ['sessionInternalId'],
+                'lengths' => [],
+                'orders' => [],
+            ],
        ],
    ],

@@ -225,7 +225,7 @@ return [
                '$id' => ID::custom('templates'),
                'type' => Database::VAR_STRING,
                'format' => '',
-                'size' => 1000000, // TODO make sure size fits
+                'size' => 1_000_000, // TODO make sure size fits
                'signed' => true,
                'required' => false,
                'default' => [],
@@ -367,7 +367,21 @@ return [
                'attributes' => ['pingedAt'],
                'lengths' => [],
                'orders' => [],
-            ]
+            ],
+            [
+                '$id' => ID::custom('_key_database'),
+                'type' => Database::INDEX_KEY,
+                'attributes' => ['database'],
+                'lengths' => [],
+                'orders' => [],
+            ],
+            [
+                '$id' => ID::custom('_key_region_accessed_at'),
+                'type' => Database::INDEX_KEY,
+                'attributes' => ['region', 'accessedAt'],
+                'lengths' => [],
+                'orders' => [],
+            ],
        ],
    ],

@@ -491,6 +505,20 @@ return [
                'lengths' => [],
                'orders' => [],
            ],
+            [
+                '$id' => ID::custom('_key_project_id_region'),
+                'type' => Database::INDEX_KEY,
+                'attributes' => ['projectId', 'region'],
+                'lengths' => [],
+                'orders' => [],
+            ],
+            [
+                '$id' => ID::custom('_key_region_rt_active'),
+                'type' => Database::INDEX_KEY,
+                'attributes' => ['region', 'resourceType', 'active'],
+                'lengths' => [],
+                'orders' => [],
+            ],
        ],
    ],

@@ -782,17 +810,6 @@ return [
                'array' => true,
                'filters' => [],
            ],
-            [
-                '$id' => ID::custom('search'),
-                'type' => Database::VAR_STRING,
-                'format' => '',
-                'size' => 16384,
-                'signed' => true,
-                'required' => false,
-                'default' => null,
-                'array' => false,
-                'filters' => [],
-            ],
        ],
        'indexes' => [
            [
@@ -809,13 +826,6 @@ return [
                'lengths' => [],
                'orders' => [],
            ],
-            [
-                '$id' => ID::custom('_key_search'),
-                'type' => Database::INDEX_FULLTEXT,
-                'attributes' => ['search'],
-                'lengths' => [],
-                'orders' => [],
-            ],
        ],
    ],

@@ -1148,7 +1158,7 @@ return [
                'format' => '',
                'size' => 32,
                'signed' => true,
-                'required' => true,
+                'required' => false,
                'default' => null,
                'array' => false,
                'filters' => [],
@@ -1407,6 +1417,13 @@ return [
                'lengths' => [16],
                'orders' => [Database::ORDER_ASC],
            ],
+            [
+                '$id' => ID::custom('_key_piid_riid_rt'),
+                'type' => Database::INDEX_KEY,
+                'attributes' => ['projectInternalId', 'deploymentInternalId', 'deploymentResourceType'],
+                'lengths' => [],
+                'orders' => [],
+            ],
        ],
    ],

@@ -1702,7 +1719,14 @@ return [
                'attributes' => ['resourceType'],
                'lengths' => [Database::LENGTH_KEY],
                'orders' => [Database::ORDER_ASC],
-            ]
+            ],
+            [
+                '$id' => ID::custom('_key_piid_riid_rt'),
+                'type' => Database::INDEX_KEY,
+                'attributes' => ['projectInternalId', 'resourceInternalId', 'resourceType'],
+                'lengths' => [],
+                'orders' => [],
+            ],
        ],
    ],

@@ -1850,6 +1874,13 @@ return [
                'lengths' => [Database::LENGTH_KEY],
                'orders' => [Database::ORDER_ASC],
            ],
+            [
+                '$id' => ID::custom('_key_piid_prid_rt'),
+                'type' => Database::INDEX_KEY,
+                'attributes' => ['projectInternalId', 'providerRepositoryId'],
+                'lengths' => [],
+                'orders' => [],
+            ],
        ],
    ],

@@ -1859,5 +1890,5 @@ return [
        'name' => 'vcsCommentLocks',
        'attributes' => [],
        'indexes' => []
-    ]
+    ],
 ];
@@ -1029,7 +1029,7 @@ return [
                '$id' => ID::custom('fallbackFile'),
                'type' => Database::VAR_STRING,
                'format' => '',
-                'size' => Database::LENGTH_KEY,
+                'size' => 16384,
                'signed' => true,
                'required' => false,
                'default' => null,
@@ -1205,7 +1205,7 @@ return [
                '$id' => ID::custom('adapter'), // ssr or static; named this way as it's a term in SSR frameworks
                'type' => Database::VAR_STRING,
                'format' => '',
-                'size' => 128,
+                'size' => 16,
                'signed' => true,
                'required' => false,
                'default' => '',
@@ -1361,7 +1361,7 @@ return [
                '$id' => ID::custom('sourcePath'),
                'type' => Database::VAR_STRING,
                'format' => '',
-                'size' => 2048,
+                'size' => 16384,
                'signed' => true,
                'required' => false,
                'default' => null,
@@ -1372,7 +1372,7 @@ return [
                '$id' => ID::custom('type'),
                'type' => Database::VAR_STRING,
                'format' => '',
-                'size' => 32,
+                'size' => 2048,
                'signed' => true,
                'required' => true,
                'default' => null,
@@ -1554,8 +1554,8 @@ return [
                '$id' => ID::custom('sourceSize'),
                'type' => Database::VAR_INTEGER,
                'format' => '',
-                'size' => 0,
-                'signed' => true,
+                'size' => 8,
+                'signed' => false,
                'required' => false,
                'default' => null,
                'array' => false,
@@ -1594,17 +1594,6 @@ return [
                'array' => false,
                'filters' => [],
            ],
-            [
-                '$id' => ID::custom('search'),
-                'type' => Database::VAR_STRING,
-                'format' => '',
-                'size' => 16384,
-                'signed' => true,
-                'required' => false,
-                'default' => null,
-                'array' => false,
-                'filters' => [],
-            ],
            [
                '$id' => ID::custom('activate'),
                'type' => Database::VAR_BOOLEAN,
@@ -1639,7 +1628,7 @@ return [
                'filters' => [],
            ],
            [
-                '$id' => ID::custom('buildStartAt'),
+                '$id' => ID::custom('buildStartedAt'),
                'type' => Database::VAR_DATETIME,
                'format' => '',
                'size' => 0,
@@ -1650,7 +1639,7 @@ return [
                'filters' => ['datetime'],
            ],
            [
-                '$id' => ID::custom('buildEndAt'),
+                '$id' => ID::custom('buildEndedAt'),
                'type' => Database::VAR_DATETIME,
                'format' => '',
                'size' => 0,
@@ -1665,7 +1654,7 @@ return [
                'type' => Database::VAR_INTEGER,
                'format' => '',
                'size' => 0,
-                'signed' => true,
+                'signed' => false,
                'required' => false,
                'default' => null,
                'array' => false,
@@ -1675,8 +1664,8 @@ return [
                '$id' => ID::custom('buildSize'),
                'type' => Database::VAR_INTEGER,
                'format' => '',
-                'size' => 0,
-                'signed' => true,
+                'size' => 8,
+                'signed' => false,
                'required' => false,
                'default' => null,
                'array' => false,
@@ -1686,8 +1675,8 @@ return [
                '$id' => ID::custom('totalSize'),
                'type' => Database::VAR_INTEGER,
                'format' => '',
-                'size' => 0,
-                'signed' => true,
+                'size' => 8,
+                'signed' => false,
                'required' => false,
                'default' => null,
                'array' => false,
@@ -1699,7 +1688,7 @@ return [
                'format' => '',
                'size' => 16,
                'signed' => true,
-                'required' => true,
+                'required' => false,
                'default' => 'waiting',
                'array' => false,
                'filters' => [],
@@ -1708,7 +1697,7 @@ return [
                '$id' => ID::custom('buildPath'),
                'type' => Database::VAR_STRING,
                'format' => '',
-                'size' => Database::LENGTH_KEY,
+                'size' => 16384,
                'signed' => true,
                'required' => false,
                'default' => '',
@@ -1730,7 +1719,7 @@ return [
                '$id' => ID::custom('adapter'), // ssr or static; named this way as it's a term in SSR frameworks
                'type' => Database::VAR_STRING,
                'format' => '',
-                'size' => 128,
+                'size' => 16,
                'signed' => true,
                'required' => false,
                'default' => '',
@@ -1741,7 +1730,7 @@ return [
                '$id' => ID::custom('fallbackFile'),
                'type' => Database::VAR_STRING,
                'format' => '',
-                'size' => Database::LENGTH_KEY,
+                'size' => 16384,
                'signed' => true,
                'required' => false,
                'default' => null,
@@ -1764,13 +1753,6 @@ return [
                'lengths' => [],
                'orders' => [Database::ORDER_ASC],
            ],
-            [
-                '$id' => ID::custom('_key_search'),
-                'type' => Database::INDEX_FULLTEXT,
-                'attributes' => ['search'],
-                'lengths' => [],
-                'orders' => [],
-            ],
            [
                '$id' => ID::custom('_key_sourceSize'),
                'type' => Database::INDEX_KEY,
@@ -1812,13 +1794,28 @@ return [
                'attributes' => ['type'],
                'lengths' => [32],
                'orders' => [Database::ORDER_ASC],
-            ],  [
+            ],
+            [
                '$id' => ID::custom('_key_status'),
                'type' => Database::INDEX_KEY,
                'attributes' => ['status'],
                'lengths' => [16],
                'orders' => [Database::ORDER_ASC],
            ],
+            [
+                '$id' => ID::custom('_key_resourceId_resourceType'),
+                'type' => Database::INDEX_KEY,
+                'attributes' => ['resourceId', 'resourceType'],
+                'lengths' => [],
+                'orders' => [],
+            ],
+            [
+                '$id' => ID::custom('_key_resource_internal_id'),
+                'type' => Database::INDEX_KEY,
+                'attributes' => ['resourceInternalId'],
+                'lengths' => [],
+                'orders' => [],
+            ],
        ],
    ],

@@ -2083,6 +2080,13 @@ return [
                'lengths' => [],
                'orders' => [Database::ORDER_ASC],
            ],
+            [
+                '$id' => ID::custom('_key_function_internal_id'),
+                'type' => Database::INDEX_KEY,
+                'attributes' => ['resourceInternalId'],
+                'lengths' => [],
+                'orders' => [],
+            ],
        ],
    ],

@@ -2212,6 +2216,13 @@ return [
                'lengths' => [],
                'orders' => [],
            ],
+            [
+                '$id' => ID::custom('_key_resource_internal_id_resource_type'),
+                'type' => Database::INDEX_KEY,
+                'attributes' => ['resourceInternalId', 'resourceType'],
+                'lengths' => [],
+                'orders' => [],
+            ],
        ],
    ],

@@ -2461,8 +2472,19 @@ return [
                'required' => false,
                'default' => null,
                'array' => false,
-                'filters' => [],
-            ]
+                'filters' => ['datetime'],
+            ],
+            [
+                '$id' => ID::custom('accessedAt'),
+                'type' => Database::VAR_DATETIME,
+                'format' => '',
+                'size' => 0,
+                'signed' => false,
+                'required' => false,
+                'default' => null,
+                'array' => false,
+                'filters' => ['datetime'],
+            ],
        ],
        'indexes' => [
            [
@@ -2472,7 +2494,20 @@ return [
                'lengths' => [],
                'orders' => [Database::ORDER_ASC],
            ],
-
+            [
+                '$id' => '_key_accessedAt',
+                'type' => Database::INDEX_KEY,
+                'attributes' => ['accessedAt'],
+                'lengths' => [],
+                'orders' => [],
+            ],
+            [
+                '$id' => '_key_resourceInternalId_resourceType',
+                'type' => Database::INDEX_KEY,
+                'attributes' => ['resourceInternalId', 'resourceType'],
+                'lengths' => [],
+                'orders' => [],
+            ],
        ],
    ],
 ];
@@ -11,7 +11,7 @@ use Utopia\System\System;

 $console = [
    '$id' => ID::custom('console'),
-    '$internalId' => ID::custom('console'),
+    '$sequence' => ID::custom('console'),
    'name' => 'Appwrite',
    '$collection' => ID::custom('projects'),
    'description' => 'Appwrite core engine',
@@ -81,7 +81,7 @@ return [
    ],
    Exception::GENERAL_ROUTE_NOT_FOUND => [
        'name' => Exception::GENERAL_ROUTE_NOT_FOUND,
-        'description' => 'The requested route was not found. Please refer to the API docs and try again.',
+        'description' => 'Route not found. Please ensure the endpoint is configured correctly and that the API route is valid for this SDK version. Refer to the API docs for more details.',
        'code' => 404,
    ],
    Exception::GENERAL_CURSOR_NOT_FOUND => [
@@ -499,6 +499,11 @@ return [
        'description' => 'The requested file token has expired.',
        'code' => 401,
    ],
+    Exception::TOKEN_RESOURCE_TYPE_INVALID => [
+        'name' => Exception::TOKEN_RESOURCE_TYPE_INVALID,
+        'description' => 'The resource type for the token is invalid.',
+        'code' => 400,
+    ],

    /** VCS */
    Exception::INSTALLATION_NOT_FOUND => [
@@ -651,6 +656,11 @@ return [
        'description' => 'Database timed out. Try adjusting your queries or adding an index.',
        'code' => 408
    ],
+    Exception::DATABASE_QUERY_ORDER_NULL => [
+        'name' => Exception::DATABASE_QUERY_ORDER_NULL,
+        'description' => 'The order attribute had a null value. Cursor pagination requires all documents order attribute values are non-null.',
+        'code' => 400,
+    ],

    /** Collections */
    Exception::COLLECTION_NOT_FOUND => [
@@ -253,13 +253,30 @@ return [
        'adapters' => [
            'static' => [
                'key' => 'static',
-                'buildCommand' => 'flutter build web',
-                'installCommand' => '',
+                'buildCommand' => 'flutter build web --release -t lib/main.dart',
+                'installCommand' => 'flutter pub get',
                'outputDirectory' => './build/web',
                'startCommand' => 'bash helpers/server.sh',
            ],
        ],
    ],
+    'react-native' => [
+        'key' => 'react-native',
+        'name' => 'React Native',
+        'screenshotSleep' => 3000,
+        'buildRuntime' => 'node-22',
+        'runtimes' => getVersions($templateRuntimes['NODE']['versions'], 'node'),
+        'adapters' => [
+            'static' => [
+                'key' => 'static',
+                'buildCommand' => 'npm run build',
+                'installCommand' => 'npm install',
+                'outputDirectory' => './dist',
+                'startCommand' => 'bash helpers/server.sh',
+                'fallbackFile' => 'index.html'
+            ]
+        ]
+    ],
    'vite' => [
        'key' => 'vite',
        'name' => 'Vite',
@@ -79,7 +79,7 @@
        <style>
            a.button {
                display: inline-block;
-                background: #fd366e;
+                background: {{accentColor}};
                color: #ffffff;
                border-radius: 8px;
                height: 48px;
@@ -88,7 +88,7 @@
                cursor: pointer;
                text-align: center;
                text-decoration: none;
-                border-color: #fd366e;
+                border-color: {{accentColor}};
                border-style: solid;
                border-width: 1px;
                margin-right: 24px;
@@ -126,7 +126,7 @@
                    <td>
                        <img
                            height="32px"
-                            src="https://cloud.appwrite.io/images/mails/logo.png"
+                            src="{{logoUrl}}"
                        />
                    </td>
                </tr>
@@ -164,7 +164,7 @@
                <tr>
                    <td style="padding-left: 4px; padding-right: 4px">
                        <a
-                            href="https://twitter.com/appwrite"
+                            href="{{twitterUrl}}"
                            class="social-icon"
                            title="Twitter"
                        >
@@ -173,7 +173,7 @@
                    </td>
                    <td style="padding-left: 4px; padding-right: 4px">
                        <a
-                            href="https://appwrite.io/discord"
+                            href="{{discordUrl}}"
                            class="social-icon"
                        >
                            <img src="https://cloud.appwrite.io/images/mails/discord.png" height="24" width="24" />
@@ -181,7 +181,7 @@
                    </td>
                    <td style="padding-left: 4px; padding-right: 4px">
                        <a
-                            href="https://github.com/appwrite/appwrite"
+                            href="{{githubUrl}}"
                            class="social-icon"
                        >
                            <img src="https://cloud.appwrite.io/images/mails/github.png" height="24" width="24" />
@@ -191,11 +191,11 @@
            </table>
            <table style="width: auto; margin: 0 auto; margin-top: 60px">
                <tr>
-                    <td><a href="https://appwrite.io/terms">Terms</a></td>
+                    <td><a href="{{termsUrl}}">Terms</a></td>
                    <td style="color: #e8e9f0">
                        <div style="margin: 0 8px">|</div>
                    </td>
-                    <td><a href="https://appwrite.io/privacy">Privacy</a></td>
+                    <td><a href="{{privacyUrl}}">Privacy</a></td>
                </tr>
            </table>
            <p style="text-align: center" align="center">
@@ -11,6 +11,7 @@ return [
        'form' => false,
        'beta' => false,
        'mock' => false,
+        'class' => 'Appwrite\\Auth\\OAuth2\\Amazon',
    ],
    'apple' => [
        'name' => 'Apple',
@@ -21,6 +22,7 @@ return [
        'form' => 'apple.phtml', // Preparation for adding ability to customized OAuth UI forms, currently handled hardcoded.
        'beta' => true,
        'mock' => false,
+        'class' => 'Appwrite\\Auth\\OAuth2\\Apple',
    ],
    'auth0' => [
        'name' => 'Auth0',
@@ -31,6 +33,7 @@ return [
        'form' => 'auth0.phtml',
        'beta' => false,
        'mock' => false,
+        'class' => 'Appwrite\\Auth\\OAuth2\\Auth0',
    ],
    'authentik' => [
        'name' => 'Authentik',
@@ -41,6 +44,7 @@ return [
        'form' => 'authentik.phtml',
        'beta' => false,
        'mock' => false,
+        'class' => 'Appwrite\\Auth\\OAuth2\\Authentik',
    ],
    'autodesk' => [
        'name' => 'Autodesk',
@@ -51,6 +55,7 @@ return [
        'form' => false,
        'beta' => false,
        'mock' => false,
+        'class' => 'Appwrite\\Auth\\OAuth2\\Autodesk',
    ],
    'bitbucket' => [
        'name' => 'BitBucket',
@@ -61,6 +66,7 @@ return [
        'form' => false,
        'beta' => false,
        'mock' => false,
+        'class' => 'Appwrite\\Auth\\OAuth2\\Bitbucket',
    ],
    'bitly' => [
        'name' => 'Bitly',
@@ -70,7 +76,8 @@ return [
        'sandbox' => false,
        'form' => false,
        'beta' => false,
-        'mock' => false
+        'mock' => false,
+        'class' => 'Appwrite\\Auth\\OAuth2\\Bitly',
    ],
    'box' => [
        'name' => 'Box',
@@ -80,7 +87,8 @@ return [
        'sandbox' => false,
        'form' => false,
        'beta' => false,
-        'mock' => false
+        'mock' => false,
+        'class' => 'Appwrite\\Auth\\OAuth2\\Box',
    ],
    'dailymotion' => [
        'name' => 'Dailymotion',
@@ -90,7 +98,8 @@ return [
        'sandbox' => false,
        'form' => false,
        'beta' => false,
-        'mock' => false
+        'mock' => false,
+        'class' => 'Appwrite\\Auth\\OAuth2\\Dailymotion',
    ],
    'discord' => [
        'name' => 'Discord',
@@ -101,6 +110,7 @@ return [
        'form' => false,
        'beta' => false,
        'mock' => false,
+        'class' => 'Appwrite\\Auth\\OAuth2\\Discord',
    ],
    'disqus' => [
        'name' => 'Disqus',
@@ -111,6 +121,7 @@ return [
        'form' => false,
        'beta' => false,
        'mock' => false,
+        'class' => 'Appwrite\\Auth\\OAuth2\\Disqus',
    ],
    'dropbox' => [
        'name' => 'Dropbox',
@@ -121,6 +132,7 @@ return [
        'form' => false,
        'beta' => false,
        'mock' => false,
+        'class' => 'Appwrite\\Auth\\OAuth2\\Dropbox',
    ],
    'etsy' => [
        'name' => 'Etsy',
@@ -131,6 +143,7 @@ return [
        'form' => false,
        'beta' => false,
        'mock' => false,
+        'class' => 'Appwrite\\Auth\\OAuth2\\Etsy',
    ],
    'facebook' => [
        'name' => 'Facebook',
@@ -141,6 +154,18 @@ return [
        'form' => false,
        'beta' => false,
        'mock' => false,
+        'class' => 'Appwrite\\Auth\\OAuth2\\Facebook',
+    ],
+    'figma' => [
+        'name' => 'Figma',
+        'developers' => 'https://www.figma.com/developers/api#oauth2',
+        'icon' => 'icon-figma',
+        'enabled' => true,
+        'sandbox' => false,
+        'form' => false,
+        'beta' => false,
+        'mock' => false,
+        'class' => 'Appwrite\\Auth\\OAuth2\\Figma',
    ],
    'github' => [
        'name' => 'GitHub',
@@ -151,6 +176,7 @@ return [
        'form' => false,
        'beta' => false,
        'mock' => false,
+        'class' => 'Appwrite\\Auth\\OAuth2\\Github',
    ],
    'gitlab' => [
        'name' => 'GitLab',
@@ -161,6 +187,7 @@ return [
        'form' => 'gitlab.phtml',
        'beta' => false,
        'mock' => false,
+        'class' => 'Appwrite\\Auth\\OAuth2\\Gitlab',
    ],
    'google' => [
        'name' => 'Google',
@@ -171,6 +198,7 @@ return [
        'form' => false,
        'beta' => false,
        'mock' => false,
+        'class' => 'Appwrite\\Auth\\OAuth2\\Google',
    ],
    'linkedin' => [
        'name' => 'LinkedIn',
@@ -181,6 +209,7 @@ return [
        'form' => false,
        'beta' => false,
        'mock' => false,
+        'class' => 'Appwrite\\Auth\\OAuth2\\Linkedin',
    ],
    'microsoft' => [
        'name' => 'Microsoft',
@@ -191,6 +220,7 @@ return [
        'form' => 'microsoft.phtml',
        'beta' => false,
        'mock' => false,
+        'class' => 'Appwrite\\Auth\\OAuth2\\Microsoft',
    ],
    'notion' => [
        'name' => 'Notion',
@@ -201,6 +231,7 @@ return [
        'form' => false,
        'beta' => false,
        'mock' => false,
+        'class' => 'Appwrite\\Auth\\OAuth2\\Notion',
    ],
    'oidc' => [
        'name' => 'OpenID Connect',
@@ -211,6 +242,7 @@ return [
        'form' => 'oidc.phtml',
        'beta' => false,
        'mock' => false,
+        'class' => 'Appwrite\\Auth\\OAuth2\\Oidc',
    ],
    'okta' => [
        'name' => 'Okta',
@@ -221,6 +253,7 @@ return [
        'form' => 'okta.phtml',
        'beta' => false,
        'mock' => false,
+        'class' => 'Appwrite\\Auth\\OAuth2\\Okta',
    ],
    'paypal' => [
        'name' => 'PayPal',
@@ -230,7 +263,8 @@ return [
        'sandbox' => false,
        'form' => false,
        'beta' => false,
-        'mock' => false
+        'mock' => false,
+        'class' => 'Appwrite\\Auth\\OAuth2\\Paypal',
    ],
    'paypalSandbox' => [
        'name' => 'PayPal Sandbox',
@@ -240,7 +274,8 @@ return [
        'sandbox' => true,
        'form' => false,
        'beta' => false,
-        'mock' => false
+        'mock' => false,
+        'class' => 'Appwrite\\Auth\\OAuth2\\Paypal',
    ],
    'podio' => [
        'name' => 'Podio',
@@ -251,6 +286,7 @@ return [
        'form' => false,
        'beta' => false,
        'mock' => false,
+        'class' => 'Appwrite\\Auth\\OAuth2\\Podio',
    ],
    'salesforce' => [
        'name' => 'Salesforce',
@@ -261,6 +297,7 @@ return [
        'form' => false,
        'beta' => false,
        'mock' => false,
+        'class' => 'Appwrite\\Auth\\OAuth2\\Salesforce',
    ],
    'slack' => [
        'name' => 'Slack',
@@ -271,6 +308,7 @@ return [
        'form' => false,
        'beta' => false,
        'mock' => false,
+        'class' => 'Appwrite\\Auth\\OAuth2\\Slack',
    ],
    'spotify' => [
        'name' => 'Spotify',
@@ -281,6 +319,7 @@ return [
        'form' => false,
        'beta' => false,
        'mock' => false,
+        'class' => 'Appwrite\\Auth\\OAuth2\\Spotify',
    ],
    'stripe' => [
        'name' => 'Stripe',
@@ -290,7 +329,8 @@ return [
        'sandbox' => false,
        'form' => false,
        'beta' => false,
-        'mock' => false
+        'mock' => false,
+        'class' => 'Appwrite\\Auth\\OAuth2\\Stripe',
    ],
    'tradeshift' => [
        'name' => 'Tradeshift',
@@ -301,6 +341,7 @@ return [
        'form' => false,
        'beta' => false,
        'mock' => false,
+        'class' => 'Appwrite\\Auth\\OAuth2\\Tradeshift',
    ],
    'tradeshiftBox' => [
        'name' => 'Tradeshift Sandbox',
@@ -311,6 +352,7 @@ return [
        'form' => false,
        'beta' => false,
        'mock' => false,
+        'class' => 'Appwrite\\Auth\\OAuth2\\Tradeshift',
    ],
    'twitch' => [
        'name' => 'Twitch',
@@ -321,6 +363,7 @@ return [
        'form' => false,
        'beta' => false,
        'mock' => false,
+        'class' => 'Appwrite\\Auth\\OAuth2\\Twitch',
    ],
    'wordpress' => [
        'name' => 'WordPress',
@@ -330,7 +373,8 @@ return [
        'sandbox' => false,
        'form' => false,
        'beta' => false,
-        'mock' => false
+        'mock' => false,
+        'class' => 'Appwrite\\Auth\\OAuth2\\Wordpress',
    ],
    'yahoo' => [
        'name' => 'Yahoo',
@@ -341,6 +385,7 @@ return [
        'form' => false,
        'beta' => false,
        'mock' => false,
+        'class' => 'Appwrite\\Auth\\OAuth2\\Yahoo',
    ],
    'yammer' => [
        'name' => 'Yammer',
@@ -351,6 +396,7 @@ return [
        'form' => false,
        'beta' => false,
        'mock' => false,
+        'class' => 'Appwrite\\Auth\\OAuth2\\Yammer',
    ],
    'yandex' => [
        'name' => 'Yandex',
@@ -361,6 +407,7 @@ return [
        'form' => false,
        'beta' => false,
        'mock' => false,
+        'class' => 'Appwrite\\Auth\\OAuth2\\Yandex',
    ],
    'zoho' => [
        'name' => 'Zoho',
@@ -371,6 +418,7 @@ return [
        'form' => false,
        'beta' => false,
        'mock' => false,
+        'class' => 'Appwrite\\Auth\\OAuth2\\Zoho',
    ],
    'zoom' => [
        'name' => 'Zoom',
@@ -381,6 +429,7 @@ return [
        'form' => false,
        'beta' => false,
        'mock' => false,
+        'class' => 'Appwrite\\Auth\\OAuth2\\Zoom',
    ],
    // 'instagram' => [
    //     'name' => 'Instagram',
@@ -389,6 +438,7 @@ return [
    //     'enabled' => false,
    //     'beta' => false,
    //     'mock' => false,
+    //     'class' => 'Appwrite\\Auth\\OAuth2\\Instagram',
    // ],
    // 'twitter' => [
    //     'name' => 'twitter',
@@ -397,6 +447,7 @@ return [
    //     'enabled' => false,
    //     'beta' => false,
    //     'mock' => false,
+    //     'class' => 'Appwrite\\Auth\\OAuth2\\Twitter',
    // ],

    // Keep Last
@@ -409,5 +460,6 @@ return [
        'form' => false,
        'beta' => false,
        'mock' => true,
+        'class' => 'Appwrite\\Auth\\OAuth2\\Mock',
    ],
 ];
@@ -11,7 +11,7 @@ return [
            [
                'key' => 'web',
                'name' => 'Web',
-                'version' => '17.0.1',
+                'version' => '18.1.0',
                'url' => 'https://github.com/appwrite/sdk-for-web',
                'package' => 'https://www.npmjs.com/package/appwrite',
                'enabled' => true,
@@ -59,7 +59,7 @@ return [
            [
                'key' => 'flutter',
                'name' => 'Flutter',
-                'version' => '15.0.0',
+                'version' => '16.1.0',
                'url' => 'https://github.com/appwrite/sdk-for-flutter',
                'package' => 'https://pub.dev/packages/appwrite',
                'enabled' => true,
@@ -77,7 +77,7 @@ return [
            [
                'key' => 'apple',
                'name' => 'Apple',
-                'version' => '9.0.0',
+                'version' => '10.1.0',
                'url' => 'https://github.com/appwrite/sdk-for-apple',
                'package' => 'https://github.com/appwrite/sdk-for-apple',
                'enabled' => true,
@@ -112,7 +112,7 @@ return [
            [
                'key' => 'android',
                'name' => 'Android',
-                'version' => '6.1.0',
+                'version' => '8.1.0',
                'url' => 'https://github.com/appwrite/sdk-for-android',
                'package' => 'https://search.maven.org/artifact/io.appwrite/sdk-for-android',
                'enabled' => true,
@@ -134,7 +134,7 @@ return [
            [
                'key' => 'react-native',
                'name' => 'React Native',
-                'version' => '0.7.1',
+                'version' => '0.9.1',
                'url' => 'https://github.com/appwrite/sdk-for-react-native',
                'package' => 'https://npmjs.com/package/react-native-appwrite',
                'enabled' => true,
@@ -199,7 +199,7 @@ return [
            [
                'key' => 'web',
                'name' => 'Console',
-                'version' => '1.2.1',
+                'version' => '1.7.0',
                'url' => 'https://github.com/appwrite/sdk-for-console',
                'package' => '',
                'enabled' => true,
@@ -217,7 +217,7 @@ return [
            [
                'key' => 'cli',
                'name' => 'Command Line',
-                'version' => '6.2.2',
+                'version' => '6.2.3',
                'url' => 'https://github.com/appwrite/sdk-for-cli',
                'package' => 'https://www.npmjs.com/package/appwrite-cli',
                'enabled' => true,
@@ -245,7 +245,7 @@ return [
            [
                'key' => 'nodejs',
                'name' => 'Node.js',
-                'version' => '15.0.1',
+                'version' => '17.0.0',
                'url' => 'https://github.com/appwrite/sdk-for-node',
                'package' => 'https://www.npmjs.com/package/node-appwrite',
                'enabled' => true,
@@ -263,7 +263,7 @@ return [
            [
                'key' => 'deno',
                'name' => 'Deno',
-                'version' => '12.2.0',
+                'version' => '15.0.0',
                'url' => 'https://github.com/appwrite/sdk-for-deno',
                'package' => 'https://deno.land/x/appwrite',
                'enabled' => true,
@@ -281,7 +281,7 @@ return [
            [
                'key' => 'php',
                'name' => 'PHP',
-                'version' => '12.2.0',
+                'version' => '15.0.0',
                'url' => 'https://github.com/appwrite/sdk-for-php',
                'package' => 'https://packagist.org/packages/appwrite/appwrite',
                'enabled' => true,
@@ -299,7 +299,7 @@ return [
            [
                'key' => 'python',
                'name' => 'Python',
-                'version' => '9.0.2',
+                'version' => '11.0.0',
                'url' => 'https://github.com/appwrite/sdk-for-python',
                'package' => 'https://pypi.org/project/appwrite/',
                'enabled' => true,
@@ -317,7 +317,7 @@ return [
            [
                'key' => 'ruby',
                'name' => 'Ruby',
-                'version' => '12.2.0',
+                'version' => '16.0.0',
                'url' => 'https://github.com/appwrite/sdk-for-ruby',
                'package' => 'https://rubygems.org/gems/appwrite',
                'enabled' => true,
@@ -335,7 +335,7 @@ return [
            [
                'key' => 'go',
                'name' => 'Go',
-                'version' => '0.3.0',
+                'version' => '0.8.0',
                'url' => 'https://github.com/appwrite/sdk-for-go',
                'package' => 'https://github.com/appwrite/sdk-for-go',
                'enabled' => true,
@@ -353,7 +353,7 @@ return [
            [
                'key' => 'dotnet',
                'name' => '.NET',
-                'version' => '0.11.0',
+                'version' => '0.13.0',
                'url' => 'https://github.com/appwrite/sdk-for-dotnet',
                'package' => 'https://www.nuget.org/packages/Appwrite',
                'enabled' => true,
@@ -371,7 +371,7 @@ return [
            [
                'key' => 'dart',
                'name' => 'Dart',
-                'version' => '14.0.0',
+                'version' => '16.0.0',
                'url' => 'https://github.com/appwrite/sdk-for-dart',
                'package' => 'https://pub.dev/packages/dart_appwrite',
                'enabled' => true,
@@ -389,7 +389,7 @@ return [
            [
                'key' => 'kotlin',
                'name' => 'Kotlin',
-                'version' => '6.2.0',
+                'version' => '9.0.0',
                'url' => 'https://github.com/appwrite/sdk-for-kotlin',
                'package' => 'https://search.maven.org/artifact/io.appwrite/sdk-for-kotlin',
                'enabled' => true,
@@ -411,7 +411,7 @@ return [
            [
                'key' => 'swift',
                'name' => 'Swift',
-                'version' => '8.0.0',
+                'version' => '10.0.0',
                'url' => 'https://github.com/appwrite/sdk-for-swift',
                'package' => 'https://github.com/appwrite/sdk-for-swift',
                'enabled' => true,
@@ -65,9 +65,6 @@ return [
        'tests' => false,
        'optional' => true,
        'icon' => '/images/services/databases.png',
-        'globalAttributes' => [
-            'databaseId'
-        ]
    ],
    'locale' => [
        'key' => 'locale',
@@ -4,7 +4,6 @@ return [
    // Accepted inputs files
    "jpg" => "image/jpeg",
    "jpeg" => "image/jpeg",
-    "gif" => "image/gif",
    "png" => "image/png",
    "heic" => "image/heic",
    "webp" => "image/webp",
@@ -4,7 +4,6 @@ return [
    // Accepted outputs files
    "jpg" => "image/jpeg",
    "jpeg" => "image/jpeg",
-    "gif" => "image/gif",
    "png" => "image/png",
    "webp" => "image/webp",
    "heic" => "image/heic",
@@ -106,6 +106,16 @@ const TEMPLATE_FRAMEWORKS = [
        'outputDirectory' => './dist',
        'fallbackFile' => 'index.html',
    ],
+    'REACT_NATIVE' => [
+        'key' => 'react-native',
+        'name' => 'React Native',
+        'installCommand' => 'npm install',
+        'buildCommand' => 'npm run build',
+        'buildRuntime' => 'node-22',
+        'adapter' => 'static',
+        'outputDirectory' => './dist',
+        'fallbackFile' => '+not-found.html',
+    ],
    'ANGULAR' => [
        'key' => 'angular',
        'name' => 'Angular',
@@ -183,13 +193,15 @@ return [
        'variables' => []
    ],
    [
-        'key' => 'lynx-starter',
-        'name' => 'Lynx Starter',
-        'tagline' => 'Sample application built with Lynx, a cross-platform framework focused on performance.',
+        'key' => 'playground-for-lynx',
+        'name' => 'Lynx playground',
+        'tagline' => 'A basic Lynx website without Appwrite SDK integration.',
+        // When we add Lynx with Appwrite SDK, use following tagline for it:
+        // 'tagline' => 'Sample application built with Lynx, a cross-platform framework focused on performance.',
        'score' => 1, // 0 to 10 based on looks of screenshot (avoid 1,2,3,8,9,10 if possible)
        'useCases' => [UseCases::STARTER],
-        'screenshotDark' => $url . '/images/sites/templates/lynx-starter-dark.png',
-        'screenshotLight' => $url . '/images/sites/templates/lynx-starter-light.png',
+        'screenshotDark' => $url . '/images/sites/templates/playground-for-lynx-dark.png',
+        'screenshotLight' => $url . '/images/sites/templates/playground-for-lynx-light.png',
        'frameworks' => [
            getFramework('LYNX', [
                'providerRootDirectory' => './lynx/starter',
@@ -864,9 +876,8 @@ return [
        'screenshotDark' => $url . '/images/sites/templates/starter-for-react-native-dark.png',
        'screenshotLight' => $url . '/images/sites/templates/starter-for-react-native-light.png',
        'frameworks' => [
-            getFramework('REACT', [
+            getFramework('REACT_NATIVE', [
                'providerRootDirectory' => './',
-                'fallbackFile' => '+not-found.html',
            ]),
        ],
        'vcsProvider' => 'github',
@@ -1108,15 +1119,14 @@ return [
        'providerVersion' => '0.1.*',
        'variables' => []
    ],
-    // TODO: Remove astro starter eventually, or add all frameworks's starters
    [
-        'key' => 'astro-starter',
-        'name' => 'Astro starter',
-        'tagline' => 'Sample application built with Astro, a content-driven web framework.',
+        'key' => 'playground-for-astro',
+        'name' => 'Astro playground',
+        'tagline' => 'A basic Astro website without Appwrite SDK integration.',
        'score' => 1, // 0 to 10 based on looks of screenshot (avoid 1,2,3,8,9,10 if possible)
        'useCases' => [UseCases::STARTER],
-        'screenshotDark' => $url . '/images/sites/templates/astro-starter-dark.png',
-        'screenshotLight' => $url . '/images/sites/templates/astro-starter-light.png',
+        'screenshotDark' => $url . '/images/sites/templates/playground-for-astro-dark.png',
+        'screenshotLight' => $url . '/images/sites/templates/playground-for-astro-light.png',
        'frameworks' => [
            getFramework('ASTRO', [
                'providerRootDirectory' => './astro/starter',
@@ -1125,17 +1135,17 @@ return [
        'vcsProvider' => 'github',
        'providerRepositoryId' => 'templates-for-sites',
        'providerOwner' => 'appwrite',
-        'providerVersion' => '0.2.*',
+        'providerVersion' => '0.3.*',
        'variables' => [],
    ],
    [
-        'key' => 'remix-starter',
-        'name' => 'Remix starter',
-        'tagline' => 'Sample application built with Remix, a React meta-framework.',
+        'key' => 'playground-for-remix',
+        'name' => 'Remix playground',
+        'tagline' => 'A basic Remix website without Appwrite SDK integration.',
        'score' => 1, // 0 to 10 based on looks of screenshot (avoid 1,2,3,8,9,10 if possible)
        'useCases' => [UseCases::STARTER],
-        'screenshotDark' => $url . '/images/sites/templates/remix-starter-dark.png',
-        'screenshotLight' => $url . '/images/sites/templates/remix-starter-light.png',
+        'screenshotDark' => $url . '/images/sites/templates/playground-for-remix-dark.png',
+        'screenshotLight' => $url . '/images/sites/templates/playground-for-remix-light.png',
        'frameworks' => [
            getFramework('REMIX', [
                'providerRootDirectory' => './remix/starter',
@@ -1144,7 +1154,220 @@ return [
        'vcsProvider' => 'github',
        'providerRepositoryId' => 'templates-for-sites',
        'providerOwner' => 'appwrite',
-        'providerVersion' => '0.2.*',
+        'providerVersion' => '0.3.*',
        'variables' => [],
    ],
+    [
+        'key' => 'playground-for-nextjs',
+        'name' => 'Next.js playground',
+        'tagline' => 'A basic Next.js website without Appwrite SDK integration.',
+        'score' => 1, // 0 to 10 based on looks of screenshot (avoid 1,2,3,8,9,10 if possible)
+        'useCases' => [UseCases::STARTER],
+        'screenshotDark' => $url . '/images/sites/templates/playground-for-nextjs-dark.png',
+        'screenshotLight' => $url . '/images/sites/templates/playground-for-nextjs-light.png',
+        'frameworks' => [
+            getFramework('NEXTJS', [
+                'providerRootDirectory' => './nextjs/starter',
+            ]),
+        ],
+        'vcsProvider' => 'github',
+        'providerRepositoryId' => 'templates-for-sites',
+        'providerOwner' => 'appwrite',
+        'providerVersion' => '0.3.*',
+        'variables' => [],
+    ],
+    [
+        'key' => 'playground-for-flutter',
+        'name' => 'Flutter playground',
+        'tagline' => 'A basic Flutter website without Appwrite SDK integration.',
+        'score' => 1, // 0 to 10 based on looks of screenshot (avoid 1,2,3,8,9,10 if possible)
+        'useCases' => [UseCases::STARTER],
+        'screenshotDark' => $url . '/images/sites/templates/playground-for-flutter-dark.png',
+        'screenshotLight' => $url . '/images/sites/templates/playground-for-flutter-light.png',
+        'frameworks' => [
+            getFramework('FLUTTER', [
+                'providerRootDirectory' => './flutter/starter',
+            ]),
+        ],
+        'vcsProvider' => 'github',
+        'providerRepositoryId' => 'templates-for-sites',
+        'providerOwner' => 'appwrite',
+        'providerVersion' => '0.3.*',
+        'variables' => [],
+    ],
+    [
+        'key' => 'playground-for-vite',
+        'name' => 'Vite playground',
+        'tagline' => 'A basic Vite website without Appwrite SDK integration.',
+        'score' => 1, // 0 to 10 based on looks of screenshot (avoid 1,2,3,8,9,10 if possible)
+        'useCases' => [UseCases::STARTER],
+        'screenshotDark' => $url . '/images/sites/templates/playground-for-vite-dark.png',
+        'screenshotLight' => $url . '/images/sites/templates/playground-for-vite-light.png',
+        'frameworks' => [
+            getFramework('VITE', [
+                'providerRootDirectory' => './vite/starter',
+            ]),
+        ],
+        'vcsProvider' => 'github',
+        'providerRepositoryId' => 'templates-for-sites',
+        'providerOwner' => 'appwrite',
+        'providerVersion' => '0.3.*',
+        'variables' => [],
+    ],
+    [
+        'key' => 'playground-for-angular',
+        'name' => 'Angular playground',
+        'tagline' => 'A basic Angular website without Appwrite SDK integration.',
+        'score' => 1, // 0 to 10 based on looks of screenshot (avoid 1,2,3,8,9,10 if possible)
+        'useCases' => [UseCases::STARTER],
+        'screenshotDark' => $url . '/images/sites/templates/playground-for-angular-dark.png',
+        'screenshotLight' => $url . '/images/sites/templates/playground-for-angular-light.png',
+        'frameworks' => [
+            getFramework('ANGULAR', [
+                'providerRootDirectory' => './angular/starter',
+                'outputDirectory' => './dist/starter/browser',
+            ]),
+        ],
+        'vcsProvider' => 'github',
+        'providerRepositoryId' => 'templates-for-sites',
+        'providerOwner' => 'appwrite',
+        'providerVersion' => '0.3.*',
+        'variables' => [],
+    ],
+    [
+        'key' => 'playground-for-analog',
+        'name' => 'Analog playground',
+        'tagline' => 'A basic Analog website without Appwrite SDK integration.',
+        'score' => 1, // 0 to 10 based on looks of screenshot (avoid 1,2,3,8,9,10 if possible)
+        'useCases' => [UseCases::STARTER],
+        'screenshotDark' => $url . '/images/sites/templates/playground-for-analog-dark.png',
+        'screenshotLight' => $url . '/images/sites/templates/playground-for-analog-light.png',
+        'frameworks' => [
+            getFramework('ANALOG', [
+                'providerRootDirectory' => './analog/starter',
+            ]),
+        ],
+        'vcsProvider' => 'github',
+        'providerRepositoryId' => 'templates-for-sites',
+        'providerOwner' => 'appwrite',
+        'providerVersion' => '0.3.*',
+        'variables' => [],
+    ],
+    [
+        'key' => 'playground-for-svelte',
+        'name' => 'Svelte playground',
+        'tagline' => 'A basic Svelte website without Appwrite SDK integration.',
+        'score' => 1, // 0 to 10 based on looks of screenshot (avoid 1,2,3,8,9,10 if possible)
+        'useCases' => [UseCases::STARTER],
+        'screenshotDark' => $url . '/images/sites/templates/playground-for-svelte-dark.png',
+        'screenshotLight' => $url . '/images/sites/templates/playground-for-svelte-light.png',
+        'frameworks' => [
+            getFramework('SVELTEKIT', [
+                'providerRootDirectory' => './sveltekit/starter',
+            ]),
+        ],
+        'vcsProvider' => 'github',
+        'providerRepositoryId' => 'templates-for-sites',
+        'providerOwner' => 'appwrite',
+        'providerVersion' => '0.3.*',
+        'variables' => [],
+    ],
+
+    [
+        'key' => 'playground-for-react',
+        'name' => 'React playground',
+        'tagline' => 'A basic React website without Appwrite SDK integration.',
+        'score' => 1, // 0 to 10 based on looks of screenshot (avoid 1,2,3,8,9,10 if possible)
+        'useCases' => [UseCases::STARTER],
+        'screenshotDark' => $url . '/images/sites/templates/playground-for-react-dark.png',
+        'screenshotLight' => $url . '/images/sites/templates/playground-for-react-light.png',
+        'frameworks' => [
+            getFramework('REACT', [
+                'outputDirectory' => './build',
+                'providerRootDirectory' => './react/starter',
+            ]),
+        ],
+        'vcsProvider' => 'github',
+        'providerRepositoryId' => 'templates-for-sites',
+        'providerOwner' => 'appwrite',
+        'providerVersion' => '0.3.*',
+        'variables' => [],
+    ],
+
+    [
+        'key' => 'playground-for-vue',
+        'name' => 'Vue playground',
+        'tagline' => 'A basic Vue website without Appwrite SDK integration.',
+        'score' => 1, // 0 to 10 based on looks of screenshot (avoid 1,2,3,8,9,10 if possible)
+        'useCases' => [UseCases::STARTER],
+        'screenshotDark' => $url . '/images/sites/templates/playground-for-vue-dark.png',
+        'screenshotLight' => $url . '/images/sites/templates/playground-for-vue-light.png',
+        'frameworks' => [
+            getFramework('VUE', [
+                'providerRootDirectory' => './vue/starter',
+            ]),
+        ],
+        'vcsProvider' => 'github',
+        'providerRepositoryId' => 'templates-for-sites',
+        'providerOwner' => 'appwrite',
+        'providerVersion' => '0.3.*',
+        'variables' => [],
+    ],
+    [
+        'key' => 'playground-for-nuxt',
+        'name' => 'Nuxt playground',
+        'tagline' => 'A basic Nuxt website without Appwrite SDK integration.',
+        'score' => 1, // 0 to 10 based on looks of screenshot (avoid 1,2,3,8,9,10 if possible)
+        'useCases' => [UseCases::STARTER],
+        'screenshotDark' => $url . '/images/sites/templates/playground-for-nuxt-dark.png',
+        'screenshotLight' => $url . '/images/sites/templates/playground-for-nuxt-light.png',
+        'frameworks' => [
+            getFramework('NUXT', [
+                'providerRootDirectory' => './nuxt/starter',
+            ]),
+        ],
+        'vcsProvider' => 'github',
+        'providerRepositoryId' => 'templates-for-sites',
+        'providerOwner' => 'appwrite',
+        'providerVersion' => '0.3.*',
+        'variables' => [],
+    ],
+    [
+        'key' => 'playground-for-react-native',
+        'name' => 'React Native playground',
+        'tagline' => 'A basic React Native website without Appwrite SDK integration.',
+        'score' => 1, // 0 to 10 based on looks of screenshot (avoid 1,2,3,8,9,10 if possible)
+        'useCases' => [UseCases::STARTER],
+        'screenshotDark' => $url . '/images/sites/templates/playground-for-react-native-dark.png',
+        'screenshotLight' => $url . '/images/sites/templates/playground-for-react-native-light.png',
+        'frameworks' => [
+            getFramework('REACT_NATIVE', [
+                'providerRootDirectory' => './react-native/starter',
+            ]),
+        ],
+        'vcsProvider' => 'github',
+        'providerRepositoryId' => 'templates-for-sites',
+        'providerOwner' => 'appwrite',
+        'providerVersion' => '0.3.*',
+        'variables' => [],
+    ],
+    [
+        'key' => 'gallery-for-lynx',
+        'name' => 'Lynx gallery',
+        'tagline' => 'A Lynx website showcasing gallery with smooth animations.',
+        'score' => 1, // 0 to 10 based on looks of screenshot (avoid 1,2,3,8,9,10 if possible)
+        'useCases' => [UseCases::STARTER],
+        'screenshotDark' => $url . '/images/sites/templates/gallery-for-lynx-dark.png',
+        'screenshotLight' => $url . '/images/sites/templates/gallery-for-lynx-light.png',
+        'frameworks' => [
+            getFramework('LYNX', [
+                'providerRootDirectory' => './lynx/gallery',
+            ]),
+        ],
+        'vcsProvider' => 'github',
+        'providerRepositoryId' => 'templates-for-sites',
+        'providerOwner' => 'appwrite',
+        'providerVersion' => '0.3.*',
+        'variables' => []
+    ],
 ];
@@ -88,6 +88,15 @@ return [
                'question' => 'Enter your Appwrite hostname',
                'filter' => ''
            ],
+            [
+                'name' => '_APP_CUSTOM_DOMAIN_DENY_LIST',
+                'description' => 'List of reserved or prohibited domains when configuring custom domains.',
+                'introduction' => '',
+                'default' => 'example.com,test.com,app.example.com',
+                'required' => false,
+                'question' => '',
+                'filter' => ''
+            ],
            [
                'name' => '_APP_DOMAIN_FUNCTIONS',
                'description' => 'A domain to use for function preview URLs. Setting to empty turns off function preview URLs.',
@@ -97,6 +106,15 @@ return [
                'question' => '',
                'filter' => ''
            ],
+            [
+                'name' => '_APP_DOMAIN_SITES',
+                'description' => 'A domain to use for site preview URLs.',
+                'introduction' => '',
+                'default' => 'sites.localhost',
+                'required' => false,
+                'question' => '',
+                'filter' => ''
+            ],
            [
                'name' => '_APP_DOMAIN_TARGET',
                'description' => 'Deprecated since 1.7.0. A DNS A record hostname to serve as a CNAME target for your Appwrite custom domains. You can use the same value as used for the Appwrite \'_APP_DOMAIN\' variable. The default value is \'localhost\'.',
@@ -845,7 +863,7 @@ return [
            ],
            [
                'name' => '_APP_FUNCTIONS_CPUS',
-                'description' => 'Deprecated since 1.7.0. The maximum number of CPU core a single cloud function is allowed to use. Please note that setting a value higher than available cores will result in a function error, which might result in an error. The default value is empty. When it\'s empty, CPU limit will be disabled.',
+                'description' => 'Deprecated since 1.7.0. The maximum number of CPU core a single cloud function is allowed to use. Please note that setting a value higher than available cores will result in a function error, which might result in an error. The default value is empty. When it\'s empty or 0, CPU limit will be disabled',
                'introduction' => '0.7.0',
                'default' => '0',
                'required' => false,
@@ -863,7 +881,7 @@ return [
            ],
            [
                'name' => '_APP_FUNCTIONS_MEMORY',
-                'description' => 'Deprecated since 1.7.0. The maximum amount of memory a single cloud function is allowed to use in megabytes. The default value is  empty. When it\'s empty, memory limit will be disabled.',
+                'description' => 'Deprecated since 1.7.0. The maximum amount of memory a single cloud function is allowed to use in megabytes. The default value is  empty. When it\'s empty or 0, memory limit will be disabled.',
                'introduction' => '0.7.0',
                'default' => '0',
                'required' => false,
@@ -1145,13 +1163,22 @@ return [
            ],
            [
                'name' => '_APP_MAINTENANCE_DELAY',
-                'description' => 'Delay value containing the number of seconds that the Appwrite maintenance process should wait before executing system cleanups and optimizations. The default value is 0 seconds.',
+                'description' => 'Deprecated with 1.6.2 use _APP_MAINTENANCE_START_TIME instead to run the maintenance at a specific time per day.',
                'introduction' => '1.5.0',
                'default' => '0',
                'required' => false,
                'question' => '',
                'filter' => ''
            ],
+            [
+                'name' => '_APP_MAINTENANCE_START_TIME',
+                'description' => 'The time of day (in 24-hour format) when the maintenance process should start. The default value is 00:00.',
+                'introduction' => '1.6.2',
+                'default' => '00:00',
+                'required' => false,
+                'question' => '',
+                'filter' => ''
+            ],
            [
                'name' => '_APP_MAINTENANCE_RETENTION_CACHE',
                'description' => 'The maximum duration (in seconds) upto which to retain cached files. The default value is 2592000 seconds (30 days).',
@@ -171,6 +171,7 @@ App::get('/v1/avatars/credit-cards/:code')
    ->label('cache.resource', 'avatar/credit-card')
    ->label('sdk', new Method(
        namespace: 'avatars',
+        group: null,
        name: 'getCreditCard',
        description: '/docs/references/avatars/get-credit-card.md',
        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -186,7 +187,7 @@ App::get('/v1/avatars/credit-cards/:code')
    ->param('code', '', new WhiteList(\array_keys(Config::getParam('avatar-credit-cards'))), 'Credit Card Code. Possible values: ' . \implode(', ', \array_keys(Config::getParam('avatar-credit-cards'))) . '.')
    ->param('width', 100, new Range(0, 2000), 'Image width. Pass an integer between 0 to 2000. Defaults to 100.', true)
    ->param('height', 100, new Range(0, 2000), 'Image height. Pass an integer between 0 to 2000. Defaults to 100.', true)
-    ->param('quality', 100, new Range(0, 100), 'Image quality. Pass an integer between 0 to 100. Defaults to 100.', true)
+    ->param('quality', -1, new Range(-1, 100), 'Image quality. Pass an integer between 0 to 100. Defaults to keep existing image quality.', true)
    ->inject('response')
    ->action(fn (string $code, int $width, int $height, int $quality, Response $response) =>  $avatarCallback('credit-cards', $code, $width, $height, $quality, $response));

@@ -198,6 +199,7 @@ App::get('/v1/avatars/browsers/:code')
    ->label('cache.resource', 'avatar/browser')
    ->label('sdk', new Method(
        namespace: 'avatars',
+        group: null,
        name: 'getBrowser',
        description: '/docs/references/avatars/get-browser.md',
        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -213,7 +215,7 @@ App::get('/v1/avatars/browsers/:code')
    ->param('code', '', new WhiteList(\array_keys(Config::getParam('avatar-browsers'))), 'Browser Code.')
    ->param('width', 100, new Range(0, 2000), 'Image width. Pass an integer between 0 to 2000. Defaults to 100.', true)
    ->param('height', 100, new Range(0, 2000), 'Image height. Pass an integer between 0 to 2000. Defaults to 100.', true)
-    ->param('quality', 100, new Range(0, 100), 'Image quality. Pass an integer between 0 to 100. Defaults to 100.', true)
+    ->param('quality', -1, new Range(-1, 100), 'Image quality. Pass an integer between 0 to 100. Defaults to keep existing image quality.', true)
    ->inject('response')
    ->action(fn (string $code, int $width, int $height, int $quality, Response $response) => $avatarCallback('browsers', $code, $width, $height, $quality, $response));

@@ -225,6 +227,7 @@ App::get('/v1/avatars/flags/:code')
    ->label('cache.resource', 'avatar/flag')
    ->label('sdk', new Method(
        namespace: 'avatars',
+        group: null,
        name: 'getFlag',
        description: '/docs/references/avatars/get-flag.md',
        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -240,7 +243,7 @@ App::get('/v1/avatars/flags/:code')
    ->param('code', '', new WhiteList(\array_keys(Config::getParam('avatar-flags'))), 'Country Code. ISO Alpha-2 country code format.')
    ->param('width', 100, new Range(0, 2000), 'Image width. Pass an integer between 0 to 2000. Defaults to 100.', true)
    ->param('height', 100, new Range(0, 2000), 'Image height. Pass an integer between 0 to 2000. Defaults to 100.', true)
-    ->param('quality', 100, new Range(0, 100), 'Image quality. Pass an integer between 0 to 100. Defaults to 100.', true)
+    ->param('quality', -1, new Range(-1, 100), 'Image quality. Pass an integer between 0 to 100. Defaults to keep existing image quality.', true)
    ->inject('response')
    ->action(fn (string $code, int $width, int $height, int $quality, Response $response) => $avatarCallback('flags', $code, $width, $height, $quality, $response));

@@ -252,6 +255,7 @@ App::get('/v1/avatars/image')
    ->label('cache.resource', 'avatar/image')
    ->label('sdk', new Method(
        namespace: 'avatars',
+        group: null,
        name: 'getImage',
        description: '/docs/references/avatars/get-image.md',
        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -322,6 +326,7 @@ App::get('/v1/avatars/favicon')
    ->label('cache.resource', 'avatar/favicon')
    ->label('sdk', new Method(
        namespace: 'avatars',
+        group: null,
        name: 'getFavicon',
        description: '/docs/references/avatars/get-favicon.md',
        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -472,6 +477,7 @@ App::get('/v1/avatars/qr')
    ->label('scope', 'avatars.read')
    ->label('sdk', new Method(
        namespace: 'avatars',
+        group: null,
        name: 'getQR',
        description: '/docs/references/avatars/get-qr.md',
        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -521,6 +527,7 @@ App::get('/v1/avatars/initials')
    ->label('cache.resource', 'avatar/initials')
    ->label('sdk', new Method(
        namespace: 'avatars',
+        group: null,
        name: 'getInitials',
        description: '/docs/references/avatars/get-initials.md',
        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -662,7 +669,7 @@ App::get('/v1/cards/cloud')
                }
            }

-            $isPlatinum = $user->getInternalId() % 100 === 0;
+            $isPlatinum = $user->getSequence() % 100 === 0;
        } else {
            $name = $mock === 'normal-long' ? 'Sir First Walter O\'Brian Junior' : 'Walter O\'Brian';
            $createdAt = new \DateTime('now');
@@ -852,7 +859,7 @@ App::get('/v1/cards/cloud-back')
            $isEmployee = \array_key_exists($email, $employees);

            $isGolden = $isEmployee || $isHero || $isContributor;
-            $isPlatinum = $user->getInternalId() % 100 === 0;
+            $isPlatinum = $user->getSequence() % 100 === 0;
        } else {
            $userId = '63e0bcf3c3eb803ba530';

@@ -919,9 +926,9 @@ App::get('/v1/cards/cloud-og')
        }

        if (!$mock) {
-            $internalId = $user->getInternalId();
-            $bgVariation = $internalId % 3 === 0 ? '1' : ($internalId % 3 === 1 ? '2' : '3');
-            $cardVariation = $internalId % 3 === 0 ? '1' : ($internalId % 3 === 1 ? '2' : '3');
+            $sequence = $user->getSequence();
+            $bgVariation = $sequence % 3 === 0 ? '1' : ($sequence % 3 === 1 ? '2' : '3');
+            $cardVariation = $sequence % 3 === 0 ? '1' : ($sequence % 3 === 1 ? '2' : '3');

            $name = $user->getAttribute('name', 'Anonymous');
            $email = $user->getAttribute('email', '');
@@ -951,7 +958,7 @@ App::get('/v1/cards/cloud-og')
                }
            }

-            $isPlatinum = $user->getInternalId() % 100 === 0;
+            $isPlatinum = $user->getSequence() % 100 === 0;
        } else {
            $bgVariation = \str_ends_with($mock, '-bg2') ? '2' : (\str_ends_with($mock, '-bg3') ? '3' : '1');
            $cardVariation = \str_ends_with($mock, '-right') ? '2' : (\str_ends_with($mock, '-middle') ? '3' : '1');
@@ -29,6 +29,7 @@ App::get('/v1/console/variables')
    ->label('scope', 'projects.read')
    ->label('sdk', new Method(
        namespace: 'console',
+        group: 'console',
        name: 'variables',
        description: '/docs/references/console/variables.md',
        auth: [AuthType::ADMIN],
@@ -86,11 +87,12 @@ App::get('/v1/console/variables')
    });

 App::post('/v1/console/assistant')
-    ->desc('Ask query')
+    ->desc('Create assistant query')
    ->groups(['api', 'assistant'])
    ->label('scope', 'assistant.read')
    ->label('sdk', new Method(
        namespace: 'assistant',
+        group: 'console',
        name: 'chat',
        description: '/docs/references/assistant/chat.md',
        auth: [AuthType::ADMIN],
@@ -44,6 +44,7 @@ App::get('/v1/graphql')
    ->label('scope', 'graphql')
    ->label('sdk', new Method(
        namespace: 'graphql',
+        group: 'graphql',
        name: 'get',
        auth: [AuthType::KEY, AuthType::SESSION, AuthType::JWT],
        hide: true,
@@ -90,6 +91,7 @@ App::post('/v1/graphql/mutation')
    ->label('scope', 'graphql')
    ->label('sdk', new Method(
        namespace: 'graphql',
+        group: 'graphql',
        name: 'mutation',
        auth: [AuthType::KEY, AuthType::SESSION, AuthType::JWT],
        description: '/docs/references/graphql/post.md',
@@ -140,6 +142,7 @@ App::post('/v1/graphql')
    ->label('scope', 'graphql')
    ->label('sdk', new Method(
        namespace: 'graphql',
+        group: 'graphql',
        name: 'query',
        auth: [AuthType::KEY, AuthType::SESSION, AuthType::JWT],
        description: '/docs/references/graphql/post.md',
@@ -3,13 +3,16 @@
 use Appwrite\ClamAV\Network;
 use Appwrite\Event\Event;
 use Appwrite\Extend\Exception;
+use Appwrite\PubSub\Adapter\Pool as PubSubPool;
 use Appwrite\SDK\AuthType;
 use Appwrite\SDK\ContentType;
 use Appwrite\SDK\Method;
 use Appwrite\SDK\Response as SDKResponse;
 use Appwrite\Utopia\Response;
 use Utopia\App;
+use Utopia\Cache\Adapter\Pool as CachePool;
 use Utopia\Config\Config;
+use Utopia\Database\Adapter\Pool as DatabasePool;
 use Utopia\Database\Document;
 use Utopia\Domains\Validator\PublicDomain;
 use Utopia\Pools\Group;
@@ -32,9 +35,10 @@ App::get('/v1/health')
    ->label('scope', 'health.read')
    ->label('sdk', new Method(
        namespace: 'health',
+        group: 'health',
        name: 'get',
-        auth: [AuthType::KEY],
        description: '/docs/references/health/get.md',
+        auth: [AuthType::KEY],
        responses: [
            new SDKResponse(
                code: Response::STATUS_CODE_OK,
@@ -69,10 +73,11 @@ App::get('/v1/health/db')
    ->groups(['api', 'health'])
    ->label('scope', 'health.read')
    ->label('sdk', new Method(
-        auth: [AuthType::KEY],
        namespace: 'health',
+        group: 'health',
        name: 'getDB',
        description: '/docs/references/health/get-db.md',
+        auth: [AuthType::KEY],
        responses: [
            new SDKResponse(
                code: Response::STATUS_CODE_OK,
@@ -84,8 +89,8 @@ App::get('/v1/health/db')
    ->inject('response')
    ->inject('pools')
    ->action(function (Response $response, Group $pools) {
-
        $output = [];
+        $failures = [];

        $configs = [
            'Console.DB' => Config::getParam('pools-console'),
@@ -95,7 +100,7 @@ App::get('/v1/health/db')
        foreach ($configs as $key => $config) {
            foreach ($config as $database) {
                try {
-                    $adapter = $pools->get($database)->pop()->getResource();
+                    $adapter = new DatabasePool($pools->get($database));

                    $checkStart = \microtime(true);

@@ -106,16 +111,16 @@ App::get('/v1/health/db')
                            'ping' => \round((\microtime(true) - $checkStart) / 1000)
                        ]);
                    } else {
-                        $failure[] = $database;
+                        $failures[] = $database;
                    }
-                } catch (\Throwable $th) {
-                    $failure[] = $database;
+                } catch (\Throwable) {
+                    $failures[] = $database;
                }
            }
        }

-        if (!empty($failure)) {
-            throw new Exception(Exception::GENERAL_SERVER_ERROR, 'DB failure on: ' . implode(", ", $failure));
+        if (!empty($failures)) {
+            throw new Exception(Exception::GENERAL_SERVER_ERROR, 'DB failure on: ' . implode(", ", $failures));
        }

        $response->dynamic(new Document([
@@ -129,10 +134,11 @@ App::get('/v1/health/cache')
    ->groups(['api', 'health'])
    ->label('scope', 'health.read')
    ->label('sdk', new Method(
-        auth: [AuthType::KEY],
        namespace: 'health',
+        group: 'health',
        name: 'getCache',
        description: '/docs/references/health/get-cache.md',
+        auth: [AuthType::KEY],
        responses: [
            new SDKResponse(
                code: Response::STATUS_CODE_OK,
@@ -144,44 +150,39 @@ App::get('/v1/health/cache')
    ->inject('response')
    ->inject('pools')
    ->action(function (Response $response, Group $pools) {
-
        $output = [];
+        $failures = [];

        $configs = [
            'Cache' => Config::getParam('pools-cache'),
        ];

        foreach ($configs as $key => $config) {
-            foreach ($config as $database) {
+            foreach ($config as $cache) {
                try {
-                    /** @var \Utopia\Cache\Adapter $adapter */
-                    $adapter = $pools->get($database)->pop()->getResource();
+                    $adapter = new CachePool($pools->get($cache));

                    $checkStart = \microtime(true);

                    if ($adapter->ping()) {
                        $output[] = new Document([
-                            'name' => $key . " ($database)",
+                            'name' => $key . " ($cache)",
                            'status' => 'pass',
                            'ping' => \round((\microtime(true) - $checkStart) / 1000)
                        ]);
                    } else {
-                        $output[] = new Document([
-                            'name' => $key . " ($database)",
-                            'status' => 'fail',
-                            'ping' => \round((\microtime(true) - $checkStart) / 1000)
-                        ]);
+                        $failures[] = $cache;
                    }
-                } catch (\Throwable $th) {
-                    $output[] = new Document([
-                        'name' => $key . " ($database)",
-                        'status' => 'fail',
-                        'ping' => \round((\microtime(true) - $checkStart) / 1000)
-                    ]);
+                } catch (\Throwable) {
+                    $failures[] = $cache;
                }
            }
        }

+        if (!empty($failures)) {
+            throw new Exception(Exception::GENERAL_SERVER_ERROR, 'Cache failure on: ' . implode(", ", $failures));
+        }
+
        $response->dynamic(new Document([
            'statuses' => $output,
            'total' => count($output),
@@ -193,10 +194,11 @@ App::get('/v1/health/pubsub')
    ->groups(['api', 'health'])
    ->label('scope', 'health.read')
    ->label('sdk', new Method(
-        auth: [AuthType::KEY],
        namespace: 'health',
+        group: 'health',
        name: 'getPubSub',
        description: '/docs/references/health/get-pubsub.md',
+        auth: [AuthType::KEY],
        responses: [
            new SDKResponse(
                code: Response::STATUS_CODE_OK,
@@ -208,44 +210,39 @@ App::get('/v1/health/pubsub')
    ->inject('response')
    ->inject('pools')
    ->action(function (Response $response, Group $pools) {
-
        $output = [];
+        $failures = [];

        $configs = [
            'PubSub' => Config::getParam('pools-pubsub'),
        ];

        foreach ($configs as $key => $config) {
-            foreach ($config as $database) {
+            foreach ($config as $pubsub) {
                try {
-                    /** @var \Appwrite\PubSub\Adapter $adapter */
-                    $adapter = $pools->get($database)->pop()->getResource();
+                    $adapter = new PubSubPool($pools->get($pubsub));

                    $checkStart = \microtime(true);

                    if ($adapter->ping()) {
                        $output[] = new Document([
-                            'name' => $key . " ($database)",
+                            'name' => $key . " ($pubsub)",
                            'status' => 'pass',
                            'ping' => \round((\microtime(true) - $checkStart) / 1000)
                        ]);
                    } else {
-                        $output[] = new Document([
-                            'name' => $key . " ($database)",
-                            'status' => 'fail',
-                            'ping' => \round((\microtime(true) - $checkStart) / 1000)
-                        ]);
+                        $failures[] = $pubsub;
                    }
-                } catch (\Throwable $th) {
-                    $output[] = new Document([
-                        'name' => $key . " ($database)",
-                        'status' => 'fail',
-                        'ping' => \round((\microtime(true) - $checkStart) / 1000)
-                    ]);
+                } catch (\Throwable) {
+                    $failures[] = $pubsub;
                }
            }
        }

+        if (!empty($failures)) {
+            throw new Exception(Exception::GENERAL_SERVER_ERROR, 'Pubsub failure on: ' . implode(", ", $failures));
+        }
+
        $response->dynamic(new Document([
            'statuses' => $output,
            'total' => count($output),
@@ -257,10 +254,11 @@ App::get('/v1/health/time')
    ->groups(['api', 'health'])
    ->label('scope', 'health.read')
    ->label('sdk', new Method(
-        auth: [AuthType::KEY],
        namespace: 'health',
+        group: 'health',
        name: 'getTime',
        description: '/docs/references/health/get-time.md',
+        auth: [AuthType::KEY],
        responses: [
            new SDKResponse(
                code: Response::STATUS_CODE_OK,
@@ -320,10 +318,11 @@ App::get('/v1/health/queue/webhooks')
    ->groups(['api', 'health'])
    ->label('scope', 'health.read')
    ->label('sdk', new Method(
-        auth: [AuthType::KEY],
        namespace: 'health',
+        group: 'queue',
        name: 'getQueueWebhooks',
        description: '/docs/references/health/get-queue-webhooks.md',
+        auth: [AuthType::KEY],
        responses: [
            new SDKResponse(
                code: Response::STATUS_CODE_OK,
@@ -345,17 +344,18 @@ App::get('/v1/health/queue/webhooks')
        }

        $response->dynamic(new Document([ 'size' => $size ]), Response::MODEL_HEALTH_QUEUE);
-    }, ['response']);
+    });

 App::get('/v1/health/queue/logs')
    ->desc('Get logs queue')
    ->groups(['api', 'health'])
    ->label('scope', 'health.read')
    ->label('sdk', new Method(
-        auth: [AuthType::KEY],
        namespace: 'health',
+        group: 'queue',
        name: 'getQueueLogs',
        description: '/docs/references/health/get-queue-logs.md',
+        auth: [AuthType::KEY],
        responses: [
            new SDKResponse(
                code: Response::STATUS_CODE_OK,
@@ -377,17 +377,18 @@ App::get('/v1/health/queue/logs')
        }

        $response->dynamic(new Document([ 'size' => $size ]), Response::MODEL_HEALTH_QUEUE);
-    }, ['response']);
+    });

 App::get('/v1/health/certificate')
    ->desc('Get the SSL certificate for a domain')
    ->groups(['api', 'health'])
    ->label('scope', 'health.read')
    ->label('sdk', new Method(
-        auth: [AuthType::KEY],
        namespace: 'health',
+        group: 'health',
        name: 'getCertificate',
        description: '/docs/references/health/get-certificate.md',
+        auth: [AuthType::KEY],
        responses: [
            new SDKResponse(
                code: Response::STATUS_CODE_OK,
@@ -433,17 +434,18 @@ App::get('/v1/health/certificate')
            'validTo' => $certificatePayload['validTo_time_t'],
            'signatureTypeSN' => $certificatePayload['signatureTypeSN'],
        ]), Response::MODEL_HEALTH_CERTIFICATE);
-    }, ['response']);
+    });

 App::get('/v1/health/queue/certificates')
    ->desc('Get certificates queue')
    ->groups(['api', 'health'])
    ->label('scope', 'health.read')
    ->label('sdk', new Method(
-        auth: [AuthType::KEY],
        namespace: 'health',
+        group: 'queue',
        name: 'getQueueCertificates',
        description: '/docs/references/health/get-queue-certificates.md',
+        auth: [AuthType::KEY],
        responses: [
            new SDKResponse(
                code: Response::STATUS_CODE_OK,
@@ -465,17 +467,18 @@ App::get('/v1/health/queue/certificates')
        }

        $response->dynamic(new Document([ 'size' => $size ]), Response::MODEL_HEALTH_QUEUE);
-    }, ['response']);
+    });

 App::get('/v1/health/queue/builds')
    ->desc('Get builds queue')
    ->groups(['api', 'health'])
    ->label('scope', 'health.read')
    ->label('sdk', new Method(
-        auth: [AuthType::KEY],
        namespace: 'health',
+        group: 'queue',
        name: 'getQueueBuilds',
        description: '/docs/references/health/get-queue-builds.md',
+        auth: [AuthType::KEY],
        responses: [
            new SDKResponse(
                code: Response::STATUS_CODE_OK,
@@ -497,17 +500,18 @@ App::get('/v1/health/queue/builds')
        }

        $response->dynamic(new Document([ 'size' => $size ]), Response::MODEL_HEALTH_QUEUE);
-    }, ['response']);
+    });

 App::get('/v1/health/queue/databases')
    ->desc('Get databases queue')
    ->groups(['api', 'health'])
    ->label('scope', 'health.read')
    ->label('sdk', new Method(
-        auth: [AuthType::KEY],
        namespace: 'health',
+        group: 'queue',
        name: 'getQueueDatabases',
        description: '/docs/references/health/get-queue-databases.md',
+        auth: [AuthType::KEY],
        responses: [
            new SDKResponse(
                code: Response::STATUS_CODE_OK,
@@ -530,17 +534,18 @@ App::get('/v1/health/queue/databases')
        }

        $response->dynamic(new Document([ 'size' => $size ]), Response::MODEL_HEALTH_QUEUE);
-    }, ['response']);
+    });

 App::get('/v1/health/queue/deletes')
    ->desc('Get deletes queue')
    ->groups(['api', 'health'])
    ->label('scope', 'health.read')
    ->label('sdk', new Method(
-        auth: [AuthType::KEY],
        namespace: 'health',
+        group: 'queue',
        name: 'getQueueDeletes',
        description: '/docs/references/health/get-queue-deletes.md',
+        auth: [AuthType::KEY],
        responses: [
            new SDKResponse(
                code: Response::STATUS_CODE_OK,
@@ -562,17 +567,18 @@ App::get('/v1/health/queue/deletes')
        }

        $response->dynamic(new Document([ 'size' => $size ]), Response::MODEL_HEALTH_QUEUE);
-    }, ['response']);
+    });

 App::get('/v1/health/queue/mails')
    ->desc('Get mails queue')
    ->groups(['api', 'health'])
    ->label('scope', 'health.read')
    ->label('sdk', new Method(
-        auth: [AuthType::KEY],
        namespace: 'health',
+        group: 'queue',
        name: 'getQueueMails',
        description: '/docs/references/health/get-queue-mails.md',
+        auth: [AuthType::KEY],
        responses: [
            new SDKResponse(
                code: Response::STATUS_CODE_OK,
@@ -594,17 +600,18 @@ App::get('/v1/health/queue/mails')
        }

        $response->dynamic(new Document([ 'size' => $size ]), Response::MODEL_HEALTH_QUEUE);
-    }, ['response']);
+    });

 App::get('/v1/health/queue/messaging')
    ->desc('Get messaging queue')
    ->groups(['api', 'health'])
    ->label('scope', 'health.read')
    ->label('sdk', new Method(
-        auth: [AuthType::KEY],
        namespace: 'health',
+        group: 'queue',
        name: 'getQueueMessaging',
        description: '/docs/references/health/get-queue-messaging.md',
+        auth: [AuthType::KEY],
        responses: [
            new SDKResponse(
                code: Response::STATUS_CODE_OK,
@@ -626,17 +633,18 @@ App::get('/v1/health/queue/messaging')
        }

        $response->dynamic(new Document([ 'size' => $size ]), Response::MODEL_HEALTH_QUEUE);
-    }, ['response']);
+    });

 App::get('/v1/health/queue/migrations')
    ->desc('Get migrations queue')
    ->groups(['api', 'health'])
    ->label('scope', 'health.read')
    ->label('sdk', new Method(
-        auth: [AuthType::KEY],
        namespace: 'health',
+        group: 'queue',
        name: 'getQueueMigrations',
        description: '/docs/references/health/get-queue-migrations.md',
+        auth: [AuthType::KEY],
        responses: [
            new SDKResponse(
                code: Response::STATUS_CODE_OK,
@@ -658,17 +666,18 @@ App::get('/v1/health/queue/migrations')
        }

        $response->dynamic(new Document([ 'size' => $size ]), Response::MODEL_HEALTH_QUEUE);
-    }, ['response']);
+    });

 App::get('/v1/health/queue/functions')
    ->desc('Get functions queue')
    ->groups(['api', 'health'])
    ->label('scope', 'health.read')
    ->label('sdk', new Method(
-        auth: [AuthType::KEY],
        namespace: 'health',
+        group: 'queue',
        name: 'getQueueFunctions',
        description: '/docs/references/health/get-queue-functions.md',
+        auth: [AuthType::KEY],
        responses: [
            new SDKResponse(
                code: Response::STATUS_CODE_OK,
@@ -690,17 +699,18 @@ App::get('/v1/health/queue/functions')
        }

        $response->dynamic(new Document([ 'size' => $size ]), Response::MODEL_HEALTH_QUEUE);
-    }, ['response']);
+    });

 App::get('/v1/health/queue/stats-resources')
    ->desc('Get stats  resources queue')
    ->groups(['api', 'health'])
    ->label('scope', 'health.read')
    ->label('sdk', new Method(
-        auth: [AuthType::KEY],
        namespace: 'health',
+        group: 'queue',
        name: 'getQueueStatsResources',
        description: '/docs/references/health/get-queue-stats-resources.md',
+        auth: [AuthType::KEY],
        responses: [
            new SDKResponse(
                code: Response::STATUS_CODE_OK,
@@ -729,10 +739,11 @@ App::get('/v1/health/queue/stats-usage')
    ->groups(['api', 'health'])
    ->label('scope', 'health.read')
    ->label('sdk', new Method(
-        auth: [AuthType::KEY],
        namespace: 'health',
+        group: 'queue',
        name: 'getQueueUsage',
        description: '/docs/references/health/get-queue-stats-usage.md',
+        auth: [AuthType::KEY],
        responses: [
            new SDKResponse(
                code: Response::STATUS_CODE_OK,
@@ -756,47 +767,16 @@ App::get('/v1/health/queue/stats-usage')
        $response->dynamic(new Document([ 'size' => $size ]), Response::MODEL_HEALTH_QUEUE);
    });

-App::get('/v1/health/queue/stats-usage-dump')
-    ->desc('Get usage dump queue')
-    ->groups(['api', 'health'])
-    ->label('scope', 'health.read')
-    ->label('sdk', new Method(
-        auth: [AuthType::KEY],
-        namespace: 'health',
-        name: 'getQueueStatsUsageDump',
-        description: '/docs/references/health/get-queue-stats-usage-dump.md',
-        responses: [
-            new SDKResponse(
-                code: Response::STATUS_CODE_OK,
-                model: Response::MODEL_HEALTH_QUEUE,
-            )
-        ],
-        contentType: ContentType::JSON
-    ))
-    ->param('threshold', 5000, new Integer(true), 'Queue size threshold. When hit (equal or higher), endpoint returns server error. Default value is 5000.', true)
-    ->inject('publisher')
-    ->inject('response')
-    ->action(function (int|string $threshold, Publisher $publisher, Response $response) {
-        $threshold = \intval($threshold);
-
-        $size = $publisher->getQueueSize(new Queue(Event::STATS_USAGE_DUMP_QUEUE_NAME));
-
-        if ($size >= $threshold) {
-            throw new Exception(Exception::HEALTH_QUEUE_SIZE_EXCEEDED, "Queue size threshold hit. Current size is {$size} and threshold is {$threshold}.");
-        }
-
-        $response->dynamic(new Document([ 'size' => $size ]), Response::MODEL_HEALTH_QUEUE);
-    });
-
 App::get('/v1/health/storage/local')
    ->desc('Get local storage')
    ->groups(['api', 'health'])
    ->label('scope', 'health.read')
    ->label('sdk', new Method(
-        auth: [AuthType::KEY],
        namespace: 'health',
+        group: 'storage',
        name: 'getStorageLocal',
        description: '/docs/references/health/get-storage-local.md',
+        auth: [AuthType::KEY],
        responses: [
            new SDKResponse(
                code: Response::STATUS_CODE_OK,
@@ -842,10 +822,11 @@ App::get('/v1/health/storage')
    ->groups(['api', 'health'])
    ->label('scope', 'health.read')
    ->label('sdk', new Method(
-        auth: [AuthType::KEY],
        namespace: 'health',
+        group: 'storage',
        name: 'getStorage',
        description: '/docs/references/health/get-storage.md',
+        auth: [AuthType::KEY],
        responses: [
            new SDKResponse(
                code: Response::STATUS_CODE_OK,
@@ -864,15 +845,18 @@ App::get('/v1/health/storage')
        $checkStart = \microtime(true);

        foreach ($devices as $device) {
-            if (!$device->write($device->getPath('health.txt'), 'test', 'text/plain')) {
+            $uniqueFileName = \uniqid('health', true);
+            $filePath = $device->getPath($uniqueFileName);
+
+            if (!$device->write($filePath, 'test', 'text/plain')) {
                throw new Exception(Exception::GENERAL_SERVER_ERROR, 'Failed writing test file to ' . $device->getRoot());
            }

-            if ($device->read($device->getPath('health.txt')) !== 'test') {
+            if ($device->read($filePath) !== 'test') {
                throw new Exception(Exception::GENERAL_SERVER_ERROR, 'Failed reading test file from ' . $device->getRoot());
            }

-            if (!$device->delete($device->getPath('health.txt'))) {
+            if (!$device->delete($filePath)) {
                throw new Exception(Exception::GENERAL_SERVER_ERROR, 'Failed deleting test file from ' . $device->getRoot());
            }
        }
@@ -890,10 +874,11 @@ App::get('/v1/health/anti-virus')
    ->groups(['api', 'health'])
    ->label('scope', 'health.read')
    ->label('sdk', new Method(
-        auth: [AuthType::KEY],
        namespace: 'health',
+        group: 'health',
        name: 'getAntivirus',
        description: '/docs/references/health/get-storage-anti-virus.md',
+        auth: [AuthType::KEY],
        responses: [
            new SDKResponse(
                code: Response::STATUS_CODE_OK,
@@ -935,10 +920,11 @@ App::get('/v1/health/queue/failed/:name')
    ->groups(['api', 'health'])
    ->label('scope', 'health.read')
    ->label('sdk', new Method(
-        auth: [AuthType::KEY],
        namespace: 'health',
+        group: 'queue',
        name: 'getFailedJobs',
        description: '/docs/references/health/get-failed-queue-jobs.md',
+        auth: [AuthType::KEY],
        responses: [
            new SDKResponse(
                code: Response::STATUS_CODE_OK,
@@ -955,7 +941,6 @@ App::get('/v1/health/queue/failed/:name')
        Event::FUNCTIONS_QUEUE_NAME,
        Event::STATS_RESOURCES_QUEUE_NAME,
        Event::STATS_USAGE_QUEUE_NAME,
-        Event::STATS_USAGE_DUMP_QUEUE_NAME,
        Event::WEBHOOK_QUEUE_NAME,
        Event::CERTIFICATES_QUEUE_NAME,
        Event::BUILDS_QUEUE_NAME,
@@ -981,9 +966,6 @@ App::get('/v1/health/stats') // Currently only used internally
 ->desc('Get system stats')
    ->groups(['api', 'health'])
    ->label('scope', 'root')
-    // ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
-    // ->label('sdk.namespace', 'health')
-    // ->label('sdk.method', 'getStats')
    ->label('docs', false)
    ->inject('response')
    ->inject('register')
@@ -17,6 +17,7 @@ App::get('/v1/locale')
    ->label('scope', 'locale.read')
    ->label('sdk', new Method(
        namespace: 'locale',
+        group: null,
        name: 'get',
        description: '/docs/references/locale/get-locale.md',
        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -80,6 +81,7 @@ App::get('/v1/locale/codes')
    ->label('scope', 'locale.read')
    ->label('sdk', new Method(
        namespace: 'locale',
+        group: null,
        name: 'listCodes',
        description: '/docs/references/locale/list-locale-codes.md',
        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -105,6 +107,7 @@ App::get('/v1/locale/countries')
    ->label('scope', 'locale.read')
    ->label('sdk', new Method(
        namespace: 'locale',
+        group: null,
        name: 'listCountries',
        description: '/docs/references/locale/list-countries.md',
        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -141,6 +144,7 @@ App::get('/v1/locale/countries/eu')
    ->label('scope', 'locale.read')
    ->label('sdk', new Method(
        namespace: 'locale',
+        group: null,
        name: 'listCountriesEU',
        description: '/docs/references/locale/list-countries-eu.md',
        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -179,6 +183,7 @@ App::get('/v1/locale/countries/phones')
    ->label('scope', 'locale.read')
    ->label('sdk', new Method(
        namespace: 'locale',
+        group: null,
        name: 'listCountriesPhones',
        description: '/docs/references/locale/list-countries-phones.md',
        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -216,6 +221,7 @@ App::get('/v1/locale/continents')
    ->label('scope', 'locale.read')
    ->label('sdk', new Method(
        namespace: 'locale',
+        group: null,
        name: 'listContinents',
        description: '/docs/references/locale/list-continents.md',
        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -251,6 +257,7 @@ App::get('/v1/locale/currencies')
    ->label('scope', 'locale.read')
    ->label('sdk', new Method(
        namespace: 'locale',
+        group: null,
        name: 'listCurrencies',
        description: '/docs/references/locale/list-currencies.md',
        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -277,6 +284,7 @@ App::get('/v1/locale/languages')
    ->label('scope', 'locale.read')
    ->label('sdk', new Method(
        namespace: 'locale',
+        group: null,
        name: 'listLanguages',
        description: '/docs/references/locale/list-languages.md',
        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -30,6 +30,7 @@ use Utopia\Database\Database;
 use Utopia\Database\DateTime;
 use Utopia\Database\Document;
 use Utopia\Database\Exception\Duplicate as DuplicateException;
+use Utopia\Database\Exception\Order as OrderException;
 use Utopia\Database\Exception\Query as QueryException;
 use Utopia\Database\Helpers\ID;
 use Utopia\Database\Query;
@@ -63,6 +64,7 @@ App::post('/v1/messaging/providers/mailgun')
    ->label('resourceType', RESOURCE_TYPE_PROVIDERS)
    ->label('sdk', new Method(
        namespace: 'messaging',
+        group: 'providers',
        name: 'createMailgunProvider',
        description: '/docs/references/messaging/create-mailgun-provider.md',
        auth: [AuthType::ADMIN, AuthType::KEY],
@@ -156,6 +158,7 @@ App::post('/v1/messaging/providers/sendgrid')
    ->label('resourceType', RESOURCE_TYPE_PROVIDERS)
    ->label('sdk', new Method(
        namespace: 'messaging',
+        group: 'providers',
        name: 'createSendgridProvider',
        description: '/docs/references/messaging/create-sendgrid-provider.md',
        auth: [AuthType::ADMIN, AuthType::KEY],
@@ -237,6 +240,7 @@ App::post('/v1/messaging/providers/smtp')
    ->label('resourceType', RESOURCE_TYPE_PROVIDERS)
    ->label('sdk', new Method(
        namespace: 'messaging',
+        group: 'providers',
        name: 'createSmtpProvider',
        description: '/docs/references/messaging/create-smtp-provider.md',
        auth: [AuthType::ADMIN, AuthType::KEY],
@@ -331,6 +335,7 @@ App::post('/v1/messaging/providers/msg91')
    ->label('event', 'providers.[providerId].create')
    ->label('sdk', new Method(
        namespace: 'messaging',
+        group: 'providers',
        name: 'createMsg91Provider',
        description: '/docs/references/messaging/create-msg91-provider.md',
        auth: [AuthType::ADMIN, AuthType::KEY],
@@ -413,6 +418,7 @@ App::post('/v1/messaging/providers/telesign')
    ->label('resourceType', RESOURCE_TYPE_PROVIDERS)
    ->label('sdk', new Method(
        namespace: 'messaging',
+        group: 'providers',
        name: 'createTelesignProvider',
        description: '/docs/references/messaging/create-telesign-provider.md',
        auth: [AuthType::ADMIN, AuthType::KEY],
@@ -496,6 +502,7 @@ App::post('/v1/messaging/providers/textmagic')
    ->label('resourceType', RESOURCE_TYPE_PROVIDERS)
    ->label('sdk', new Method(
        namespace: 'messaging',
+        group: 'providers',
        name: 'createTextmagicProvider',
        description: '/docs/references/messaging/create-textmagic-provider.md',
        auth: [AuthType::ADMIN, AuthType::KEY],
@@ -579,6 +586,7 @@ App::post('/v1/messaging/providers/twilio')
    ->label('resourceType', RESOURCE_TYPE_PROVIDERS)
    ->label('sdk', new Method(
        namespace: 'messaging',
+        group: 'providers',
        name: 'createTwilioProvider',
        description: '/docs/references/messaging/create-twilio-provider.md',
        auth: [AuthType::ADMIN, AuthType::KEY],
@@ -662,6 +670,7 @@ App::post('/v1/messaging/providers/vonage')
    ->label('resourceType', RESOURCE_TYPE_PROVIDERS)
    ->label('sdk', new Method(
        namespace: 'messaging',
+        group: 'providers',
        name: 'createVonageProvider',
        description: '/docs/references/messaging/create-vonage-provider.md',
        auth: [AuthType::ADMIN, AuthType::KEY],
@@ -745,6 +754,7 @@ App::post('/v1/messaging/providers/fcm')
    ->label('resourceType', RESOURCE_TYPE_PROVIDERS)
    ->label('sdk', new Method(
        namespace: 'messaging',
+        group: 'providers',
        name: 'createFcmProvider',
        description: '/docs/references/messaging/create-fcm-provider.md',
        auth: [AuthType::ADMIN, AuthType::KEY],
@@ -814,6 +824,7 @@ App::post('/v1/messaging/providers/apns')
    ->label('resourceType', RESOURCE_TYPE_PROVIDERS)
    ->label('sdk', new Method(
        namespace: 'messaging',
+        group: 'providers',
        name: 'createApnsProvider',
        description: '/docs/references/messaging/create-apns-provider.md',
        auth: [AuthType::ADMIN, AuthType::KEY],
@@ -903,6 +914,7 @@ App::get('/v1/messaging/providers')
    ->label('resourceType', RESOURCE_TYPE_PROVIDERS)
    ->label('sdk', new Method(
        namespace: 'messaging',
+        group: 'providers',
        name: 'listProviders',
        description: '/docs/references/messaging/list-providers.md',
        auth: [AuthType::ADMIN, AuthType::KEY],
@@ -951,10 +963,15 @@ App::get('/v1/messaging/providers')

            $cursor->setValue($cursorDocument);
        }
-
+        try {
+            $providers = $dbForProject->find('providers', $queries);
+            $total = $dbForProject->count('providers', $queries, APP_LIMIT_COUNT);
+        } catch (OrderException $e) {
+            throw new Exception(Exception::DATABASE_QUERY_ORDER_NULL, "The order attribute '{$e->getAttribute()}' had a null value. Cursor pagination requires all documents order attribute values are non-null.");
+        }
        $response->dynamic(new Document([
-            'providers' => $dbForProject->find('providers', $queries),
-            'total' => $dbForProject->count('providers', $queries, APP_LIMIT_COUNT),
+            'providers' => $providers,
+            'total' => $total,
        ]), Response::MODEL_PROVIDER_LIST);
    });

@@ -965,6 +982,7 @@ App::get('/v1/messaging/providers/:providerId/logs')
    ->label('resourceType', RESOURCE_TYPE_PROVIDERS)
    ->label('sdk', new Method(
        namespace: 'messaging',
+        group: 'providers',
        name: 'listProviderLogs',
        description: '/docs/references/messaging/list-provider-logs.md',
        auth: [AuthType::ADMIN, AuthType::KEY],
@@ -1061,6 +1079,7 @@ App::get('/v1/messaging/providers/:providerId')
    ->label('resourceType', RESOURCE_TYPE_PROVIDERS)
    ->label('sdk', new Method(
        namespace: 'messaging',
+        group: 'providers',
        name: 'getProvider',
        description: '/docs/references/messaging/get-provider.md',
        auth: [AuthType::ADMIN, AuthType::KEY],
@@ -1094,6 +1113,7 @@ App::patch('/v1/messaging/providers/mailgun/:providerId')
    ->label('resourceType', RESOURCE_TYPE_PROVIDERS)
    ->label('sdk', new Method(
        namespace: 'messaging',
+        group: 'providers',
        name: 'updateMailgunProvider',
        description: '/docs/references/messaging/update-mailgun-provider.md',
        auth: [AuthType::ADMIN, AuthType::KEY],
@@ -1206,6 +1226,7 @@ App::patch('/v1/messaging/providers/sendgrid/:providerId')
    ->label('resourceType', RESOURCE_TYPE_PROVIDERS)
    ->label('sdk', new Method(
        namespace: 'messaging',
+        group: 'providers',
        name: 'updateSendgridProvider',
        description: '/docs/references/messaging/update-sendgrid-provider.md',
        auth: [AuthType::ADMIN, AuthType::KEY],
@@ -1303,6 +1324,7 @@ App::patch('/v1/messaging/providers/smtp/:providerId')
    ->label('resourceType', RESOURCE_TYPE_PROVIDERS)
    ->label('sdk', new Method(
        namespace: 'messaging',
+        group: 'providers',
        name: 'updateSmtpProvider',
        description: '/docs/references/messaging/update-smtp-provider.md',
        auth: [AuthType::ADMIN, AuthType::KEY],
@@ -1431,6 +1453,7 @@ App::patch('/v1/messaging/providers/msg91/:providerId')
    ->label('resourceType', RESOURCE_TYPE_PROVIDERS)
    ->label('sdk', new Method(
        namespace: 'messaging',
+        group: 'providers',
        name: 'updateMsg91Provider',
        description: '/docs/references/messaging/update-msg91-provider.md',
        auth: [AuthType::ADMIN, AuthType::KEY],
@@ -1517,6 +1540,7 @@ App::patch('/v1/messaging/providers/telesign/:providerId')
    ->label('resourceType', RESOURCE_TYPE_PROVIDERS)
    ->label('sdk', new Method(
        namespace: 'messaging',
+        group: 'providers',
        name: 'updateTelesignProvider',
        description: '/docs/references/messaging/update-telesign-provider.md',
        auth: [AuthType::ADMIN, AuthType::KEY],
@@ -1605,6 +1629,7 @@ App::patch('/v1/messaging/providers/textmagic/:providerId')
    ->label('resourceType', RESOURCE_TYPE_PROVIDERS)
    ->label('sdk', new Method(
        namespace: 'messaging',
+        group: 'providers',
        name: 'updateTextmagicProvider',
        description: '/docs/references/messaging/update-textmagic-provider.md',
        auth: [AuthType::ADMIN, AuthType::KEY],
@@ -1693,6 +1718,7 @@ App::patch('/v1/messaging/providers/twilio/:providerId')
    ->label('resourceType', RESOURCE_TYPE_PROVIDERS)
    ->label('sdk', new Method(
        namespace: 'messaging',
+        group: 'providers',
        name: 'updateTwilioProvider',
        description: '/docs/references/messaging/update-twilio-provider.md',
        auth: [AuthType::ADMIN, AuthType::KEY],
@@ -1781,6 +1807,7 @@ App::patch('/v1/messaging/providers/vonage/:providerId')
    ->label('resourceType', RESOURCE_TYPE_PROVIDERS)
    ->label('sdk', new Method(
        namespace: 'messaging',
+        group: 'providers',
        name: 'updateVonageProvider',
        description: '/docs/references/messaging/update-vonage-provider.md',
        auth: [AuthType::ADMIN, AuthType::KEY],
@@ -1869,6 +1896,7 @@ App::patch('/v1/messaging/providers/fcm/:providerId')
    ->label('resourceType', RESOURCE_TYPE_PROVIDERS)
    ->label('sdk', new Method(
        namespace: 'messaging',
+        group: 'providers',
        name: 'updateFcmProvider',
        description: '/docs/references/messaging/update-fcm-provider.md',
        auth: [AuthType::ADMIN, AuthType::KEY],
@@ -1944,6 +1972,7 @@ App::patch('/v1/messaging/providers/apns/:providerId')
    ->label('resourceType', RESOURCE_TYPE_PROVIDERS)
    ->label('sdk', new Method(
        namespace: 'messaging',
+        group: 'providers',
        name: 'updateApnsProvider',
        description: '/docs/references/messaging/update-apns-provider.md',
        auth: [AuthType::ADMIN, AuthType::KEY],
@@ -2045,6 +2074,7 @@ App::delete('/v1/messaging/providers/:providerId')
    ->label('resourceType', RESOURCE_TYPE_PROVIDERS)
    ->label('sdk', new Method(
        namespace: 'messaging',
+        group: 'providers',
        name: 'deleteProvider',
        description: '/docs/references/messaging/delete-provider.md',
        auth: [AuthType::ADMIN, AuthType::KEY],
@@ -2087,6 +2117,7 @@ App::post('/v1/messaging/topics')
    ->label('resourceType', RESOURCE_TYPE_TOPICS)
    ->label('sdk', new Method(
        namespace: 'messaging',
+        group: 'topics',
        name: 'createTopic',
        description: '/docs/references/messaging/create-topic.md',
        auth: [AuthType::ADMIN, AuthType::KEY],
@@ -2133,6 +2164,7 @@ App::get('/v1/messaging/topics')
    ->label('resourceType', RESOURCE_TYPE_TOPICS)
    ->label('sdk', new Method(
        namespace: 'messaging',
+        group: 'topics',
        name: 'listTopics',
        description: '/docs/references/messaging/list-topics.md',
        auth: [AuthType::ADMIN, AuthType::KEY],
@@ -2181,10 +2213,15 @@ App::get('/v1/messaging/topics')

            $cursor->setValue($cursorDocument[0]);
        }
-
+        try {
+            $topics = $dbForProject->find('topics', $queries);
+            $total = $dbForProject->count('topics', $queries, APP_LIMIT_COUNT);
+        } catch (OrderException $e) {
+            throw new Exception(Exception::DATABASE_QUERY_ORDER_NULL, "The order attribute '{$e->getAttribute()}' had a null value. Cursor pagination requires all documents order attribute values are non-null.");
+        }
        $response->dynamic(new Document([
-            'topics' => $dbForProject->find('topics', $queries),
-            'total' => $dbForProject->count('topics', $queries, APP_LIMIT_COUNT),
+            'topics' => $topics,
+            'total' => $total,
        ]), Response::MODEL_TOPIC_LIST);
    });

@@ -2195,6 +2232,7 @@ App::get('/v1/messaging/topics/:topicId/logs')
    ->label('resourceType', RESOURCE_TYPE_TOPICS)
    ->label('sdk', new Method(
        namespace: 'messaging',
+        group: 'topics',
        name: 'listTopicLogs',
        description: '/docs/references/messaging/list-topic-logs.md',
        auth: [AuthType::ADMIN, AuthType::KEY],
@@ -2292,6 +2330,7 @@ App::get('/v1/messaging/topics/:topicId')
    ->label('resourceType', RESOURCE_TYPE_TOPICS)
    ->label('sdk', new Method(
        namespace: 'messaging',
+        group: 'topics',
        name: 'getTopic',
        description: '/docs/references/messaging/get-topic.md',
        auth: [AuthType::ADMIN, AuthType::KEY],
@@ -2326,6 +2365,7 @@ App::patch('/v1/messaging/topics/:topicId')
    ->label('resourceType', RESOURCE_TYPE_TOPICS)
    ->label('sdk', new Method(
        namespace: 'messaging',
+        group: 'topics',
        name: 'updateTopic',
        description: '/docs/references/messaging/update-topic.md',
        auth: [AuthType::ADMIN, AuthType::KEY],
@@ -2376,6 +2416,7 @@ App::delete('/v1/messaging/topics/:topicId')
    ->label('resourceType', RESOURCE_TYPE_TOPICS)
    ->label('sdk', new Method(
        namespace: 'messaging',
+        group: 'topics',
        name: 'deleteTopic',
        description: '/docs/references/messaging/delete-topic.md',
        auth: [AuthType::ADMIN, AuthType::KEY],
@@ -2423,6 +2464,7 @@ App::post('/v1/messaging/topics/:topicId/subscribers')
    ->label('resourceType', RESOURCE_TYPE_SUBSCRIBERS)
    ->label('sdk', new Method(
        namespace: 'messaging',
+        group: 'subscribers',
        name: 'createSubscriber',
        description: '/docs/references/messaging/create-subscriber.md',
        auth: [AuthType::JWT, AuthType::SESSION, AuthType::ADMIN, AuthType::KEY],
@@ -2469,11 +2511,11 @@ App::post('/v1/messaging/topics/:topicId/subscribers')
                Permission::delete(Role::user($user->getId())),
            ],
            'topicId' => $topicId,
-            'topicInternalId' => $topic->getInternalId(),
+            'topicInternalId' => $topic->getSequence(),
            'targetId' => $targetId,
-            'targetInternalId' => $target->getInternalId(),
+            'targetInternalId' => $target->getSequence(),
            'userId' => $user->getId(),
-            'userInternalId' => $user->getInternalId(),
+            'userInternalId' => $user->getSequence(),
            'providerType' => $target->getAttribute('providerType'),
            'search' => implode(' ', [
                $subscriberId,
@@ -2522,6 +2564,7 @@ App::get('/v1/messaging/topics/:topicId/subscribers')
    ->label('resourceType', RESOURCE_TYPE_SUBSCRIBERS)
    ->label('sdk', new Method(
        namespace: 'messaging',
+        group: 'subscribers',
        name: 'listSubscribers',
        description: '/docs/references/messaging/list-subscribers.md',
        auth: [AuthType::ADMIN, AuthType::KEY],
@@ -2554,7 +2597,7 @@ App::get('/v1/messaging/topics/:topicId/subscribers')
            throw new Exception(Exception::TOPIC_NOT_FOUND);
        }

-        $queries[] = Query::equal('topicInternalId', [$topic->getInternalId()]);
+        $queries[] = Query::equal('topicInternalId', [$topic->getSequence()]);

        /**
         * Get cursor document if there was a cursor query, we use array_filter and reset for reference $cursor to $queries
@@ -2579,8 +2622,11 @@ App::get('/v1/messaging/topics/:topicId/subscribers')

            $cursor->setValue($cursorDocument);
        }
-
-        $subscribers = $dbForProject->find('subscribers', $queries);
+        try {
+            $subscribers = $dbForProject->find('subscribers', $queries);
+        } catch (OrderException $e) {
+            throw new Exception(Exception::DATABASE_QUERY_ORDER_NULL, "The order attribute '{$e->getAttribute()}' had a null value. Cursor pagination requires all documents order attribute values are non-null.");
+        }

        $subscribers = batch(\array_map(function (Document $subscriber) use ($dbForProject) {
            return function () use ($subscriber, $dbForProject) {
@@ -2607,6 +2653,7 @@ App::get('/v1/messaging/subscribers/:subscriberId/logs')
    ->label('resourceType', RESOURCE_TYPE_SUBSCRIBERS)
    ->label('sdk', new Method(
        namespace: 'messaging',
+        group: 'subscribers',
        name: 'listSubscriberLogs',
        description: '/docs/references/messaging/list-subscriber-logs.md',
        auth: [AuthType::ADMIN, AuthType::KEY],
@@ -2704,6 +2751,7 @@ App::get('/v1/messaging/topics/:topicId/subscribers/:subscriberId')
    ->label('resourceType', RESOURCE_TYPE_SUBSCRIBERS)
    ->label('sdk', new Method(
        namespace: 'messaging',
+        group: 'subscribers',
        name: 'getSubscriber',
        description: '/docs/references/messaging/get-subscriber.md',
        auth: [AuthType::ADMIN, AuthType::KEY],
@@ -2752,6 +2800,7 @@ App::delete('/v1/messaging/topics/:topicId/subscribers/:subscriberId')
    ->label('resourceType', RESOURCE_TYPE_SUBSCRIBERS)
    ->label('sdk', new Method(
        namespace: 'messaging',
+        group: 'subscribers',
        name: 'deleteSubscriber',
        description: '/docs/references/messaging/delete-subscriber.md',
        auth: [AuthType::JWT, AuthType::SESSION, AuthType::ADMIN, AuthType::KEY],
@@ -2818,6 +2867,7 @@ App::post('/v1/messaging/messages/email')
    ->label('resourceType', RESOURCE_TYPE_MESSAGES)
    ->label('sdk', new Method(
        namespace: 'messaging',
+        group: 'messages',
        name: 'createEmail',
        description: '/docs/references/messaging/create-email.md',
        auth: [AuthType::ADMIN, AuthType::KEY],
@@ -2897,7 +2947,7 @@ App::post('/v1/messaging/messages/email')
                    throw new Exception(Exception::STORAGE_BUCKET_NOT_FOUND);
                }

-                $file = $dbForProject->getDocument('bucket_' . $bucket->getInternalId(), $fileId);
+                $file = $dbForProject->getDocument('bucket_' . $bucket->getSequence(), $fileId);

                if ($file->isEmpty()) {
                    throw new Exception(Exception::STORAGE_FILE_NOT_FOUND);
@@ -2939,7 +2989,7 @@ App::post('/v1/messaging/messages/email')
                    'region' => $project->getAttribute('region'),
                    'resourceType' => 'message',
                    'resourceId' => $message->getId(),
-                    'resourceInternalId' => $message->getInternalId(),
+                    'resourceInternalId' => $message->getSequence(),
                    'resourceUpdatedAt' => DateTime::now(),
                    'projectId' => $project->getId(),
                    'schedule' => $scheduledAt,
@@ -2976,6 +3026,7 @@ App::post('/v1/messaging/messages/sms')
    ->label('resourceType', RESOURCE_TYPE_MESSAGES)
    ->label('sdk', new Method(
        namespace: 'messaging',
+        group: 'messages',
        name: 'createSms',
        description: '/docs/references/messaging/create-sms.md',
        auth: [AuthType::ADMIN, AuthType::KEY],
@@ -3061,7 +3112,7 @@ App::post('/v1/messaging/messages/sms')
                    'region' => $project->getAttribute('region'),
                    'resourceType' => 'message',
                    'resourceId' => $message->getId(),
-                    'resourceInternalId' => $message->getInternalId(),
+                    'resourceInternalId' => $message->getSequence(),
                    'resourceUpdatedAt' => DateTime::now(),
                    'projectId' => $project->getId(),
                    'schedule' => $scheduledAt,
@@ -3098,6 +3149,7 @@ App::post('/v1/messaging/messages/push')
    ->label('resourceType', RESOURCE_TYPE_MESSAGES)
    ->label('sdk', new Method(
        namespace: 'messaging',
+        group: 'messages',
        name: 'createPush',
        description: '/docs/references/messaging/create-push.md',
        auth: [AuthType::ADMIN, AuthType::KEY],
@@ -3180,7 +3232,7 @@ App::post('/v1/messaging/messages/push')
                throw new Exception(Exception::STORAGE_BUCKET_NOT_FOUND);
            }

-            $file = $dbForProject->getDocument('bucket_' . $bucket->getInternalId(), $fileId);
+            $file = $dbForProject->getDocument('bucket_' . $bucket->getSequence(), $fileId);
            if ($file->isEmpty()) {
                throw new Exception(Exception::STORAGE_BUCKET_NOT_FOUND);
            }
@@ -3278,7 +3330,7 @@ App::post('/v1/messaging/messages/push')
                    'region' => $project->getAttribute('region'),
                    'resourceType' => 'message',
                    'resourceId' => $message->getId(),
-                    'resourceInternalId' => $message->getInternalId(),
+                    'resourceInternalId' => $message->getSequence(),
                    'resourceUpdatedAt' => DateTime::now(),
                    'projectId' => $project->getId(),
                    'schedule' => $scheduledAt,
@@ -3312,6 +3364,7 @@ App::get('/v1/messaging/messages')
    ->label('resourceType', RESOURCE_TYPE_MESSAGES)
    ->label('sdk', new Method(
        namespace: 'messaging',
+        group: 'messages',
        name: 'listMessages',
        description: '/docs/references/messaging/list-messages.md',
        auth: [AuthType::ADMIN, AuthType::KEY],
@@ -3360,10 +3413,15 @@ App::get('/v1/messaging/messages')

            $cursor->setValue($cursorDocument);
        }
-
+        try {
+            $messages = $dbForProject->find('messages', $queries);
+            $total = $dbForProject->count('messages', $queries, APP_LIMIT_COUNT);
+        } catch (OrderException $e) {
+            throw new Exception(Exception::DATABASE_QUERY_ORDER_NULL, "The order attribute '{$e->getAttribute()}' had a null value. Cursor pagination requires all documents order attribute values are non-null.");
+        }
        $response->dynamic(new Document([
-            'messages' => $dbForProject->find('messages', $queries),
-            'total' => $dbForProject->count('messages', $queries, APP_LIMIT_COUNT),
+            'messages' => $messages,
+            'total' => $total,
        ]), Response::MODEL_MESSAGE_LIST);
    });

@@ -3374,6 +3432,7 @@ App::get('/v1/messaging/messages/:messageId/logs')
    ->label('resourceType', RESOURCE_TYPE_MESSAGES)
    ->label('sdk', new Method(
        namespace: 'messaging',
+        group: 'logs',
        name: 'listMessageLogs',
        description: '/docs/references/messaging/list-message-logs.md',
        auth: [AuthType::ADMIN, AuthType::KEY],
@@ -3471,6 +3530,7 @@ App::get('/v1/messaging/messages/:messageId/targets')
    ->label('resourceType', RESOURCE_TYPE_MESSAGES)
    ->label('sdk', new Method(
        namespace: 'messaging',
+        group: 'messages',
        name: 'listTargets',
        description: '/docs/references/messaging/list-message-targets.md',
        auth: [AuthType::ADMIN, AuthType::KEY],
@@ -3533,10 +3593,15 @@ App::get('/v1/messaging/messages/:messageId/targets')

            $cursor->setValue($cursorDocument);
        }
-
+        try {
+            $targets = $dbForProject->find('targets', $queries);
+            $total = $dbForProject->count('targets', $queries, APP_LIMIT_COUNT);
+        } catch (OrderException $e) {
+            throw new Exception(Exception::DATABASE_QUERY_ORDER_NULL, "The order attribute '{$e->getAttribute()}' had a null value. Cursor pagination requires all documents order attribute values are non-null.");
+        }
        $response->dynamic(new Document([
-            'targets' => $dbForProject->find('targets', $queries),
-            'total' => $dbForProject->count('targets', $queries, APP_LIMIT_COUNT),
+            'targets' => $targets,
+            'total' => $total,
        ]), Response::MODEL_TARGET_LIST);
    });

@@ -3547,6 +3612,7 @@ App::get('/v1/messaging/messages/:messageId')
    ->label('resourceType', RESOURCE_TYPE_MESSAGES)
    ->label('sdk', new Method(
        namespace: 'messaging',
+        group: 'messages',
        name: 'getMessage',
        description: '/docs/references/messaging/get-message.md',
        auth: [AuthType::ADMIN, AuthType::KEY],
@@ -3580,6 +3646,7 @@ App::patch('/v1/messaging/messages/email/:messageId')
    ->label('resourceType', RESOURCE_TYPE_MESSAGES)
    ->label('sdk', new Method(
        namespace: 'messaging',
+        group: 'messages',
        name: 'updateEmail',
        description: '/docs/references/messaging/update-email.md',
        auth: [AuthType::ADMIN, AuthType::KEY],
@@ -3664,7 +3731,7 @@ App::patch('/v1/messaging/messages/email/:messageId')
                'region' => $project->getAttribute('region'),
                'resourceType' => 'message',
                'resourceId' => $message->getId(),
-                'resourceInternalId' => $message->getInternalId(),
+                'resourceInternalId' => $message->getSequence(),
                'resourceUpdatedAt' => DateTime::now(),
                'projectId' => $project->getId(),
                'schedule' => $scheduledAt,
@@ -3729,7 +3796,7 @@ App::patch('/v1/messaging/messages/email/:messageId')
                    throw new Exception(Exception::STORAGE_BUCKET_NOT_FOUND);
                }

-                $file = $dbForProject->getDocument('bucket_' . $bucket->getInternalId(), $fileId);
+                $file = $dbForProject->getDocument('bucket_' . $bucket->getSequence(), $fileId);

                if ($file->isEmpty()) {
                    throw new Exception(Exception::STORAGE_FILE_NOT_FOUND);
@@ -3786,6 +3853,7 @@ App::patch('/v1/messaging/messages/sms/:messageId')
    ->label('resourceType', RESOURCE_TYPE_MESSAGES)
    ->label('sdk', new Method(
        namespace: 'messaging',
+        group: 'messages',
        name: 'updateSms',
        description: '/docs/references/messaging/update-sms.md',
        auth: [AuthType::ADMIN, AuthType::KEY],
@@ -3865,7 +3933,7 @@ App::patch('/v1/messaging/messages/sms/:messageId')
                'region' => $project->getAttribute('region'),
                'resourceType' => 'message',
                'resourceId' => $message->getId(),
-                'resourceInternalId' => $message->getInternalId(),
+                'resourceInternalId' => $message->getSequence(),
                'resourceUpdatedAt' => DateTime::now(),
                'projectId' => $project->getId(),
                'schedule' => $scheduledAt,
@@ -3947,6 +4015,7 @@ App::patch('/v1/messaging/messages/push/:messageId')
    ->label('resourceType', RESOURCE_TYPE_MESSAGES)
    ->label('sdk', new Method(
        namespace: 'messaging',
+        group: 'messages',
        name: 'updatePush',
        description: '/docs/references/messaging/update-push.md',
        auth: [AuthType::ADMIN, AuthType::KEY],
@@ -4038,7 +4107,7 @@ App::patch('/v1/messaging/messages/push/:messageId')
                'region' => $project->getAttribute('region'),
                'resourceType' => 'message',
                'resourceId' => $message->getId(),
-                'resourceInternalId' => $message->getInternalId(),
+                'resourceInternalId' => $message->getSequence(),
                'resourceUpdatedAt' => DateTime::now(),
                'projectId' => $project->getId(),
                'schedule' => $scheduledAt,
@@ -4141,7 +4210,7 @@ App::patch('/v1/messaging/messages/push/:messageId')
                throw new Exception(Exception::STORAGE_BUCKET_NOT_FOUND);
            }

-            $file = $dbForProject->getDocument('bucket_' . $bucket->getInternalId(), $fileId);
+            $file = $dbForProject->getDocument('bucket_' . $bucket->getSequence(), $fileId);
            if ($file->isEmpty()) {
                throw new Exception(Exception::STORAGE_BUCKET_NOT_FOUND);
            }
@@ -4206,6 +4275,7 @@ App::delete('/v1/messaging/messages/:messageId')
    ->label('resourceType', RESOURCE_TYPE_MESSAGES)
    ->label('sdk', new Method(
        namespace: 'messaging',
+        group: 'messages',
        name: 'delete',
        description: '/docs/references/messaging/delete-message.md',
        auth: [AuthType::ADMIN, AuthType::KEY],
@@ -15,6 +15,7 @@ use Appwrite\Utopia\Response;
 use Utopia\App;
 use Utopia\Database\Database;
 use Utopia\Database\Document;
+use Utopia\Database\Exception\Order as OrderException;
 use Utopia\Database\Exception\Query as QueryException;
 use Utopia\Database\Helpers\ID;
 use Utopia\Database\Query;
@@ -43,12 +44,13 @@ include_once __DIR__ . '/../shared/api.php';

 App::post('/v1/migrations/appwrite')
    ->groups(['api', 'migrations'])
-    ->desc('Migrate Appwrite data')
+    ->desc('Create Appwrite migration')
    ->label('scope', 'migrations.write')
    ->label('event', 'migrations.[migrationId].create')
    ->label('audits.event', 'migration.create')
    ->label('sdk', new Method(
        namespace: 'migrations',
+        group: null,
        name: 'createAppwriteMigration',
        description: '/docs/references/migrations/migration-appwrite.md',
        auth: [AuthType::ADMIN],
@@ -103,12 +105,13 @@ App::post('/v1/migrations/appwrite')

 App::post('/v1/migrations/firebase')
    ->groups(['api', 'migrations'])
-    ->desc('Migrate Firebase data')
+    ->desc('Create Firebase migration')
    ->label('scope', 'migrations.write')
    ->label('event', 'migrations.[migrationId].create')
    ->label('audits.event', 'migration.create')
    ->label('sdk', new Method(
        namespace: 'migrations',
+        group: null,
        name: 'createFirebaseMigration',
        description: '/docs/references/migrations/migration-firebase.md',
        auth: [AuthType::ADMIN],
@@ -169,12 +172,13 @@ App::post('/v1/migrations/firebase')

 App::post('/v1/migrations/supabase')
    ->groups(['api', 'migrations'])
-    ->desc('Migrate Supabase data')
+    ->desc('Create Supabase migration')
    ->label('scope', 'migrations.write')
    ->label('event', 'migrations.[migrationId].create')
    ->label('audits.event', 'migration.create')
    ->label('sdk', new Method(
        namespace: 'migrations',
+        group: null,
        name: 'createSupabaseMigration',
        description: '/docs/references/migrations/migration-supabase.md',
        auth: [AuthType::ADMIN],
@@ -235,12 +239,13 @@ App::post('/v1/migrations/supabase')

 App::post('/v1/migrations/nhost')
    ->groups(['api', 'migrations'])
-    ->desc('Migrate NHost data')
+    ->desc('Create NHost migration')
    ->label('scope', 'migrations.write')
    ->label('event', 'migrations.[migrationId].create')
    ->label('audits.event', 'migration.create')
    ->label('sdk', new Method(
        namespace: 'migrations',
+        group: null,
        name: 'createNHostMigration',
        description: '/docs/references/migrations/migration-nhost.md',
        auth: [AuthType::ADMIN],
@@ -309,6 +314,7 @@ App::post('/v1/migrations/csv')
    ->label('audits.event', 'migration.create')
    ->label('sdk', new Method(
        namespace: 'migrations',
+        group: null,
        name: 'createCsvMigration',
        description: '/docs/references/migrations/migration-csv.md',
        auth: [AuthType::ADMIN],
@@ -339,7 +345,7 @@ App::post('/v1/migrations/csv')
            throw new Exception(Exception::STORAGE_BUCKET_NOT_FOUND);
        }

-        $file = Authorization::skip(fn () => $dbForProject->getDocument('bucket_' . $bucket->getInternalId(), $fileId));
+        $file = Authorization::skip(fn () => $dbForProject->getDocument('bucket_' . $bucket->getSequence(), $fileId));
        if ($file->isEmpty()) {
            throw new Exception(Exception::STORAGE_FILE_NOT_FOUND);
        }
@@ -431,6 +437,7 @@ App::get('/v1/migrations')
    ->label('scope', 'migrations.read')
    ->label('sdk', new Method(
        namespace: 'migrations',
+        group: null,
        name: 'list',
        description: '/docs/references/migrations/list-migrations.md',
        auth: [AuthType::ADMIN],
@@ -482,10 +489,15 @@ App::get('/v1/migrations')
        }

        $filterQueries = Query::groupByType($queries)['filters'];
-
+        try {
+            $migrations = $dbForProject->find('migrations', $queries);
+            $total = $dbForProject->count('migrations', $filterQueries, APP_LIMIT_COUNT);
+        } catch (OrderException $e) {
+            throw new Exception(Exception::DATABASE_QUERY_ORDER_NULL, "The order attribute '{$e->getAttribute()}' had a null value. Cursor pagination requires all documents order attribute values are non-null.");
+        }
        $response->dynamic(new Document([
-            'migrations' => $dbForProject->find('migrations', $queries),
-            'total' => $dbForProject->count('migrations', $filterQueries, APP_LIMIT_COUNT),
+            'migrations' => $migrations,
+            'total' => $total,
        ]), Response::MODEL_MIGRATION_LIST);
    });

@@ -495,6 +507,7 @@ App::get('/v1/migrations/:migrationId')
    ->label('scope', 'migrations.read')
    ->label('sdk', new Method(
        namespace: 'migrations',
+        group: null,
        name: 'get',
        description: '/docs/references/migrations/get-migration.md',
        auth: [AuthType::ADMIN],
@@ -520,10 +533,11 @@ App::get('/v1/migrations/:migrationId')

 App::get('/v1/migrations/appwrite/report')
    ->groups(['api', 'migrations'])
-    ->desc('Generate a report on Appwrite data')
+    ->desc('Get Appwrite migration report')
    ->label('scope', 'migrations.write')
    ->label('sdk', new Method(
        namespace: 'migrations',
+        group: null,
        name: 'getAppwriteReport',
        description: '/docs/references/migrations/migration-appwrite-report.md',
        auth: [AuthType::ADMIN],
@@ -543,6 +557,7 @@ App::get('/v1/migrations/appwrite/report')
    ->inject('project')
    ->inject('user')
    ->action(function (array $resources, string $endpoint, string $projectID, string $key, Response $response) {
+
        $appwrite = new Appwrite($projectID, $endpoint, $key);

        try {
@@ -567,10 +582,11 @@ App::get('/v1/migrations/appwrite/report')

 App::get('/v1/migrations/firebase/report')
    ->groups(['api', 'migrations'])
-    ->desc('Generate a report on Firebase data')
+    ->desc('Get Firebase migration report')
    ->label('scope', 'migrations.write')
    ->label('sdk', new Method(
        namespace: 'migrations',
+        group: null,
        name: 'getFirebaseReport',
        description: '/docs/references/migrations/migration-firebase-report.md',
        auth: [AuthType::ADMIN],
@@ -619,10 +635,11 @@ App::get('/v1/migrations/firebase/report')

 App::get('/v1/migrations/supabase/report')
    ->groups(['api', 'migrations'])
-    ->desc('Generate a report on Supabase Data')
+    ->desc('Get Supabase migration report')
    ->label('scope', 'migrations.write')
    ->label('sdk', new Method(
        namespace: 'migrations',
+        group: null,
        name: 'getSupabaseReport',
        description: '/docs/references/migrations/migration-supabase-report.md',
        auth: [AuthType::ADMIN],
@@ -667,10 +684,11 @@ App::get('/v1/migrations/supabase/report')

 App::get('/v1/migrations/nhost/report')
    ->groups(['api', 'migrations'])
-    ->desc('Generate a report on NHost Data')
+    ->desc('Get NHost migration report')
    ->label('scope', 'migrations.write')
    ->label('sdk', new Method(
        namespace: 'migrations',
+        group: null,
        name: 'getNHostReport',
        description: '/docs/references/migrations/migration-nhost-report.md',
        auth: [AuthType::ADMIN],
@@ -715,13 +733,14 @@ App::get('/v1/migrations/nhost/report')

 App::patch('/v1/migrations/:migrationId')
    ->groups(['api', 'migrations'])
-    ->desc('Retry migration')
+    ->desc('Update retry migration')
    ->label('scope', 'migrations.write')
    ->label('event', 'migrations.[migrationId].retry')
    ->label('audits.event', 'migration.retry')
    ->label('audits.resource', 'migrations/{request.migrationId}')
    ->label('sdk', new Method(
        namespace: 'migrations',
+        group: null,
        name: 'retry',
        description: '/docs/references/migrations/retry-migration.md',
        auth: [AuthType::ADMIN],
@@ -772,6 +791,7 @@ App::delete('/v1/migrations/:migrationId')
    ->label('audits.resource', 'migrations/{request.migrationId}')
    ->label('sdk', new Method(
        namespace: 'migrations',
+        group: null,
        name: 'delete',
        description: '/docs/references/migrations/delete-migration.md',
        auth: [AuthType::ADMIN],
@@ -27,6 +27,7 @@ App::get('/v1/project/usage')
    ->label('scope', 'projects.read')
    ->label('sdk', new Method(
        namespace: 'project',
+        group: null,
        name: 'getUsage',
        description: '/docs/references/project/get-usage.md',
        auth: [AuthType::ADMIN],
@@ -149,7 +150,7 @@ App::get('/v1/project/usage')
        $executionsBreakdown = array_map(function ($function) use ($dbForProject) {
            $id = $function->getId();
            $name = $function->getAttribute('name');
-            $metric = str_replace(['{resourceType}', '{resourceInternalId}'], [RESOURCE_TYPE_FUNCTIONS, $function->getInternalId()], METRIC_RESOURCE_TYPE_ID_EXECUTIONS);
+            $metric = str_replace(['{resourceType}', '{resourceInternalId}'], [RESOURCE_TYPE_FUNCTIONS, $function->getSequence()], METRIC_RESOURCE_TYPE_ID_EXECUTIONS);
            $value = $dbForProject->findOne('stats', [
                Query::equal('metric', [$metric]),
                Query::equal('period', ['inf'])
@@ -165,7 +166,7 @@ App::get('/v1/project/usage')
        $executionsMbSecondsBreakdown = array_map(function ($function) use ($dbForProject) {
            $id = $function->getId();
            $name = $function->getAttribute('name');
-            $metric = str_replace(['{resourceType}', '{resourceInternalId}'], [RESOURCE_TYPE_FUNCTIONS, $function->getInternalId()], METRIC_RESOURCE_TYPE_ID_EXECUTIONS_MB_SECONDS);
+            $metric = str_replace(['{resourceType}', '{resourceInternalId}'], [RESOURCE_TYPE_FUNCTIONS, $function->getSequence()], METRIC_RESOURCE_TYPE_ID_EXECUTIONS_MB_SECONDS);
            $value = $dbForProject->findOne('stats', [
                Query::equal('metric', [$metric]),
                Query::equal('period', ['inf'])
@@ -181,7 +182,7 @@ App::get('/v1/project/usage')
        $buildsMbSecondsBreakdown = array_map(function ($function) use ($dbForProject) {
            $id = $function->getId();
            $name = $function->getAttribute('name');
-            $metric = str_replace(['{resourceType}', '{resourceInternalId}'], [RESOURCE_TYPE_FUNCTIONS, $function->getInternalId()], METRIC_RESOURCE_TYPE_ID_BUILDS_MB_SECONDS);
+            $metric = str_replace(['{resourceType}', '{resourceInternalId}'], [RESOURCE_TYPE_FUNCTIONS, $function->getSequence()], METRIC_RESOURCE_TYPE_ID_BUILDS_MB_SECONDS);
            $value = $dbForProject->findOne('stats', [
                Query::equal('metric', [$metric]),
                Query::equal('period', ['inf'])
@@ -197,7 +198,7 @@ App::get('/v1/project/usage')
        $bucketsBreakdown = array_map(function ($bucket) use ($dbForProject) {
            $id = $bucket->getId();
            $name = $bucket->getAttribute('name');
-            $metric = str_replace('{bucketInternalId}', $bucket->getInternalId(), METRIC_BUCKET_ID_FILES_STORAGE);
+            $metric = str_replace('{bucketInternalId}', $bucket->getSequence(), METRIC_BUCKET_ID_FILES_STORAGE);
            $value = $dbForProject->findOne('stats', [
                Query::equal('metric', [$metric]),
                Query::equal('period', ['inf'])
@@ -213,7 +214,7 @@ App::get('/v1/project/usage')
        $databasesStorageBreakdown = array_map(function ($database) use ($dbForProject) {
            $id = $database->getId();
            $name = $database->getAttribute('name');
-            $metric = str_replace('{databaseInternalId}', $database->getInternalId(), METRIC_DATABASE_ID_STORAGE);
+            $metric = str_replace('{databaseInternalId}', $database->getSequence(), METRIC_DATABASE_ID_STORAGE);

            $value = $dbForProject->findOne('stats', [
                Query::equal('metric', [$metric]),
@@ -230,13 +231,13 @@ App::get('/v1/project/usage')
        $functionsStorageBreakdown = array_map(function ($function) use ($dbForProject) {
            $id = $function->getId();
            $name = $function->getAttribute('name');
-            $deploymentMetric = str_replace(['{resourceType}', '{resourceInternalId}'], [RESOURCE_TYPE_FUNCTIONS, $function->getInternalId()], METRIC_RESOURCE_TYPE_ID_DEPLOYMENTS_STORAGE);
+            $deploymentMetric = str_replace(['{resourceType}', '{resourceInternalId}'], [RESOURCE_TYPE_FUNCTIONS, $function->getSequence()], METRIC_RESOURCE_TYPE_ID_DEPLOYMENTS_STORAGE);
            $deploymentValue = $dbForProject->findOne('stats', [
                Query::equal('metric', [$deploymentMetric]),
                Query::equal('period', ['inf'])
            ]);

-            $buildMetric = str_replace(['{resourceType}', '{resourceInternalId}'], [RESOURCE_TYPE_FUNCTIONS, $function->getInternalId()], METRIC_RESOURCE_TYPE_ID_BUILDS_STORAGE);
+            $buildMetric = str_replace(['{resourceType}', '{resourceInternalId}'], [RESOURCE_TYPE_FUNCTIONS, $function->getSequence()], METRIC_RESOURCE_TYPE_ID_BUILDS_STORAGE);
            $buildValue = $dbForProject->findOne('stats', [
                Query::equal('metric', [$buildMetric]),
                Query::equal('period', ['inf'])
@@ -254,7 +255,7 @@ App::get('/v1/project/usage')
        $executionsMbSecondsBreakdown = array_map(function ($function) use ($dbForProject) {
            $id = $function->getId();
            $name = $function->getAttribute('name');
-            $metric = str_replace(['{resourceType}', '{resourceInternalId}'], [RESOURCE_TYPE_FUNCTIONS, $function->getInternalId()], METRIC_RESOURCE_TYPE_ID_EXECUTIONS_MB_SECONDS);
+            $metric = str_replace(['{resourceType}', '{resourceInternalId}'], [RESOURCE_TYPE_FUNCTIONS, $function->getSequence()], METRIC_RESOURCE_TYPE_ID_EXECUTIONS_MB_SECONDS);
            $value = $dbForProject->findOne('stats', [
                Query::equal('metric', [$metric]),
                Query::equal('period', ['inf'])
@@ -270,7 +271,7 @@ App::get('/v1/project/usage')
        $buildsMbSecondsBreakdown = array_map(function ($function) use ($dbForProject) {
            $id = $function->getId();
            $name = $function->getAttribute('name');
-            $metric = str_replace(['{resourceType}', '{resourceInternalId}'], [RESOURCE_TYPE_FUNCTIONS, $function->getInternalId()], METRIC_RESOURCE_TYPE_ID_BUILDS_MB_SECONDS);
+            $metric = str_replace(['{resourceType}', '{resourceInternalId}'], [RESOURCE_TYPE_FUNCTIONS, $function->getSequence()], METRIC_RESOURCE_TYPE_ID_BUILDS_MB_SECONDS);
            $value = $dbForProject->findOne('stats', [
                Query::equal('metric', [$metric]),
                Query::equal('period', ['inf'])
@@ -388,6 +389,7 @@ App::post('/v1/project/variables')
    ->label('audits.event', 'variable.create')
    ->label('sdk', new Method(
        namespace: 'project',
+        group: null,
        name: 'createVariable',
        description: '/docs/references/project/create-variable.md',
        auth: [AuthType::ADMIN],
@@ -449,6 +451,7 @@ App::get('/v1/project/variables')
    ->label('scope', 'projects.read')
    ->label('sdk', new Method(
        namespace: 'project',
+        group: null,
        name: 'listVariables',
        description: '/docs/references/project/list-variables.md',
        auth: [AuthType::ADMIN],
@@ -479,6 +482,7 @@ App::get('/v1/project/variables/:variableId')
    ->label('scope', 'projects.read')
    ->label('sdk', new Method(
        namespace: 'project',
+        group: null,
        name: 'getVariable',
        description: '/docs/references/project/get-variable.md',
        auth: [AuthType::ADMIN],
@@ -508,6 +512,7 @@ App::put('/v1/project/variables/:variableId')
    ->label('scope', 'projects.write')
    ->label('sdk', new Method(
        namespace: 'project',
+        group: null,
        name: 'updateVariable',
        description: '/docs/references/project/update-variable.md',
        auth: [AuthType::ADMIN],
@@ -565,6 +570,7 @@ App::delete('/v1/project/variables/:variableId')
    ->label('scope', 'projects.write')
    ->label('sdk', new Method(
        namespace: 'project',
+        group: null,
        name: 'deleteVariable',
        description: '/docs/references/project/delete-variable.md',
        auth: [AuthType::ADMIN],
@@ -24,10 +24,12 @@ use Utopia\App;
 use Utopia\Audit\Audit;
 use Utopia\Cache\Cache;
 use Utopia\Config\Config;
+use Utopia\Database\Adapter\Pool as DatabasePool;
 use Utopia\Database\Database;
 use Utopia\Database\DateTime;
 use Utopia\Database\Document;
 use Utopia\Database\Exception\Duplicate;
+use Utopia\Database\Exception\Order as OrderException;
 use Utopia\Database\Exception\Query as QueryException;
 use Utopia\Database\Helpers\ID;
 use Utopia\Database\Helpers\Permission;
@@ -68,6 +70,7 @@ App::post('/v1/projects')
    ->label('scope', 'projects.write')
    ->label('sdk', new Method(
        namespace: 'projects',
+        group: 'projects',
        name: 'create',
        description: '/docs/references/projects/create.md',
        auth: [AuthType::ADMIN],
@@ -138,6 +141,14 @@ App::post('/v1/projects')

        $databases = Config::getParam('pools-database', []);

+        if ($region !== 'default') {
+            $databaseKeys = System::getEnv('_APP_DATABASE_KEYS', '');
+            $keys = explode(',', $databaseKeys);
+            $databases = array_filter($keys, function ($value) use ($region) {
+                return str_contains($value, $region);
+            });
+        }
+
        $databaseOverride = System::getEnv('_APP_DATABASE_OVERRIDE');
        $index = \array_search($databaseOverride, $databases);
        if ($index !== false) {
@@ -171,7 +182,7 @@ App::post('/v1/projects')
                    Permission::delete(Role::team(ID::custom($teamId), 'developer')),
                ],
                'name' => $name,
-                'teamInternalId' => $team->getInternalId(),
+                'teamInternalId' => $team->getSequence(),
                'teamId' => $team->getId(),
                'region' => $region,
                'description' => $description,
@@ -205,27 +216,27 @@ App::post('/v1/projects')
            $dsn = new DSN('mysql://' . $dsn);
        }

-        $adapter = $pools->get($dsn->getHost())->pop()->getResource();
-        $dbForProject = new Database($adapter, $cache);
        $sharedTables = \explode(',', System::getEnv('_APP_DATABASE_SHARED_TABLES', ''));
        $sharedTablesV1 = \explode(',', System::getEnv('_APP_DATABASE_SHARED_TABLES_V1', ''));
-
        $projectTables = !\in_array($dsn->getHost(), $sharedTables);
        $sharedTablesV1 = \in_array($dsn->getHost(), $sharedTablesV1);
        $sharedTablesV2 = !$projectTables && !$sharedTablesV1;
        $sharedTables = $sharedTablesV1 || $sharedTablesV2;

        if (!$sharedTablesV2) {
+            $adapter = new DatabasePool($pools->get($dsn->getHost()));
+            $dbForProject = new Database($adapter, $cache);
+
            if ($sharedTables) {
                $dbForProject
                    ->setSharedTables(true)
-                    ->setTenant($sharedTablesV1 ? $project->getInternalId() : null)
+                    ->setTenant($sharedTablesV1 ? $project->getSequence() : null)
                    ->setNamespace($dsn->getParam('namespace'));
            } else {
                $dbForProject
                    ->setSharedTables(false)
                    ->setTenant(null)
-                    ->setNamespace('_' . $project->getInternalId());
+                    ->setNamespace('_' . $project->getSequence());
            }

            $create = true;
@@ -297,6 +308,7 @@ App::get('/v1/projects')
    ->label('scope', 'projects.read')
    ->label('sdk', new Method(
        namespace: 'projects',
+        group: 'projects',
        name: 'list',
        description: '/docs/references/projects/list.md',
        auth: [AuthType::ADMIN],
@@ -349,10 +361,15 @@ App::get('/v1/projects')
        }

        $filterQueries = Query::groupByType($queries)['filters'];
-
+        try {
+            $projects = $dbForPlatform->find('projects', $queries);
+            $total = $dbForPlatform->count('projects', $filterQueries, APP_LIMIT_COUNT);
+        } catch (OrderException $e) {
+            throw new Exception(Exception::DATABASE_QUERY_ORDER_NULL, "The order attribute '{$e->getAttribute()}' had a null value. Cursor pagination requires all documents order attribute values are non-null.");
+        }
        $response->dynamic(new Document([
-            'projects' => $dbForPlatform->find('projects', $queries),
-            'total' => $dbForPlatform->count('projects', $filterQueries, APP_LIMIT_COUNT),
+            'projects' => $projects,
+            'total' => $total,
        ]), Response::MODEL_PROJECT_LIST);
    });

@@ -362,6 +379,7 @@ App::get('/v1/projects/:projectId')
    ->label('scope', 'projects.read')
    ->label('sdk', new Method(
        namespace: 'projects',
+        group: 'projects',
        name: 'get',
        description: '/docs/references/projects/get.md',
        auth: [AuthType::ADMIN],
@@ -394,6 +412,7 @@ App::patch('/v1/projects/:projectId')
    ->label('audits.resource', 'project/{request.projectId}')
    ->label('sdk', new Method(
        namespace: 'projects',
+        group: 'projects',
        name: 'update',
        description: '/docs/references/projects/update.md',
        auth: [AuthType::ADMIN],
@@ -447,6 +466,7 @@ App::patch('/v1/projects/:projectId/team')
    ->label('scope', 'projects.write')
    ->label('sdk', new Method(
        namespace: 'projects',
+        group: 'projects',
        name: 'updateTeam',
        description: '/docs/references/projects/update-team.md',
        auth: [AuthType::ADMIN],
@@ -484,12 +504,12 @@ App::patch('/v1/projects/:projectId/team')

        $project
            ->setAttribute('teamId', $teamId)
-            ->setAttribute('teamInternalId', $team->getInternalId())
+            ->setAttribute('teamInternalId', $team->getSequence())
            ->setAttribute('$permissions', $permissions);
        $project = $dbForPlatform->updateDocument('projects', $project->getId(), $project);

        $installations = $dbForPlatform->find('installations', [
-            Query::equal('projectInternalId', [$project->getInternalId()]),
+            Query::equal('projectInternalId', [$project->getSequence()]),
        ]);
        foreach ($installations as $installation) {
            $installation->getAttribute('$permissions', $permissions);
@@ -497,7 +517,7 @@ App::patch('/v1/projects/:projectId/team')
        }

        $repositories = $dbForPlatform->find('repositories', [
-            Query::equal('projectInternalId', [$project->getInternalId()]),
+            Query::equal('projectInternalId', [$project->getSequence()]),
        ]);
        foreach ($repositories as $repository) {
            $repository->getAttribute('$permissions', $permissions);
@@ -505,7 +525,7 @@ App::patch('/v1/projects/:projectId/team')
        }

        $vcsComments = $dbForPlatform->find('vcsComments', [
-            Query::equal('projectInternalId', [$project->getInternalId()]),
+            Query::equal('projectInternalId', [$project->getSequence()]),
        ]);
        foreach ($vcsComments as $vcsComment) {
            $vcsComment->getAttribute('$permissions', $permissions);
@@ -521,6 +541,7 @@ App::patch('/v1/projects/:projectId/service')
    ->label('scope', 'projects.write')
    ->label('sdk', new Method(
        namespace: 'projects',
+        group: 'projects',
        name: 'updateServiceStatus',
        description: '/docs/references/projects/update-service-status.md',
        auth: [AuthType::ADMIN],
@@ -558,6 +579,7 @@ App::patch('/v1/projects/:projectId/service/all')
    ->label('scope', 'projects.write')
    ->label('sdk', new Method(
        namespace: 'projects',
+        group: 'projects',
        name: 'updateServiceStatusAll',
        description: '/docs/references/projects/update-service-status-all.md',
        auth: [AuthType::ADMIN],
@@ -598,6 +620,7 @@ App::patch('/v1/projects/:projectId/api')
    ->label('scope', 'projects.write')
    ->label('sdk', new Method(
        namespace: 'projects',
+        group: 'projects',
        name: 'updateApiStatus',
        description: '/docs/references/projects/update-api-status.md',
        auth: [AuthType::ADMIN],
@@ -635,6 +658,7 @@ App::patch('/v1/projects/:projectId/api/all')
    ->label('scope', 'projects.write')
    ->label('sdk', new Method(
        namespace: 'projects',
+        group: 'projects',
        name: 'updateApiStatusAll',
        description: '/docs/references/projects/update-api-status-all.md',
        auth: [AuthType::ADMIN],
@@ -675,6 +699,7 @@ App::patch('/v1/projects/:projectId/oauth2')
    ->label('scope', 'projects.write')
    ->label('sdk', new Method(
        namespace: 'projects',
+        group: 'auth',
        name: 'updateOAuth2',
        description: '/docs/references/projects/update-oauth2.md',
        auth: [AuthType::ADMIN],
@@ -725,6 +750,7 @@ App::patch('/v1/projects/:projectId/auth/session-alerts')
    ->label('scope', 'projects.write')
    ->label('sdk', new Method(
        namespace: 'projects',
+        group: 'auth',
        name: 'updateSessionAlerts',
        description: '/docs/references/projects/update-session-alerts.md',
        auth: [AuthType::ADMIN],
@@ -762,6 +788,7 @@ App::patch('/v1/projects/:projectId/auth/memberships-privacy')
    ->label('scope', 'projects.write')
    ->label('sdk', new Method(
        namespace: 'projects',
+        group: 'auth',
        name: 'updateMembershipsPrivacy',
        description: '/docs/references/projects/update-memberships-privacy.md',
        auth: [AuthType::ADMIN],
@@ -803,6 +830,7 @@ App::patch('/v1/projects/:projectId/auth/limit')
    ->label('scope', 'projects.write')
    ->label('sdk', new Method(
        namespace: 'projects',
+        group: 'auth',
        name: 'updateAuthLimit',
        description: '/docs/references/projects/update-auth-limit.md',
        auth: [AuthType::ADMIN],
@@ -840,6 +868,7 @@ App::patch('/v1/projects/:projectId/auth/duration')
    ->label('scope', 'projects.write')
    ->label('sdk', new Method(
        namespace: 'projects',
+        group: 'auth',
        name: 'updateAuthDuration',
        description: '/docs/references/projects/update-auth-duration.md',
        auth: [AuthType::ADMIN],
@@ -877,6 +906,7 @@ App::patch('/v1/projects/:projectId/auth/:method')
    ->label('scope', 'projects.write')
    ->label('sdk', new Method(
        namespace: 'projects',
+        group: 'auth',
        name: 'updateAuthStatus',
        description: '/docs/references/projects/update-auth-status.md',
        auth: [AuthType::ADMIN],
@@ -917,6 +947,7 @@ App::patch('/v1/projects/:projectId/auth/password-history')
    ->label('scope', 'projects.write')
    ->label('sdk', new Method(
        namespace: 'projects',
+        group: 'auth',
        name: 'updateAuthPasswordHistory',
        description: '/docs/references/projects/update-auth-password-history.md',
        auth: [AuthType::ADMIN],
@@ -954,6 +985,7 @@ App::patch('/v1/projects/:projectId/auth/password-dictionary')
    ->label('scope', 'projects.write')
    ->label('sdk', new Method(
        namespace: 'projects',
+        group: 'auth',
        name: 'updateAuthPasswordDictionary',
        description: '/docs/references/projects/update-auth-password-dictionary.md',
        auth: [AuthType::ADMIN],
@@ -986,11 +1018,12 @@ App::patch('/v1/projects/:projectId/auth/password-dictionary')
    });

 App::patch('/v1/projects/:projectId/auth/personal-data')
-    ->desc('Enable or disable checking user passwords for similarity with their personal data.')
+    ->desc('Update personal data check')
    ->groups(['api', 'projects'])
    ->label('scope', 'projects.write')
    ->label('sdk', new Method(
        namespace: 'projects',
+        group: 'auth',
        name: 'updatePersonalDataCheck',
        description: '/docs/references/projects/update-personal-data-check.md',
        auth: [AuthType::ADMIN],
@@ -1028,6 +1061,7 @@ App::patch('/v1/projects/:projectId/auth/max-sessions')
    ->label('scope', 'projects.write')
    ->label('sdk', new Method(
        namespace: 'projects',
+        group: 'auth',
        name: 'updateAuthSessionsLimit',
        description: '/docs/references/projects/update-auth-sessions-limit.md',
        auth: [AuthType::ADMIN],
@@ -1065,6 +1099,7 @@ App::patch('/v1/projects/:projectId/auth/mock-numbers')
    ->label('scope', 'projects.write')
    ->label('sdk', new Method(
        namespace: 'projects',
+        group: 'auth',
        name: 'updateMockNumbers',
        description: '/docs/references/projects/update-mock-numbers.md',
        auth: [AuthType::ADMIN],
@@ -1112,6 +1147,7 @@ App::delete('/v1/projects/:projectId')
    ->label('scope', 'projects.write')
    ->label('sdk', new Method(
        namespace: 'projects',
+        group: 'projects',
        name: 'delete',
        description: '/docs/references/projects/delete.md',
        auth: [AuthType::ADMIN],
@@ -1155,6 +1191,7 @@ App::post('/v1/projects/:projectId/webhooks')
    ->label('scope', 'projects.write')
    ->label('sdk', new Method(
        namespace: 'projects',
+        group: 'webhooks',
        name: 'createWebhook',
        description: '/docs/references/projects/create-webhook.md',
        auth: [AuthType::ADMIN],
@@ -1192,7 +1229,7 @@ App::post('/v1/projects/:projectId/webhooks')
                Permission::update(Role::any()),
                Permission::delete(Role::any()),
            ],
-            'projectInternalId' => $project->getInternalId(),
+            'projectInternalId' => $project->getSequence(),
            'projectId' => $project->getId(),
            'name' => $name,
            'events' => $events,
@@ -1219,6 +1256,7 @@ App::get('/v1/projects/:projectId/webhooks')
    ->label('scope', 'projects.read')
    ->label('sdk', new Method(
        namespace: 'projects',
+        group: 'webhooks',
        name: 'listWebhooks',
        description: '/docs/references/projects/list-webhooks.md',
        auth: [AuthType::ADMIN],
@@ -1241,7 +1279,7 @@ App::get('/v1/projects/:projectId/webhooks')
        }

        $webhooks = $dbForPlatform->find('webhooks', [
-            Query::equal('projectInternalId', [$project->getInternalId()]),
+            Query::equal('projectInternalId', [$project->getSequence()]),
            Query::limit(5000),
        ]);

@@ -1257,6 +1295,7 @@ App::get('/v1/projects/:projectId/webhooks/:webhookId')
    ->label('scope', 'projects.read')
    ->label('sdk', new Method(
        namespace: 'projects',
+        group: 'webhooks',
        name: 'getWebhook',
        description: '/docs/references/projects/get-webhook.md',
        auth: [AuthType::ADMIN],
@@ -1281,7 +1320,7 @@ App::get('/v1/projects/:projectId/webhooks/:webhookId')

        $webhook = $dbForPlatform->findOne('webhooks', [
            Query::equal('$id', [$webhookId]),
-            Query::equal('projectInternalId', [$project->getInternalId()]),
+            Query::equal('projectInternalId', [$project->getSequence()]),
        ]);

        if ($webhook->isEmpty()) {
@@ -1297,6 +1336,7 @@ App::put('/v1/projects/:projectId/webhooks/:webhookId')
    ->label('scope', 'projects.write')
    ->label('sdk', new Method(
        namespace: 'projects',
+        group: 'webhooks',
        name: 'updateWebhook',
        description: '/docs/references/projects/update-webhook.md',
        auth: [AuthType::ADMIN],
@@ -1330,7 +1370,7 @@ App::put('/v1/projects/:projectId/webhooks/:webhookId')

        $webhook = $dbForPlatform->findOne('webhooks', [
            Query::equal('$id', [$webhookId]),
-            Query::equal('projectInternalId', [$project->getInternalId()]),
+            Query::equal('projectInternalId', [$project->getSequence()]),
        ]);

        if ($webhook->isEmpty()) {
@@ -1362,6 +1402,7 @@ App::patch('/v1/projects/:projectId/webhooks/:webhookId/signature')
    ->label('scope', 'projects.write')
    ->label('sdk', new Method(
        namespace: 'projects',
+        group: 'webhooks',
        name: 'updateWebhookSignature',
        description: '/docs/references/projects/update-webhook-signature.md',
        auth: [AuthType::ADMIN],
@@ -1386,7 +1427,7 @@ App::patch('/v1/projects/:projectId/webhooks/:webhookId/signature')

        $webhook = $dbForPlatform->findOne('webhooks', [
            Query::equal('$id', [$webhookId]),
-            Query::equal('projectInternalId', [$project->getInternalId()]),
+            Query::equal('projectInternalId', [$project->getSequence()]),
        ]);

        if ($webhook->isEmpty()) {
@@ -1407,6 +1448,7 @@ App::delete('/v1/projects/:projectId/webhooks/:webhookId')
    ->label('scope', 'projects.write')
    ->label('sdk', new Method(
        namespace: 'projects',
+        group: 'webhooks',
        name: 'deleteWebhook',
        description: '/docs/references/projects/delete-webhook.md',
        auth: [AuthType::ADMIN],
@@ -1432,7 +1474,7 @@ App::delete('/v1/projects/:projectId/webhooks/:webhookId')

        $webhook = $dbForPlatform->findOne('webhooks', [
            Query::equal('$id', [$webhookId]),
-            Query::equal('projectInternalId', [$project->getInternalId()]),
+            Query::equal('projectInternalId', [$project->getSequence()]),
        ]);

        if ($webhook->isEmpty()) {
@@ -1454,6 +1496,7 @@ App::post('/v1/projects/:projectId/keys')
    ->label('scope', 'keys.write')
    ->label('sdk', new Method(
        namespace: 'projects',
+        group: 'keys',
        name: 'createKey',
        description: '/docs/references/projects/create-key.md',
        auth: [AuthType::ADMIN],
@@ -1485,7 +1528,7 @@ App::post('/v1/projects/:projectId/keys')
                Permission::update(Role::any()),
                Permission::delete(Role::any()),
            ],
-            'projectInternalId' => $project->getInternalId(),
+            'projectInternalId' => $project->getSequence(),
            'projectId' => $project->getId(),
            'name' => $name,
            'scopes' => $scopes,
@@ -1510,6 +1553,7 @@ App::get('/v1/projects/:projectId/keys')
    ->label('scope', 'keys.read')
    ->label('sdk', new Method(
        namespace: 'projects',
+        group: 'keys',
        name: 'listKeys',
        description: '/docs/references/projects/list-keys.md',
        auth: [AuthType::ADMIN],
@@ -1532,7 +1576,7 @@ App::get('/v1/projects/:projectId/keys')
        }

        $keys = $dbForPlatform->find('keys', [
-            Query::equal('projectInternalId', [$project->getInternalId()]),
+            Query::equal('projectInternalId', [$project->getSequence()]),
            Query::limit(5000),
        ]);

@@ -1548,6 +1592,7 @@ App::get('/v1/projects/:projectId/keys/:keyId')
    ->label('scope', 'keys.read')
    ->label('sdk', new Method(
        namespace: 'projects',
+        group: 'keys',
        name: 'getKey',
        description: '/docs/references/projects/get-key.md',
        auth: [AuthType::ADMIN],
@@ -1572,7 +1617,7 @@ App::get('/v1/projects/:projectId/keys/:keyId')

        $key = $dbForPlatform->findOne('keys', [
            Query::equal('$id', [$keyId]),
-            Query::equal('projectInternalId', [$project->getInternalId()]),
+            Query::equal('projectInternalId', [$project->getSequence()]),
        ]);

        if ($key->isEmpty()) {
@@ -1588,6 +1633,7 @@ App::put('/v1/projects/:projectId/keys/:keyId')
    ->label('scope', 'keys.write')
    ->label('sdk', new Method(
        namespace: 'projects',
+        group: 'keys',
        name: 'updateKey',
        description: '/docs/references/projects/update-key.md',
        auth: [AuthType::ADMIN],
@@ -1615,7 +1661,7 @@ App::put('/v1/projects/:projectId/keys/:keyId')

        $key = $dbForPlatform->findOne('keys', [
            Query::equal('$id', [$keyId]),
-            Query::equal('projectInternalId', [$project->getInternalId()]),
+            Query::equal('projectInternalId', [$project->getSequence()]),
        ]);

        if ($key->isEmpty()) {
@@ -1640,6 +1686,7 @@ App::delete('/v1/projects/:projectId/keys/:keyId')
    ->label('scope', 'keys.write')
    ->label('sdk', new Method(
        namespace: 'projects',
+        group: 'keys',
        name: 'deleteKey',
        description: '/docs/references/projects/delete-key.md',
        auth: [AuthType::ADMIN],
@@ -1665,7 +1712,7 @@ App::delete('/v1/projects/:projectId/keys/:keyId')

        $key = $dbForPlatform->findOne('keys', [
            Query::equal('$id', [$keyId]),
-            Query::equal('projectInternalId', [$project->getInternalId()]),
+            Query::equal('projectInternalId', [$project->getSequence()]),
        ]);

        if ($key->isEmpty()) {
@@ -1687,6 +1734,7 @@ App::post('/v1/projects/:projectId/jwts')
    ->label('scope', 'projects.write')
    ->label('sdk', new Method(
        namespace: 'projects',
+        group: 'auth',
        name: 'createJWT',
        description: '/docs/references/projects/create-jwt.md',
        auth: [AuthType::ADMIN],
@@ -1730,6 +1778,7 @@ App::post('/v1/projects/:projectId/platforms')
    ->label('scope', 'platforms.write')
    ->label('sdk', new Method(
        namespace: 'projects',
+        group: 'platforms',
        name: 'createPlatform',
        description: '/docs/references/projects/create-platform.md',
        auth: [AuthType::ADMIN],
@@ -1762,7 +1811,7 @@ App::post('/v1/projects/:projectId/platforms')
                Permission::update(Role::any()),
                Permission::delete(Role::any()),
            ],
-            'projectInternalId' => $project->getInternalId(),
+            'projectInternalId' => $project->getSequence(),
            'projectId' => $project->getId(),
            'type' => $type,
            'name' => $name,
@@ -1786,6 +1835,7 @@ App::get('/v1/projects/:projectId/platforms')
    ->label('scope', 'platforms.read')
    ->label('sdk', new Method(
        namespace: 'projects',
+        group: 'platforms',
        name: 'listPlatforms',
        description: '/docs/references/projects/list-platforms.md',
        auth: [AuthType::ADMIN],
@@ -1808,7 +1858,7 @@ App::get('/v1/projects/:projectId/platforms')
        }

        $platforms = $dbForPlatform->find('platforms', [
-            Query::equal('projectInternalId', [$project->getInternalId()]),
+            Query::equal('projectInternalId', [$project->getSequence()]),
            Query::limit(5000),
        ]);

@@ -1824,6 +1874,7 @@ App::get('/v1/projects/:projectId/platforms/:platformId')
    ->label('scope', 'platforms.read')
    ->label('sdk', new Method(
        namespace: 'projects',
+        group: 'platforms',
        name: 'getPlatform',
        description: '/docs/references/projects/get-platform.md',
        auth: [AuthType::ADMIN],
@@ -1848,7 +1899,7 @@ App::get('/v1/projects/:projectId/platforms/:platformId')

        $platform = $dbForPlatform->findOne('platforms', [
            Query::equal('$id', [$platformId]),
-            Query::equal('projectInternalId', [$project->getInternalId()]),
+            Query::equal('projectInternalId', [$project->getSequence()]),
        ]);

        if ($platform->isEmpty()) {
@@ -1864,6 +1915,7 @@ App::put('/v1/projects/:projectId/platforms/:platformId')
    ->label('scope', 'platforms.write')
    ->label('sdk', new Method(
        namespace: 'projects',
+        group: 'platforms',
        name: 'updatePlatform',
        description: '/docs/references/projects/update-platform.md',
        auth: [AuthType::ADMIN],
@@ -1891,7 +1943,7 @@ App::put('/v1/projects/:projectId/platforms/:platformId')

        $platform = $dbForPlatform->findOne('platforms', [
            Query::equal('$id', [$platformId]),
-            Query::equal('projectInternalId', [$project->getInternalId()]),
+            Query::equal('projectInternalId', [$project->getSequence()]),
        ]);

        if ($platform->isEmpty()) {
@@ -1919,6 +1971,7 @@ App::delete('/v1/projects/:projectId/platforms/:platformId')
    ->label('scope', 'platforms.write')
    ->label('sdk', new Method(
        namespace: 'projects',
+        group: 'platforms',
        name: 'deletePlatform',
        description: '/docs/references/projects/delete-platform.md',
        auth: [AuthType::ADMIN],
@@ -1944,7 +1997,7 @@ App::delete('/v1/projects/:projectId/platforms/:platformId')

        $platform = $dbForPlatform->findOne('platforms', [
            Query::equal('$id', [$platformId]),
-            Query::equal('projectInternalId', [$project->getInternalId()]),
+            Query::equal('projectInternalId', [$project->getSequence()]),
        ]);

        if ($platform->isEmpty()) {
@@ -1966,6 +2019,7 @@ App::patch('/v1/projects/:projectId/smtp')
    ->label('scope', 'projects.write')
    ->label('sdk', new Method(
        namespace: 'projects',
+        group: 'templates',
        name: 'updateSmtp',
        description: '/docs/references/projects/update-smtp.md',
        auth: [AuthType::ADMIN],
@@ -2062,6 +2116,7 @@ App::post('/v1/projects/:projectId/smtp/tests')
    ->label('scope', 'projects.write')
    ->label('sdk', new Method(
        namespace: 'projects',
+        group: 'templates',
        name: 'createSmtpTest',
        description: '/docs/references/projects/create-smtp-test.md',
        auth: [AuthType::ADMIN],
@@ -2085,7 +2140,8 @@ App::post('/v1/projects/:projectId/smtp/tests')
    ->inject('response')
    ->inject('dbForPlatform')
    ->inject('queueForMails')
-    ->action(function (string $projectId, array $emails, string $senderName, string $senderEmail, string $replyTo, string $host, int $port, string $username, string $password, string $secure, Response $response, Database $dbForPlatform, Mail $queueForMails) {
+    ->inject('plan')
+    ->action(function (string $projectId, array $emails, string $senderName, string $senderEmail, string $replyTo, string $host, int $port, string $username, string $password, string $secure, Response $response, Database $dbForPlatform, Mail $queueForMails, array $plan) {
        $project = $dbForPlatform->getDocument('projects', $projectId);

        if ($project->isEmpty()) {
@@ -2098,7 +2154,14 @@ App::post('/v1/projects/:projectId/smtp/tests')
        $template = Template::fromFile(__DIR__ . '/../../config/locale/templates/email-smtp-test.tpl');
        $template
            ->setParam('{{from}}', "{$senderName} ({$senderEmail})")
-            ->setParam('{{replyTo}}', "{$senderName} ({$replyToEmail})");
+            ->setParam('{{replyTo}}', "{$senderName} ({$replyToEmail})")
+            ->setParam('{{logoUrl}}', $plan['logoUrl'] ?? APP_EMAIL_LOGO_URL)
+            ->setParam('{{accentColor}}', $plan['accentColor'] ?? APP_EMAIL_ACCENT_COLOR)
+            ->setParam('{{twitterUrl}}', $plan['twitterUrl'] ?? APP_SOCIAL_TWITTER)
+            ->setParam('{{discordUrl}}', $plan['discordUrl'] ?? APP_SOCIAL_DISCORD)
+            ->setParam('{{githubUrl}}', $plan['githubUrl'] ?? APP_SOCIAL_GITHUB_APPWRITE)
+            ->setParam('{{termsUrl}}', $plan['termsUrl'] ?? APP_EMAIL_TERMS_URL)
+            ->setParam('{{privacyUrl}}', $plan['privacyUrl'] ?? APP_EMAIL_PRIVACY_URL);

        foreach ($emails as $email) {
            $queueForMails
@@ -2128,6 +2191,7 @@ App::get('/v1/projects/:projectId/templates/sms/:type/:locale')
    ->label('scope', 'projects.write')
    ->label('sdk', new Method(
        namespace: 'projects',
+        group: 'templates',
        name: 'getSmsTemplate',
        description: '/docs/references/projects/get-sms-template.md',
        auth: [AuthType::ADMIN],
@@ -2175,6 +2239,7 @@ App::get('/v1/projects/:projectId/templates/email/:type/:locale')
    ->label('scope', 'projects.write')
    ->label('sdk', new Method(
        namespace: 'projects',
+        group: 'templates',
        name: 'getEmailTemplate',
        description: '/docs/references/projects/get-email-template.md',
        auth: [AuthType::ADMIN],
@@ -2233,6 +2298,7 @@ App::patch('/v1/projects/:projectId/templates/sms/:type/:locale')
    ->label('scope', 'projects.write')
    ->label('sdk', new Method(
        namespace: 'projects',
+        group: 'templates',
        name: 'updateSmsTemplate',
        description: '/docs/references/projects/update-sms-template.md',
        auth: [AuthType::ADMIN],
@@ -2279,6 +2345,7 @@ App::patch('/v1/projects/:projectId/templates/email/:type/:locale')
    ->label('scope', 'projects.write')
    ->label('sdk', new Method(
        namespace: 'projects',
+        group: 'templates',
        name: 'updateEmailTemplate',
        description: '/docs/references/projects/update-email-template.md',
        auth: [AuthType::ADMIN],
@@ -2335,6 +2402,7 @@ App::delete('/v1/projects/:projectId/templates/sms/:type/:locale')
    ->label('scope', 'projects.write')
    ->label('sdk', new Method(
        namespace: 'projects',
+        group: 'templates',
        name: 'deleteSmsTemplate',
        description: '/docs/references/projects/delete-sms-template.md',
        auth: [AuthType::ADMIN],
@@ -2380,11 +2448,12 @@ App::delete('/v1/projects/:projectId/templates/sms/:type/:locale')
    });

 App::delete('/v1/projects/:projectId/templates/email/:type/:locale')
-    ->desc('Reset custom email template')
+    ->desc('Delete custom email template')
    ->groups(['api', 'projects'])
    ->label('scope', 'projects.write')
    ->label('sdk', new Method(
        namespace: 'projects',
+        group: 'templates',
        name: 'deleteEmailTemplate',
        description: '/docs/references/projects/delete-email-template.md',
        auth: [AuthType::ADMIN],
@@ -31,6 +31,7 @@ App::get('/v1/proxy/rules')
    ->label('scope', 'rules.read')
    ->label('sdk', new Method(
        namespace: 'proxy',
+        group: null,
        name: 'listRules',
        description: '/docs/references/proxy/list-rules.md',
        auth: [AuthType::ADMIN],
@@ -57,7 +58,7 @@ App::get('/v1/proxy/rules')
            $queries[] = Query::search('search', $search);
        }

-        $queries[] = Query::equal('projectInternalId', [$project->getInternalId()]);
+        $queries[] = Query::equal('projectInternalId', [$project->getSequence()]);

        /**
         * Get cursor document if there was a cursor query, we use array_filter and reset for reference $cursor to $queries
@@ -105,6 +106,7 @@ App::get('/v1/proxy/rules/:ruleId')
    ->label('scope', 'rules.read')
    ->label('sdk', new Method(
        namespace: 'proxy',
+        group: null,
        name: 'getRule',
        description: '/docs/references/proxy/get-rule.md',
        auth: [AuthType::ADMIN],
@@ -122,7 +124,7 @@ App::get('/v1/proxy/rules/:ruleId')
    ->action(function (string $ruleId, Response $response, Document $project, Database $dbForPlatform) {
        $rule = $dbForPlatform->getDocument('rules', $ruleId);

-        if ($rule->isEmpty() || $rule->getAttribute('projectInternalId') !== $project->getInternalId()) {
+        if ($rule->isEmpty() || $rule->getAttribute('projectInternalId') !== $project->getSequence()) {
            throw new Exception(Exception::RULE_NOT_FOUND);
        }

@@ -142,6 +144,7 @@ App::delete('/v1/proxy/rules/:ruleId')
    ->label('audits.resource', 'rule/{request.ruleId}')
    ->label('sdk', new Method(
        namespace: 'proxy',
+        group: null,
        name: 'deleteRule',
        description: '/docs/references/proxy/delete-rule.md',
        auth: [AuthType::ADMIN],
@@ -162,7 +165,7 @@ App::delete('/v1/proxy/rules/:ruleId')
    ->action(function (string $ruleId, Response $response, Document $project, Database $dbForPlatform, Delete $queueForDeletes, Event $queueForEvents) {
        $rule = $dbForPlatform->getDocument('rules', $ruleId);

-        if ($rule->isEmpty() || $rule->getAttribute('projectInternalId') !== $project->getInternalId()) {
+        if ($rule->isEmpty() || $rule->getAttribute('projectInternalId') !== $project->getSequence()) {
            throw new Exception(Exception::RULE_NOT_FOUND);
        }

@@ -186,6 +189,7 @@ App::patch('/v1/proxy/rules/:ruleId/verification')
    ->label('audits.resource', 'rule/{response.$id}')
    ->label('sdk', new Method(
        namespace: 'proxy',
+        group: null,
        name: 'updateRuleVerification',
        description: '/docs/references/proxy/update-rule-verification.md',
        auth: [AuthType::ADMIN],
@@ -206,15 +210,46 @@ App::patch('/v1/proxy/rules/:ruleId/verification')
    ->action(function (string $ruleId, Response $response, Certificate $queueForCertificates, Event $queueForEvents, Document $project, Database $dbForPlatform, Log $log) {
        $rule = $dbForPlatform->getDocument('rules', $ruleId);

-        if ($rule->isEmpty() || $rule->getAttribute('projectInternalId') !== $project->getInternalId()) {
+        if ($rule->isEmpty() || $rule->getAttribute('projectInternalId') !== $project->getSequence()) {
            throw new Exception(Exception::RULE_NOT_FOUND);
        }

-        $validators = [];
-        $targetCNAME = new Domain(System::getEnv('_APP_DOMAIN_TARGET_CNAME', ''));
-        if (!$targetCNAME->isKnown() || $targetCNAME->isTest()) {
-            $validators[] = new DNS($targetCNAME->get(), DNS::RECORD_CNAME);
+        $targetCNAME = null;
+        switch ($rule->getAttribute('type', '')) {
+            case 'api':
+                // For example: fra.cloud.appwrite.io
+                $targetCNAME = new Domain(System::getEnv('_APP_DOMAIN_TARGET_CNAME', ''));
+                break;
+            case 'redirect':
+                // For example: appwrite.network
+                $targetCNAME = new Domain(System::getEnv('_APP_DOMAIN_SITES', ''));
+                break;
+            case 'deployment':
+                switch ($rule->getAttribute('deploymentResourceType', '')) {
+                    case 'function':
+                        // For example: fra.appwrite.run
+                        $targetCNAME = new Domain(System::getEnv('_APP_DOMAIN_FUNCTIONS', ''));
+                        break;
+                    case 'site':
+                        // For example: appwrite.network
+                        $targetCNAME = new Domain(System::getEnv('_APP_DOMAIN_SITES', ''));
+                        break;
+                    default:
+                        break;
+                }
+                // no break
+            default:
+                break;
        }
+
+        $validators = [];
+
+        if (!is_null($targetCNAME)) {
+            if ($targetCNAME->isKnown() && !$targetCNAME->isTest()) {
+                $validators[] = new DNS($targetCNAME->get(), DNS::RECORD_CNAME);
+            }
+        }
+
        if ((new IP(IP::V4))->isValid(System::getEnv('_APP_DOMAIN_TARGET_A', ''))) {
            $validators[] = new DNS(System::getEnv('_APP_DOMAIN_TARGET_A', ''), DNS::RECORD_A);
        }
@@ -256,7 +291,8 @@ App::patch('/v1/proxy/rules/:ruleId/verification')
        // Issue a TLS certificate when domain is verified
        $queueForCertificates
            ->setDomain(new Document([
-                'domain' => $rule->getAttribute('domain')
+                'domain' => $rule->getAttribute('domain'),
+                'domainType' => $rule->getAttribute('deploymentResourceType', $rule->getAttribute('type')),
            ]))
            ->trigger();

@@ -24,6 +24,7 @@ use Utopia\Database\DateTime;
 use Utopia\Database\Document;
 use Utopia\Database\Exception\Duplicate as DuplicateException;
 use Utopia\Database\Exception\NotFound as NotFoundException;
+use Utopia\Database\Exception\Order as OrderException;
 use Utopia\Database\Exception\Query as QueryException;
 use Utopia\Database\Helpers\ID;
 use Utopia\Database\Helpers\Permission;
@@ -62,6 +63,7 @@ App::post('/v1/storage/buckets')
    ->label('audits.resource', 'bucket/{response.$id}')
    ->label('sdk', new Method(
        namespace: 'storage',
+        group: 'buckets',
        name: 'createBucket',
        description: '/docs/references/storage/create-bucket.md',
        auth: [AuthType::KEY],
@@ -143,7 +145,7 @@ App::post('/v1/storage/buckets')

            $bucket = $dbForProject->getDocument('buckets', $bucketId);

-            $dbForProject->createCollection('bucket_' . $bucket->getInternalId(), $attributes, $indexes, permissions: $permissions ?? [], documentSecurity: $fileSecurity);
+            $dbForProject->createCollection('bucket_' . $bucket->getSequence(), $attributes, $indexes, permissions: $permissions ?? [], documentSecurity: $fileSecurity);
        } catch (DuplicateException) {
            throw new Exception(Exception::STORAGE_BUCKET_ALREADY_EXISTS);
        }
@@ -164,6 +166,7 @@ App::get('/v1/storage/buckets')
    ->label('resourceType', RESOURCE_TYPE_BUCKETS)
    ->label('sdk', new Method(
        namespace: 'storage',
+        group: 'buckets',
        name: 'listBuckets',
        description: '/docs/references/storage/list-buckets.md',
        auth: [AuthType::KEY],
@@ -216,10 +219,15 @@ App::get('/v1/storage/buckets')
        }

        $filterQueries = Query::groupByType($queries)['filters'];
-
+        try {
+            $buckets = $dbForProject->find('buckets', $queries);
+            $total = $dbForProject->count('buckets', $filterQueries, APP_LIMIT_COUNT);
+        } catch (OrderException $e) {
+            throw new Exception(Exception::DATABASE_QUERY_ORDER_NULL, "The order attribute '{$e->getAttribute()}' had a null value. Cursor pagination requires all documents order attribute values are non-null.");
+        }
        $response->dynamic(new Document([
-            'buckets' => $dbForProject->find('buckets', $queries),
-            'total' => $dbForProject->count('buckets', $filterQueries, APP_LIMIT_COUNT),
+            'buckets' => $buckets,
+            'total' => $total,
        ]), Response::MODEL_BUCKET_LIST);
    });

@@ -230,6 +238,7 @@ App::get('/v1/storage/buckets/:bucketId')
    ->label('resourceType', RESOURCE_TYPE_BUCKETS)
    ->label('sdk', new Method(
        namespace: 'storage',
+        group: 'buckets',
        name: 'getBucket',
        description: '/docs/references/storage/get-bucket.md',
        auth: [AuthType::KEY],
@@ -264,6 +273,7 @@ App::put('/v1/storage/buckets/:bucketId')
    ->label('audits.resource', 'bucket/{response.$id}')
    ->label('sdk', new Method(
        namespace: 'storage',
+        group: 'buckets',
        name: 'updateBucket',
        description: '/docs/references/storage/update-bucket.md',
        auth: [AuthType::KEY],
@@ -316,7 +326,7 @@ App::put('/v1/storage/buckets/:bucketId')
                ->setAttribute('compression', $compression)
                ->setAttribute('antivirus', $antivirus));

-        $dbForProject->updateCollection('bucket_' . $bucket->getInternalId(), $permissions, $fileSecurity);
+        $dbForProject->updateCollection('bucket_' . $bucket->getSequence(), $permissions, $fileSecurity);

        $queueForEvents
            ->setParam('bucketId', $bucket->getId());
@@ -334,6 +344,7 @@ App::delete('/v1/storage/buckets/:bucketId')
    ->label('audits.resource', 'bucket/{request.bucketId}')
    ->label('sdk', new Method(
        namespace: 'storage',
+        group: 'buckets',
        name: 'deleteBucket',
        description: '/docs/references/storage/delete-bucket.md',
        auth: [AuthType::KEY],
@@ -387,17 +398,18 @@ App::post('/v1/storage/buckets/:bucketId/files')
    ->label('abuse-time', APP_LIMIT_WRITE_RATE_PERIOD_DEFAULT)
    ->label('sdk', new Method(
        namespace: 'storage',
+        group: 'files',
        name: 'createFile',
        description: '/docs/references/storage/create-file.md',
-        type: MethodType::UPLOAD,
        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
-        requestType: 'multipart/form-data',
        responses: [
            new SDKResponse(
                code: Response::STATUS_CODE_CREATED,
                model: Response::MODEL_FILE,
            )
-        ]
+        ],
+        type: MethodType::UPLOAD,
+        requestType: ContentType::MULTIPART
    ))
    ->param('bucketId', '', new UID(), 'Storage bucket unique ID. You can create a new storage bucket using the Storage service [server integration](https://appwrite.io/docs/server/storage#createBucket).')
    ->param('fileId', '', new CustomId(), 'File ID. Choose a custom ID or generate a random ID with `ID.unique()`. Valid chars are a-z, A-Z, 0-9, period, hyphen, and underscore. Can\'t start with a special char. Max length is 36 chars.')
@@ -546,7 +558,7 @@ App::post('/v1/storage/buckets/:bucketId/files')
        $path = $deviceForFiles->getPath($fileId . '.' . \pathinfo($fileName, PATHINFO_EXTENSION));
        $path = str_ireplace($deviceForFiles->getRoot(), $deviceForFiles->getRoot() . DIRECTORY_SEPARATOR . $bucket->getId(), $path); // Add bucket id to path after root

-        $file = $dbForProject->getDocument('bucket_' . $bucket->getInternalId(), $fileId);
+        $file = $dbForProject->getDocument('bucket_' . $bucket->getSequence(), $fileId);

        $metadata = ['content_type' => $deviceForLocal->getFileMimeType($fileTmpName)];
        if (!$file->isEmpty()) {
@@ -640,7 +652,7 @@ App::post('/v1/storage/buckets/:bucketId/files')
                    '$id' => $fileId,
                    '$permissions' => $permissions,
                    'bucketId' => $bucket->getId(),
-                    'bucketInternalId' => $bucket->getInternalId(),
+                    'bucketInternalId' => $bucket->getSequence(),
                    'name' => $fileName,
                    'path' => $path,
                    'signature' => $fileHash,
@@ -659,7 +671,7 @@ App::post('/v1/storage/buckets/:bucketId/files')
                    'metadata' => $metadata,
                ]);

-                $file = $dbForProject->createDocument('bucket_' . $bucket->getInternalId(), $doc);
+                $file = $dbForProject->createDocument('bucket_' . $bucket->getSequence(), $doc);
            } else {
                $file = $file
                    ->setAttribute('$permissions', $permissions)
@@ -684,7 +696,7 @@ App::post('/v1/storage/buckets/:bucketId/files')
                if (!$validator->isValid($bucket->getCreate())) {
                    throw new Exception(Exception::USER_UNAUTHORIZED);
                }
-                $file = Authorization::skip(fn () => $dbForProject->updateDocument('bucket_' . $bucket->getInternalId(), $fileId, $file));
+                $file = Authorization::skip(fn () => $dbForProject->updateDocument('bucket_' . $bucket->getSequence(), $fileId, $file));
            }
        } else {
            if ($file->isEmpty()) {
@@ -692,7 +704,7 @@ App::post('/v1/storage/buckets/:bucketId/files')
                    '$id' => ID::custom($fileId),
                    '$permissions' => $permissions,
                    'bucketId' => $bucket->getId(),
-                    'bucketInternalId' => $bucket->getInternalId(),
+                    'bucketInternalId' => $bucket->getSequence(),
                    'name' => $fileName,
                    'path' => $path,
                    'signature' => '',
@@ -708,7 +720,7 @@ App::post('/v1/storage/buckets/:bucketId/files')
                ]);

                try {
-                    $file = $dbForProject->createDocument('bucket_' . $bucket->getInternalId(), $doc);
+                    $file = $dbForProject->createDocument('bucket_' . $bucket->getSequence(), $doc);
                } catch (NotFoundException) {
                    throw new Exception(Exception::STORAGE_BUCKET_NOT_FOUND);
                }
@@ -729,7 +741,7 @@ App::post('/v1/storage/buckets/:bucketId/files')
                }

                try {
-                    $file = Authorization::skip(fn () => $dbForProject->updateDocument('bucket_' . $bucket->getInternalId(), $fileId, $file));
+                    $file = Authorization::skip(fn () => $dbForProject->updateDocument('bucket_' . $bucket->getSequence(), $fileId, $file));
                } catch (NotFoundException) {
                    throw new Exception(Exception::STORAGE_BUCKET_NOT_FOUND);
                }
@@ -756,6 +768,7 @@ App::get('/v1/storage/buckets/:bucketId/files')
    ->label('resourceType', RESOURCE_TYPE_BUCKETS)
    ->label('sdk', new Method(
        namespace: 'storage',
+        group: 'files',
        name: 'listFiles',
        description: '/docs/references/storage/list-files.md',
        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -813,9 +826,9 @@ App::get('/v1/storage/buckets/:bucketId/files')
            $fileId = $cursor->getValue();

            if ($fileSecurity && !$valid) {
-                $cursorDocument = $dbForProject->getDocument('bucket_' . $bucket->getInternalId(), $fileId);
+                $cursorDocument = $dbForProject->getDocument('bucket_' . $bucket->getSequence(), $fileId);
            } else {
-                $cursorDocument = Authorization::skip(fn () => $dbForProject->getDocument('bucket_' . $bucket->getInternalId(), $fileId));
+                $cursorDocument = Authorization::skip(fn () => $dbForProject->getDocument('bucket_' . $bucket->getSequence(), $fileId));
            }

            if ($cursorDocument->isEmpty()) {
@@ -829,14 +842,16 @@ App::get('/v1/storage/buckets/:bucketId/files')

        try {
            if ($fileSecurity && !$valid) {
-                $files = $dbForProject->find('bucket_' . $bucket->getInternalId(), $queries);
-                $total = $dbForProject->count('bucket_' . $bucket->getInternalId(), $filterQueries, APP_LIMIT_COUNT);
+                $files = $dbForProject->find('bucket_' . $bucket->getSequence(), $queries);
+                $total = $dbForProject->count('bucket_' . $bucket->getSequence(), $filterQueries, APP_LIMIT_COUNT);
            } else {
-                $files = Authorization::skip(fn () => $dbForProject->find('bucket_' . $bucket->getInternalId(), $queries));
-                $total = Authorization::skip(fn () => $dbForProject->count('bucket_' . $bucket->getInternalId(), $filterQueries, APP_LIMIT_COUNT));
+                $files = Authorization::skip(fn () => $dbForProject->find('bucket_' . $bucket->getSequence(), $queries));
+                $total = Authorization::skip(fn () => $dbForProject->count('bucket_' . $bucket->getSequence(), $filterQueries, APP_LIMIT_COUNT));
            }
        } catch (NotFoundException) {
            throw new Exception(Exception::STORAGE_BUCKET_NOT_FOUND);
+        } catch (OrderException $e) {
+            throw new Exception(Exception::DATABASE_QUERY_ORDER_NULL, "The order attribute '{$e->getAttribute()}' had a null value. Cursor pagination requires all documents order attribute values are non-null.");
        }

        $response->dynamic(new Document([
@@ -853,6 +868,7 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId')
    ->label('resourceType', RESOURCE_TYPE_BUCKETS)
    ->label('sdk', new Method(
        namespace: 'storage',
+        group: 'files',
        name: 'getFile',
        description: '/docs/references/storage/get-file.md',
        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -886,9 +902,9 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId')
        }

        if ($fileSecurity && !$valid) {
-            $file = $dbForProject->getDocument('bucket_' . $bucket->getInternalId(), $fileId);
+            $file = $dbForProject->getDocument('bucket_' . $bucket->getSequence(), $fileId);
        } else {
-            $file = Authorization::skip(fn () => $dbForProject->getDocument('bucket_' . $bucket->getInternalId(), $fileId));
+            $file = Authorization::skip(fn () => $dbForProject->getDocument('bucket_' . $bucket->getSequence(), $fileId));
        }

        if ($file->isEmpty()) {
@@ -909,6 +925,7 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/preview')
    ->label('cache.resource', 'file/{request.fileId}')
    ->label('sdk', new Method(
        namespace: 'storage',
+        group: 'files',
        name: 'getFilePreview',
        description: '/docs/references/storage/get-file-preview.md',
        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -926,7 +943,7 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/preview')
    ->param('width', 0, new Range(0, 4000), 'Resize preview image width, Pass an integer between 0 to 4000.', true)
    ->param('height', 0, new Range(0, 4000), 'Resize preview image height, Pass an integer between 0 to 4000.', true)
    ->param('gravity', Image::GRAVITY_CENTER, new WhiteList(Image::getGravityTypes()), 'Image crop gravity. Can be one of ' . implode(",", Image::getGravityTypes()), true)
-    ->param('quality', 100, new Range(0, 100), 'Preview image quality. Pass an integer between 0 to 100. Defaults to 100.', true)
+    ->param('quality', -1, new Range(-1, 100), 'Preview image quality. Pass an integer between 0 to 100. Defaults to keep existing image quality.', true)
    ->param('borderWidth', 0, new Range(0, 100), 'Preview image border in pixels. Pass an integer between 0 to 100. Defaults to 0.', true)
    ->param('borderColor', '', new HexColor(), 'Preview image border color. Use a valid HEX color, no # is needed for prefix.', true)
    ->param('borderRadius', 0, new Range(0, 4000), 'Preview image border radius in pixels. Pass an integer between 0 to 4000.', true)
@@ -934,12 +951,14 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/preview')
    ->param('rotation', 0, new Range(-360, 360), 'Preview image rotation in degrees. Pass an integer between -360 and 360.', true)
    ->param('background', '', new HexColor(), 'Preview image background color. Only works with transparent images (png). Use a valid HEX color, no # is needed for prefix.', true)
    ->param('output', '', new WhiteList(\array_keys(Config::getParam('storage-outputs')), true), 'Output format type (jpeg, jpg, png, gif and webp).', true)
+    // NOTE: this is only for the sdk generator and is not used in the action below and is utilised in `resources.php` for `resourceToken`.
+    ->param('token', '', new Text(512), 'File token for accessing this file.', true)
    ->inject('response')
    ->inject('dbForProject')
    ->inject('resourceToken')
    ->inject('deviceForFiles')
    ->inject('deviceForLocal')
-    ->action(function (string $bucketId, string $fileId, int $width, int $height, string $gravity, int $quality, int $borderWidth, string $borderColor, int $borderRadius, float $opacity, int $rotation, string $background, string $output, Response $response, Database $dbForProject, Document $resourceToken, Device $deviceForFiles, Device $deviceForLocal) {
+    ->action(function (string $bucketId, string $fileId, int $width, int $height, string $gravity, int $quality, int $borderWidth, string $borderColor, int $borderRadius, float $opacity, int $rotation, string $background, string $output, ?string $token, Response $response, Database $dbForProject, Document $resourceToken, Device $deviceForFiles, Device $deviceForLocal) {

        if (!\extension_loaded('imagick')) {
            throw new Exception(Exception::GENERAL_SERVER_ERROR, 'Imagick extension is missing');
@@ -954,7 +973,7 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/preview')
            throw new Exception(Exception::STORAGE_BUCKET_NOT_FOUND);
        }

-        $isToken = !$resourceToken->isEmpty() && $resourceToken->getAttribute('bucketInternalId') === $bucket->getInternalId();
+        $isToken = !$resourceToken->isEmpty() && $resourceToken->getAttribute('bucketInternalId') === $bucket->getSequence();
        $fileSecurity = $bucket->getAttribute('fileSecurity', false);
        $validator = new Authorization(Database::PERMISSION_READ);
        $valid = $validator->isValid($bucket->getRead());
@@ -963,12 +982,12 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/preview')
        }

        if ($fileSecurity && !$valid && !$isToken) {
-            $file = $dbForProject->getDocument('bucket_' . $bucket->getInternalId(), $fileId);
+            $file = $dbForProject->getDocument('bucket_' . $bucket->getSequence(), $fileId);
        } else {
-            $file = Authorization::skip(fn () => $dbForProject->getDocument('bucket_' . $bucket->getInternalId(), $fileId));
+            $file = Authorization::skip(fn () => $dbForProject->getDocument('bucket_' . $bucket->getSequence(), $fileId));
        }

-        if (!$resourceToken->isEmpty() && $resourceToken->getAttribute('fileInternalId') !== $file->getInternalId()) {
+        if (!$resourceToken->isEmpty() && $resourceToken->getAttribute('fileInternalId') !== $file->getSequence()) {
            throw new Exception(Exception::USER_UNAUTHORIZED);
        }

@@ -985,7 +1004,7 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/preview')
        $algorithm = $file->getAttribute('algorithm', Compression::NONE);
        $cipher = $file->getAttribute('openSSLCipher');
        $mime = $file->getAttribute('mimeType');
-        if (!\in_array($mime, $inputs) || $file->getAttribute('sizeActual') > (int) System::getEnv('_APP_STORAGE_PREVIEW_LIMIT', 20000000)) {
+        if (!\in_array($mime, $inputs) || $file->getAttribute('sizeActual') > (int) System::getEnv('_APP_STORAGE_PREVIEW_LIMIT', APP_STORAGE_READ_BUFFER)) {
            if (!\in_array($mime, $inputs)) {
                $path = (\array_key_exists($mime, $fileLogos)) ? $fileLogos[$mime] : $fileLogos['default'];
            } else {
@@ -1097,6 +1116,7 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/download')
    ->label('resourceType', RESOURCE_TYPE_BUCKETS)
    ->label('sdk', new Method(
        namespace: 'storage',
+        group: 'files',
        name: 'getFileDownload',
        description: '/docs/references/storage/get-file-download.md',
        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -1111,12 +1131,15 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/download')
    ))
    ->param('bucketId', '', new UID(), 'Storage bucket ID. You can create a new storage bucket using the Storage service [server integration](https://appwrite.io/docs/server/storage#createBucket).')
    ->param('fileId', '', new UID(), 'File ID.')
+    // NOTE: this is only for the sdk generator and is not used in the action below and is utilised in `resources.php` for `resourceToken`.
+    ->param('token', '', new Text(512), 'File token for accessing this file.', true)
    ->inject('request')
    ->inject('response')
    ->inject('dbForProject')
    ->inject('mode')
+    ->inject('resourceToken')
    ->inject('deviceForFiles')
-    ->action(function (string $bucketId, string $fileId, Request $request, Response $response, Database $dbForProject, string $mode, Device $deviceForFiles) {
+    ->action(function (string $bucketId, string $fileId, ?string $token, Request $request, Response $response, Database $dbForProject, string $mode, Document $resourceToken, Device $deviceForFiles) {

        $bucket = Authorization::skip(fn () => $dbForProject->getDocument('buckets', $bucketId));

@@ -1127,17 +1150,22 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/download')
            throw new Exception(Exception::STORAGE_BUCKET_NOT_FOUND);
        }

+        $isToken = !$resourceToken->isEmpty() && $resourceToken->getAttribute('bucketInternalId') === $bucket->getSequence();
        $fileSecurity = $bucket->getAttribute('fileSecurity', false);
        $validator = new Authorization(Database::PERMISSION_READ);
        $valid = $validator->isValid($bucket->getRead());
-        if (!$fileSecurity && !$valid) {
+        if (!$fileSecurity && !$valid && !$isToken) {
            throw new Exception(Exception::USER_UNAUTHORIZED);
        }

        if ($fileSecurity && !$valid) {
-            $file = $dbForProject->getDocument('bucket_' . $bucket->getInternalId(), $fileId);
+            $file = $dbForProject->getDocument('bucket_' . $bucket->getSequence(), $fileId);
        } else {
-            $file = Authorization::skip(fn () => $dbForProject->getDocument('bucket_' . $bucket->getInternalId(), $fileId));
+            $file = Authorization::skip(fn () => $dbForProject->getDocument('bucket_' . $bucket->getSequence(), $fileId));
+        }
+
+        if (!$resourceToken->isEmpty() && $resourceToken->getAttribute('fileInternalId') !== $file->getSequence()) {
+            throw new Exception(Exception::USER_UNAUTHORIZED);
        }

        if ($file->isEmpty()) {
@@ -1150,13 +1178,6 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/download')
            throw new Exception(Exception::STORAGE_FILE_NOT_FOUND, 'File not found in ' . $path);
        }

-        $response
-            ->setContentType($file->getAttribute('mimeType'))
-            ->addHeader('Cache-Control', 'private, max-age=3888000') // 45 days
-            ->addHeader('X-Peak', \memory_get_peak_usage())
-            ->addHeader('Content-Disposition', 'attachment; filename="' . $file->getAttribute('name', '') . '"')
-        ;
-
        $size = $file->getAttribute('sizeOriginal', 0);

        $rangeHeader = $request->getHeader('range');
@@ -1165,7 +1186,7 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/download')
            $end = $request->getRangeEnd();
            $unit = $request->getRangeUnit();

-            if ($end === null) {
+            if ($end === null || $end - $start > APP_STORAGE_READ_BUFFER) {
                $end = min(($start + MAX_OUTPUT_CHUNK_SIZE - 1), ($size - 1));
            }

@@ -1180,6 +1201,13 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/download')
                ->setStatusCode(Response::STATUS_CODE_PARTIALCONTENT);
        }

+        $response
+            ->setContentType($file->getAttribute('mimeType'))
+            ->addHeader('Cache-Control', 'private, max-age=3888000') // 45 days
+            ->addHeader('X-Peak', \memory_get_peak_usage())
+            ->addHeader('Content-Disposition', 'attachment; filename="' . $file->getAttribute('name', '') . '"')
+        ;
+
        $source = '';
        if (!empty($file->getAttribute('openSSLCipher'))) { // Decrypt
            $source = $deviceForFiles->read($path);
@@ -1213,12 +1241,15 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/download')
        if (!empty($source)) {
            if (!empty($rangeHeader)) {
                $response->send(substr($source, $start, ($end - $start + 1)));
+                return;
            }
            $response->send($source);
+            return;
        }

        if (!empty($rangeHeader)) {
            $response->send($deviceForFiles->read($path, $start, ($end - $start + 1)));
+            return;
        }

        if ($size > APP_STORAGE_READ_BUFFER) {
@@ -1245,6 +1276,7 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/view')
    ->label('resourceType', RESOURCE_TYPE_BUCKETS)
    ->label('sdk', new Method(
        namespace: 'storage',
+        group: 'files',
        name: 'getFileView',
        description: '/docs/references/storage/get-file-view.md',
        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -1259,12 +1291,15 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/view')
    ))
    ->param('bucketId', '', new UID(), 'Storage bucket unique ID. You can create a new storage bucket using the Storage service [server integration](https://appwrite.io/docs/server/storage#createBucket).')
    ->param('fileId', '', new UID(), 'File ID.')
+    // NOTE: this is only for the sdk generator and is not used in the action below and is utilised in `resources.php` for `resourceToken`.
+    ->param('token', '', new Text(512), 'File token for accessing this file.', true)
    ->inject('response')
    ->inject('request')
    ->inject('dbForProject')
    ->inject('mode')
+    ->inject('resourceToken')
    ->inject('deviceForFiles')
-    ->action(function (string $bucketId, string $fileId, Response $response, Request $request, Database $dbForProject, string $mode, Device $deviceForFiles) {
+    ->action(function (string $bucketId, string $fileId, ?string $token, Response $response, Request $request, Database $dbForProject, string $mode, Document $resourceToken, Device $deviceForFiles) {
        $bucket = Authorization::skip(fn () => $dbForProject->getDocument('buckets', $bucketId));

        $isAPIKey = Auth::isAppUser(Authorization::getRoles());
@@ -1274,17 +1309,22 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/view')
            throw new Exception(Exception::STORAGE_BUCKET_NOT_FOUND);
        }

+        $isToken = !$resourceToken->isEmpty() && $resourceToken->getAttribute('bucketInternalId') === $bucket->getSequence();
        $fileSecurity = $bucket->getAttribute('fileSecurity', false);
        $validator = new Authorization(Database::PERMISSION_READ);
        $valid = $validator->isValid($bucket->getRead());
-        if (!$fileSecurity && !$valid) {
+        if (!$fileSecurity && !$valid && !$isToken) {
            throw new Exception(Exception::USER_UNAUTHORIZED);
        }

        if ($fileSecurity && !$valid) {
-            $file = $dbForProject->getDocument('bucket_' . $bucket->getInternalId(), $fileId);
+            $file = $dbForProject->getDocument('bucket_' . $bucket->getSequence(), $fileId);
        } else {
-            $file = Authorization::skip(fn () => $dbForProject->getDocument('bucket_' . $bucket->getInternalId(), $fileId));
+            $file = Authorization::skip(fn () => $dbForProject->getDocument('bucket_' . $bucket->getSequence(), $fileId));
+        }
+
+        if (!$resourceToken->isEmpty() && $resourceToken->getAttribute('fileInternalId') !== $file->getSequence()) {
+            throw new Exception(Exception::USER_UNAUTHORIZED);
        }

        if ($file->isEmpty()) {
@@ -1305,15 +1345,6 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/view')
            $contentType = $file->getAttribute('mimeType');
        }

-        $response
-            ->setContentType($contentType)
-            ->addHeader('Content-Security-Policy', 'script-src none;')
-            ->addHeader('X-Content-Type-Options', 'nosniff')
-            ->addHeader('Content-Disposition', 'inline; filename="' . $file->getAttribute('name', '') . '"')
-            ->addHeader('Cache-Control', 'private, max-age=3888000') // 45 days
-            ->addHeader('X-Peak', \memory_get_peak_usage())
-        ;
-
        $size = $file->getAttribute('sizeOriginal', 0);

        $rangeHeader = $request->getHeader('range');
@@ -1322,8 +1353,8 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/view')
            $end = $request->getRangeEnd();
            $unit = $request->getRangeUnit();

-            if ($end === null) {
-                $end = min(($start + 2000000 - 1), ($size - 1));
+            if ($end === null || $end - $start > APP_STORAGE_READ_BUFFER) {
+                $end = min(($start + APP_STORAGE_READ_BUFFER - 1), ($size - 1));
            }

            if ($unit != 'bytes' || $start >= $end || $end >= $size) {
@@ -1337,6 +1368,15 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/view')
                ->setStatusCode(Response::STATUS_CODE_PARTIALCONTENT);
        }

+        $response
+            ->setContentType($contentType)
+            ->addHeader('Content-Security-Policy', 'script-src none;')
+            ->addHeader('X-Content-Type-Options', 'nosniff')
+            ->addHeader('Content-Disposition', 'inline; filename="' . $file->getAttribute('name', '') . '"')
+            ->addHeader('Cache-Control', 'private, max-age=3888000') // 45 days
+            ->addHeader('X-Peak', \memory_get_peak_usage())
+        ;
+
        $source = '';
        if (!empty($file->getAttribute('openSSLCipher'))) { // Decrypt
            $source = $deviceForFiles->read($path);
@@ -1370,6 +1410,7 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/view')
        if (!empty($source)) {
            if (!empty($rangeHeader)) {
                $response->send(substr($source, $start, ($end - $start + 1)));
+                return;
            }
            $response->send($source);
            return;
@@ -1402,9 +1443,6 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/push')
    ->groups(['api', 'storage'])
    ->label('scope', 'public')
    ->label('resourceType', RESOURCE_TYPE_BUCKETS)
-    ->label('sdk.response.code', Response::STATUS_CODE_OK)
-    ->label('sdk.response.type', '*/*')
-    ->label('sdk.methodType', 'location')
    ->param('bucketId', '', new UID(), 'Storage bucket unique ID. You can create a new storage bucket using the Storage service [server integration](https://appwrite.io/docs/server/storage#createBucket).')
    ->param('fileId', '', new UID(), 'File ID.')
    ->param('jwt', '', new Text(2048, 0), 'JSON Web Token to validate', true)
@@ -1440,7 +1478,7 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/push')
            throw new Exception(Exception::STORAGE_BUCKET_NOT_FOUND);
        }

-        $file = Authorization::skip(fn () => $dbForProject->getDocument('bucket_' . $bucket->getInternalId(), $fileId));
+        $file = Authorization::skip(fn () => $dbForProject->getDocument('bucket_' . $bucket->getSequence(), $fileId));

        if ($file->isEmpty()) {
            throw new Exception(Exception::STORAGE_FILE_NOT_FOUND);
@@ -1460,14 +1498,6 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/push')
            $contentType = $file->getAttribute('mimeType');
        }

-        $response
-            ->setContentType($contentType)
-            ->addHeader('Content-Security-Policy', 'script-src none;')
-            ->addHeader('X-Content-Type-Options', 'nosniff')
-            ->addHeader('Content-Disposition', 'inline; filename="' . $file->getAttribute('name', '') . '"')
-            ->addHeader('Cache-Control', 'private, max-age=3888000') // 45 days
-            ->addHeader('X-Peak', \memory_get_peak_usage());
-
        $size = $file->getAttribute('sizeOriginal', 0);

        $rangeHeader = $request->getHeader('range');
@@ -1476,8 +1506,8 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/push')
            $end = $request->getRangeEnd();
            $unit = $request->getRangeUnit();

-            if ($end === null) {
-                $end = min(($start + 2000000 - 1), ($size - 1));
+            if ($end === null || $end - $start > APP_STORAGE_READ_BUFFER) {
+                $end = min(($start + APP_STORAGE_READ_BUFFER - 1), ($size - 1));
            }

            if ($unit != 'bytes' || $start >= $end || $end >= $size) {
@@ -1491,6 +1521,14 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/push')
                ->setStatusCode(Response::STATUS_CODE_PARTIALCONTENT);
        }

+        $response
+            ->setContentType($contentType)
+            ->addHeader('Content-Security-Policy', 'script-src none;')
+            ->addHeader('X-Content-Type-Options', 'nosniff')
+            ->addHeader('Content-Disposition', 'inline; filename="' . $file->getAttribute('name', '') . '"')
+            ->addHeader('Cache-Control', 'private, max-age=3888000') // 45 days
+            ->addHeader('X-Peak', \memory_get_peak_usage());
+
        $source = '';
        if (!empty($file->getAttribute('openSSLCipher'))) { // Decrypt
            $source = $deviceForFiles->read($path);
@@ -1524,6 +1562,7 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/push')
        if (!empty($source)) {
            if (!empty($rangeHeader)) {
                $response->send(substr($source, $start, ($end - $start + 1)));
+                return;
            }
            $response->send($source);
            return;
@@ -1565,6 +1604,7 @@ App::put('/v1/storage/buckets/:bucketId/files/:fileId')
    ->label('abuse-time', APP_LIMIT_WRITE_RATE_PERIOD_DEFAULT)
    ->label('sdk', new Method(
        namespace: 'storage',
+        group: 'files',
        name: 'updateFile',
        description: '/docs/references/storage/update-file.md',
        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -1603,7 +1643,7 @@ App::put('/v1/storage/buckets/:bucketId/files/:fileId')
        }

        // Read permission should not be required for update
-        $file = Authorization::skip(fn () => $dbForProject->getDocument('bucket_' . $bucket->getInternalId(), $fileId));
+        $file = Authorization::skip(fn () => $dbForProject->getDocument('bucket_' . $bucket->getSequence(), $fileId));

        if ($file->isEmpty()) {
            throw new Exception(Exception::STORAGE_FILE_NOT_FOUND);
@@ -1649,9 +1689,9 @@ App::put('/v1/storage/buckets/:bucketId/files/:fileId')

        try {
            if ($fileSecurity && !$valid) {
-                $file = $dbForProject->updateDocument('bucket_' . $bucket->getInternalId(), $fileId, $file);
+                $file = $dbForProject->updateDocument('bucket_' . $bucket->getSequence(), $fileId, $file);
            } else {
-                $file = Authorization::skip(fn () => $dbForProject->updateDocument('bucket_' . $bucket->getInternalId(), $fileId, $file));
+                $file = Authorization::skip(fn () => $dbForProject->updateDocument('bucket_' . $bucket->getSequence(), $fileId, $file));
            }
        } catch (NotFoundException) {
            throw new Exception(Exception::STORAGE_BUCKET_NOT_FOUND);
@@ -1679,6 +1719,7 @@ App::delete('/v1/storage/buckets/:bucketId/files/:fileId')
    ->label('abuse-time', APP_LIMIT_WRITE_RATE_PERIOD_DEFAULT)
    ->label('sdk', new Method(
        namespace: 'storage',
+        group: 'files',
        name: 'deleteFile',
        description: '/docs/references/storage/delete-file.md',
        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -1716,7 +1757,7 @@ App::delete('/v1/storage/buckets/:bucketId/files/:fileId')
        }

        // Read permission should not be required for delete
-        $file = Authorization::skip(fn () => $dbForProject->getDocument('bucket_' . $bucket->getInternalId(), $fileId));
+        $file = Authorization::skip(fn () => $dbForProject->getDocument('bucket_' . $bucket->getSequence(), $fileId));

        if ($file->isEmpty()) {
            throw new Exception(Exception::STORAGE_FILE_NOT_FOUND);
@@ -1746,9 +1787,9 @@ App::delete('/v1/storage/buckets/:bucketId/files/:fileId')

            try {
                if ($fileSecurity && !$valid) {
-                    $deleted = $dbForProject->deleteDocument('bucket_' . $bucket->getInternalId(), $fileId);
+                    $deleted = $dbForProject->deleteDocument('bucket_' . $bucket->getSequence(), $fileId);
                } else {
-                    $deleted = Authorization::skip(fn () => $dbForProject->deleteDocument('bucket_' . $bucket->getInternalId(), $fileId));
+                    $deleted = Authorization::skip(fn () => $dbForProject->deleteDocument('bucket_' . $bucket->getSequence(), $fileId));
                }
            } catch (NotFoundException) {
                throw new Exception(Exception::STORAGE_BUCKET_NOT_FOUND);
@@ -1779,6 +1820,7 @@ App::get('/v1/storage/usage')
    ->label('resourceType', RESOURCE_TYPE_BUCKETS)
    ->label('sdk', new Method(
        namespace: 'storage',
+        group: null,
        name: 'getUsage',
        description: '/docs/references/storage/get-usage.md',
        auth: [AuthType::ADMIN],
@@ -1865,6 +1907,7 @@ App::get('/v1/storage/:bucketId/usage')
    ->label('resourceType', RESOURCE_TYPE_BUCKETS)
    ->label('sdk', new Method(
        namespace: 'storage',
+        group: null,
        name: 'getBucketUsage',
        description: '/docs/references/storage/get-bucket-usage.md',
        auth: [AuthType::ADMIN],
@@ -1894,14 +1937,14 @@ App::get('/v1/storage/:bucketId/usage')
        $stats = $usage = [];
        $days = $periods[$range];
        $metrics = [
-            str_replace('{bucketInternalId}', $bucket->getInternalId(), METRIC_BUCKET_ID_FILES),
-            str_replace('{bucketInternalId}', $bucket->getInternalId(), METRIC_BUCKET_ID_FILES_STORAGE),
-            str_replace('{bucketInternalId}', $bucket->getInternalId(), METRIC_BUCKET_ID_FILES_IMAGES_TRANSFORMED),
+            str_replace('{bucketInternalId}', $bucket->getSequence(), METRIC_BUCKET_ID_FILES),
+            str_replace('{bucketInternalId}', $bucket->getSequence(), METRIC_BUCKET_ID_FILES_STORAGE),
+            str_replace('{bucketInternalId}', $bucket->getSequence(), METRIC_BUCKET_ID_FILES_IMAGES_TRANSFORMED),
        ];

        Authorization::skip(function () use ($dbForProject, $dbForLogs, $bucket, $days, $metrics, &$stats) {
            foreach ($metrics as $metric) {
-                $db = ($metric === str_replace('{bucketInternalId}', $bucket->getInternalId(), METRIC_BUCKET_ID_FILES_IMAGES_TRANSFORMED))
+                $db = ($metric === str_replace('{bucketInternalId}', $bucket->getSequence(), METRIC_BUCKET_ID_FILES_IMAGES_TRANSFORMED))
                    ? $dbForLogs
                    : $dbForProject;

@@ -33,6 +33,7 @@ use Utopia\Database\DateTime;
 use Utopia\Database\Document;
 use Utopia\Database\Exception\Authorization as AuthorizationException;
 use Utopia\Database\Exception\Duplicate;
+use Utopia\Database\Exception\Order as OrderException;
 use Utopia\Database\Exception\Query as QueryException;
 use Utopia\Database\Helpers\ID;
 use Utopia\Database\Helpers\Permission;
@@ -63,6 +64,7 @@ App::post('/v1/teams')
    ->label('audits.resource', 'team/{response.$id}')
    ->label('sdk', new Method(
        namespace: 'teams',
+        group: 'teams',
        name: 'create',
        description: '/docs/references/teams/create-team.md',
        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -121,9 +123,9 @@ App::post('/v1/teams')
                    Permission::delete(Role::team($team->getId(), 'owner')),
                ],
                'userId' => $user->getId(),
-                'userInternalId' => $user->getInternalId(),
+                'userInternalId' => $user->getSequence(),
                'teamId' => $team->getId(),
-                'teamInternalId' => $team->getInternalId(),
+                'teamInternalId' => $team->getSequence(),
                'roles' => $roles,
                'invited' => DateTime::now(),
                'joined' => DateTime::now(),
@@ -153,6 +155,7 @@ App::get('/v1/teams')
    ->label('scope', 'teams.read')
    ->label('sdk', new Method(
        namespace: 'teams',
+        group: 'teams',
        name: 'list',
        description: '/docs/references/teams/list-teams.md',
        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -205,9 +208,12 @@ App::get('/v1/teams')
        }

        $filterQueries = Query::groupByType($queries)['filters'];
-
-        $results = $dbForProject->find('teams', $queries);
-        $total = $dbForProject->count('teams', $filterQueries, APP_LIMIT_COUNT);
+        try {
+            $results = $dbForProject->find('teams', $queries);
+            $total = $dbForProject->count('teams', $filterQueries, APP_LIMIT_COUNT);
+        } catch (OrderException $e) {
+            throw new Exception(Exception::DATABASE_QUERY_ORDER_NULL, "The order attribute '{$e->getAttribute()}' had a null value. Cursor pagination requires all documents order attribute values are non-null.");
+        }

        $response->dynamic(new Document([
            'teams' => $results,
@@ -221,6 +227,7 @@ App::get('/v1/teams/:teamId')
    ->label('scope', 'teams.read')
    ->label('sdk', new Method(
        namespace: 'teams',
+        group: 'teams',
        name: 'get',
        description: '/docs/references/teams/get-team.md',
        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -251,6 +258,7 @@ App::get('/v1/teams/:teamId/prefs')
    ->label('scope', 'teams.read')
    ->label('sdk', new Method(
        namespace: 'teams',
+        group: 'teams',
        name: 'getPrefs',
        description: '/docs/references/teams/get-team-prefs.md',
        auth: [AuthType::SESSION, AuthType::JWT],
@@ -286,6 +294,7 @@ App::put('/v1/teams/:teamId')
    ->label('audits.resource', 'team/{response.$id}')
    ->label('sdk', new Method(
        namespace: 'teams',
+        group: 'teams',
        name: 'updateName',
        description: '/docs/references/teams/update-team-name.md',
        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -314,9 +323,7 @@ App::put('/v1/teams/:teamId')
            ->setAttribute('name', $name)
            ->setAttribute('search', implode(' ', [$teamId, $name]));

-        $team = $dbForProject->withRequestTimestamp($requestTimestamp, function () use ($dbForProject, $team) {
-            return $dbForProject->updateDocument('teams', $team->getId(), $team);
-        });
+        $team = $dbForProject->updateDocument('teams', $team->getId(), $team);

        $queueForEvents->setParam('teamId', $team->getId());

@@ -333,6 +340,7 @@ App::put('/v1/teams/:teamId/prefs')
    ->label('audits.userId', '{response.$id}')
    ->label('sdk', new Method(
        namespace: 'teams',
+        group: 'teams',
        name: 'updatePrefs',
        description: '/docs/references/teams/update-team-prefs.md',
        auth: [AuthType::SESSION, AuthType::JWT],
@@ -372,6 +380,7 @@ App::delete('/v1/teams/:teamId')
    ->label('audits.resource', 'team/{request.teamId}')
    ->label('sdk', new Method(
        namespace: 'teams',
+        group: 'teams',
        name: 'delete',
        description: '/docs/references/teams/delete-team.md',
        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -430,6 +439,7 @@ App::post('/v1/teams/:teamId/memberships')
    ->label('audits.userId', '{request.userId}')
    ->label('sdk', new Method(
        namespace: 'teams',
+        group: 'memberships',
        name: 'createMembership',
        description: '/docs/references/teams/create-team-membership.md',
        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -585,8 +595,8 @@ App::post('/v1/teams/:teamId/memberships')
        }

        $membership = $dbForProject->findOne('memberships', [
-            Query::equal('userInternalId', [$invitee->getInternalId()]),
-            Query::equal('teamInternalId', [$team->getInternalId()]),
+            Query::equal('userInternalId', [$invitee->getSequence()]),
+            Query::equal('teamInternalId', [$team->getSequence()]),
        ]);

        $secret = Auth::tokenGenerator();
@@ -602,9 +612,9 @@ App::post('/v1/teams/:teamId/memberships')
                    Permission::delete(Role::team($team->getId(), 'owner')),
                ],
                'userId' => $invitee->getId(),
-                'userInternalId' => $invitee->getInternalId(),
+                'userInternalId' => $invitee->getSequence(),
                'teamId' => $team->getId(),
-                'teamInternalId' => $team->getInternalId(),
+                'teamInternalId' => $team->getSequence(),
                'roles' => $roles,
                'invited' => DateTime::now(),
                'joined' => ($isPrivilegedUser || $isAppUser) ? DateTime::now() : null,
@@ -797,6 +807,7 @@ App::get('/v1/teams/:teamId/memberships')
    ->label('scope', 'teams.read')
    ->label('sdk', new Method(
        namespace: 'teams',
+        group: 'memberships',
        name: 'listMemberships',
        description: '/docs/references/teams/list-team-members.md',
        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -831,7 +842,7 @@ App::get('/v1/teams/:teamId/memberships')
        }

        // Set internal queries
-        $queries[] = Query::equal('teamInternalId', [$team->getInternalId()]);
+        $queries[] = Query::equal('teamInternalId', [$team->getSequence()]);

        /**
         * Get cursor document if there was a cursor query, we use array_filter and reset for reference $cursor to $queries
@@ -860,17 +871,20 @@ App::get('/v1/teams/:teamId/memberships')
        }

        $filterQueries = Query::groupByType($queries)['filters'];
+        try {
+            $memberships = $dbForProject->find(
+                collection: 'memberships',
+                queries: $queries,
+            );
+            $total = $dbForProject->count(
+                collection: 'memberships',
+                queries: $filterQueries,
+                max: APP_LIMIT_COUNT
+            );
+        } catch (OrderException $e) {
+            throw new Exception(Exception::DATABASE_QUERY_ORDER_NULL, "The order attribute '{$e->getAttribute()}' had a null value. Cursor pagination requires all documents order attribute values are non-null.");
+        }

-        $memberships = $dbForProject->find(
-            collection: 'memberships',
-            queries: $queries,
-        );
-
-        $total = $dbForProject->count(
-            collection: 'memberships',
-            queries: $filterQueries,
-            max: APP_LIMIT_COUNT
-        );

        $memberships = array_filter($memberships, fn (Document $membership) => !empty($membership->getAttribute('userId')));

@@ -935,6 +949,7 @@ App::get('/v1/teams/:teamId/memberships/:membershipId')
    ->label('scope', 'teams.read')
    ->label('sdk', new Method(
        namespace: 'teams',
+        group: 'memberships',
        name: 'getMembership',
        description: '/docs/references/teams/get-team-member.md',
        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -1021,6 +1036,7 @@ App::patch('/v1/teams/:teamId/memberships/:membershipId')
    ->label('audits.resource', 'team/{request.teamId}')
    ->label('sdk', new Method(
        namespace: 'teams',
+        group: 'memberships',
        name: 'updateMembership',
        description: '/docs/references/teams/update-team-membership.md',
        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -1074,7 +1090,10 @@ App::patch('/v1/teams/:teamId/memberships/:membershipId')
            // Quick check: fetch up to 2 owners to determine if only one exists
            $ownersCount = $dbForProject->count(
                collection: 'memberships',
-                queries: [Query::contains('roles', ['owner'])],
+                queries: [
+                    Query::contains('roles', ['owner']),
+                    Query::equal('teamInternalId', [$team->getSequence()])
+                ],
                max: 2
            );

@@ -1124,6 +1143,7 @@ App::patch('/v1/teams/:teamId/memberships/:membershipId/status')
    ->label('audits.userId', '{request.userId}')
    ->label('sdk', new Method(
        namespace: 'teams',
+        group: 'memberships',
        name: 'updateMembershipStatus',
        description: '/docs/references/teams/update-team-membership-status.md',
        auth: [AuthType::SESSION, AuthType::JWT],
@@ -1160,7 +1180,7 @@ App::patch('/v1/teams/:teamId/memberships/:membershipId/status')
            throw new Exception(Exception::TEAM_NOT_FOUND);
        }

-        if ($membership->getAttribute('teamInternalId') !== $team->getInternalId()) {
+        if ($membership->getAttribute('teamInternalId') !== $team->getSequence()) {
            throw new Exception(Exception::TEAM_MEMBERSHIP_MISMATCH);
        }

@@ -1177,7 +1197,7 @@ App::patch('/v1/teams/:teamId/memberships/:membershipId/status')
            $user->setAttributes($dbForProject->getDocument('users', $userId)->getArrayCopy()); // Get user
        }

-        if ($membership->getAttribute('userInternalId') !== $user->getInternalId()) {
+        if ($membership->getAttribute('userInternalId') !== $user->getSequence()) {
            throw new Exception(Exception::TEAM_INVITE_MISMATCH, 'Invite does not belong to current user (' . $user->getAttribute('email') . ')');
        }

@@ -1209,7 +1229,7 @@ App::patch('/v1/teams/:teamId/memberships/:membershipId/status')
                    Permission::delete(Role::user($user->getId())),
                ],
                'userId' => $user->getId(),
-                'userInternalId' => $user->getInternalId(),
+                'userInternalId' => $user->getSequence(),
                'provider' => Auth::SESSION_PROVIDER_EMAIL,
                'providerUid' => $user->getAttribute('email'),
                'secret' => Auth::hash($secret), // One way hash encryption to protect DB leak
@@ -1281,6 +1301,7 @@ App::delete('/v1/teams/:teamId/memberships/:membershipId')
    ->label('audits.resource', 'team/{request.teamId}')
    ->label('sdk', new Method(
        namespace: 'teams',
+        group: 'memberships',
        name: 'deleteMembership',
        description: '/docs/references/teams/delete-team-membership.md',
        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -1317,7 +1338,7 @@ App::delete('/v1/teams/:teamId/memberships/:membershipId')
            throw new Exception(Exception::TEAM_NOT_FOUND);
        }

-        if ($membership->getAttribute('teamInternalId') !== $team->getInternalId()) {
+        if ($membership->getAttribute('teamInternalId') !== $team->getSequence()) {
            throw new Exception(Exception::TEAM_MEMBERSHIP_MISMATCH);
        }

@@ -1351,6 +1372,7 @@ App::get('/v1/teams/:teamId/logs')
    ->label('scope', 'teams.read')
    ->label('sdk', new Method(
        namespace: 'teams',
+        group: 'logs',
        name: 'listLogs',
        description: '/docs/references/teams/get-team-logs.md',
        auth: [AuthType::ADMIN],
@@ -9,6 +9,8 @@ use Appwrite\Auth\Validator\PasswordDictionary;
 use Appwrite\Auth\Validator\PasswordHistory;
 use Appwrite\Auth\Validator\PersonalData;
 use Appwrite\Auth\Validator\Phone;
+use Appwrite\Deletes\Identities as DeleteIdentities;
+use Appwrite\Deletes\Targets as DeleteTargets;
 use Appwrite\Detector\Detector;
 use Appwrite\Event\Delete;
 use Appwrite\Event\Event;
@@ -34,6 +36,7 @@ use Utopia\Database\Database;
 use Utopia\Database\DateTime;
 use Utopia\Database\Document;
 use Utopia\Database\Exception\Duplicate;
+use Utopia\Database\Exception\Order as OrderException;
 use Utopia\Database\Exception\Query as QueryException;
 use Utopia\Database\Helpers\ID;
 use Utopia\Database\Helpers\Permission;
@@ -137,7 +140,7 @@ function createUser(string $hash, mixed $hashOptions, string $userId, ?string $e
                        Permission::delete(Role::user($user->getId())),
                    ],
                    'userId' => $user->getId(),
-                    'userInternalId' => $user->getInternalId(),
+                    'userInternalId' => $user->getSequence(),
                    'providerType' => 'email',
                    'identifier' => $email,
                ]));
@@ -161,7 +164,7 @@ function createUser(string $hash, mixed $hashOptions, string $userId, ?string $e
                        Permission::delete(Role::user($user->getId())),
                    ],
                    'userId' => $user->getId(),
-                    'userInternalId' => $user->getInternalId(),
+                    'userInternalId' => $user->getSequence(),
                    'providerType' => 'sms',
                    'identifier' => $phone,
                ]));
@@ -192,6 +195,7 @@ App::post('/v1/users')
    ->label('audits.resource', 'user/{response.$id}')
    ->label('sdk', new Method(
        namespace: 'users',
+        group: 'users',
        name: 'create',
        description: '/docs/references/users/create-user.md',
        auth: [AuthType::KEY],
@@ -226,6 +230,7 @@ App::post('/v1/users/bcrypt')
    ->label('audits.resource', 'user/{response.$id}')
    ->label('sdk', new Method(
        namespace: 'users',
+        group: 'users',
        name: 'createBcryptUser',
        description: '/docs/references/users/create-bcrypt-user.md',
        auth: [AuthType::KEY],
@@ -260,6 +265,7 @@ App::post('/v1/users/md5')
    ->label('audits.resource', 'user/{response.$id}')
    ->label('sdk', new Method(
        namespace: 'users',
+        group: 'users',
        name: 'createMD5User',
        description: '/docs/references/users/create-md5-user.md',
        auth: [AuthType::KEY],
@@ -294,6 +300,7 @@ App::post('/v1/users/argon2')
    ->label('audits.resource', 'user/{response.$id}')
    ->label('sdk', new Method(
        namespace: 'users',
+        group: 'users',
        name: 'createArgon2User',
        description: '/docs/references/users/create-argon2-user.md',
        auth: [AuthType::KEY],
@@ -328,6 +335,7 @@ App::post('/v1/users/sha')
    ->label('audits.resource', 'user/{response.$id}')
    ->label('sdk', new Method(
        namespace: 'users',
+        group: 'users',
        name: 'createSHAUser',
        description: '/docs/references/users/create-sha-user.md',
        auth: [AuthType::KEY],
@@ -369,6 +377,7 @@ App::post('/v1/users/phpass')
    ->label('audits.resource', 'user/{response.$id}')
    ->label('sdk', new Method(
        namespace: 'users',
+        group: 'users',
        name: 'createPHPassUser',
        description: '/docs/references/users/create-phpass-user.md',
        auth: [AuthType::KEY],
@@ -403,6 +412,7 @@ App::post('/v1/users/scrypt')
    ->label('audits.resource', 'user/{response.$id}')
    ->label('sdk', new Method(
        namespace: 'users',
+        group: 'users',
        name: 'createScryptUser',
        description: '/docs/references/users/create-scrypt-user.md',
        auth: [AuthType::KEY],
@@ -450,6 +460,7 @@ App::post('/v1/users/scrypt-modified')
    ->label('audits.resource', 'user/{response.$id}')
    ->label('sdk', new Method(
        namespace: 'users',
+        group: 'users',
        name: 'createScryptModifiedUser',
        description: '/docs/references/users/create-scrypt-modified-user.md',
        auth: [AuthType::KEY],
@@ -488,6 +499,7 @@ App::post('/v1/users/:userId/targets')
    ->label('scope', 'targets.write')
    ->label('sdk', new Method(
        namespace: 'users',
+        group: 'targets',
        name: 'createTarget',
        description: '/docs/references/users/create-target.md',
        auth: [AuthType::KEY, AuthType::ADMIN],
@@ -552,10 +564,10 @@ App::post('/v1/users/:userId/targets')
                    Permission::delete(Role::user($user->getId())),
                ],
                'providerId' => empty($provider->getId()) ? null : $provider->getId(),
-                'providerInternalId' => $provider->isEmpty() ? null : $provider->getInternalId(),
+                'providerInternalId' => $provider->isEmpty() ? null : $provider->getSequence(),
                'providerType' =>  $providerType,
                'userId' => $userId,
-                'userInternalId' => $user->getInternalId(),
+                'userInternalId' => $user->getSequence(),
                'identifier' => $identifier,
                'name' => ($name !== '') ? $name : null,
            ]));
@@ -579,6 +591,7 @@ App::get('/v1/users')
    ->label('scope', 'users.read')
    ->label('sdk', new Method(
        namespace: 'users',
+        group: 'users',
        name: 'list',
        description: '/docs/references/users/list-users.md',
        auth: [AuthType::KEY],
@@ -631,10 +644,15 @@ App::get('/v1/users')
        }

        $filterQueries = Query::groupByType($queries)['filters'];
-
+        try {
+            $users = $dbForProject->find('users', $queries);
+            $total = $dbForProject->count('users', $filterQueries, APP_LIMIT_COUNT);
+        } catch (OrderException $e) {
+            throw new Exception(Exception::DATABASE_QUERY_ORDER_NULL, "The order attribute '{$e->getAttribute()}' had a null value. Cursor pagination requires all documents order attribute values are non-null.");
+        }
        $response->dynamic(new Document([
-            'users' => $dbForProject->find('users', $queries),
-            'total' => $dbForProject->count('users', $filterQueries, APP_LIMIT_COUNT),
+            'users' => $users,
+            'total' => $total,
        ]), Response::MODEL_USER_LIST);
    });

@@ -644,6 +662,7 @@ App::get('/v1/users/:userId')
    ->label('scope', 'users.read')
    ->label('sdk', new Method(
        namespace: 'users',
+        group: 'users',
        name: 'get',
        description: '/docs/references/users/get-user.md',
        auth: [AuthType::KEY],
@@ -674,6 +693,7 @@ App::get('/v1/users/:userId/prefs')
    ->label('scope', 'users.read')
    ->label('sdk', new Method(
        namespace: 'users',
+        group: 'users',
        name: 'getPrefs',
        description: '/docs/references/users/get-user-prefs.md',
        auth: [AuthType::KEY],
@@ -706,6 +726,7 @@ App::get('/v1/users/:userId/targets/:targetId')
    ->label('scope', 'targets.read')
    ->label('sdk', new Method(
        namespace: 'users',
+        group: 'targets',
        name: 'getTarget',
        description: '/docs/references/users/get-user-target.md',
        auth: [AuthType::KEY, AuthType::ADMIN],
@@ -743,6 +764,7 @@ App::get('/v1/users/:userId/sessions')
    ->label('scope', 'users.read')
    ->label('sdk', new Method(
        namespace: 'users',
+        group: 'sessions',
        name: 'listSessions',
        description: '/docs/references/users/list-user-sessions.md',
        auth: [AuthType::KEY],
@@ -789,6 +811,7 @@ App::get('/v1/users/:userId/memberships')
    ->label('scope', 'users.read')
    ->label('sdk', new Method(
        namespace: 'users',
+        group: 'memberships',
        name: 'listMemberships',
        description: '/docs/references/users/list-user-memberships.md',
        auth: [AuthType::KEY],
@@ -823,7 +846,7 @@ App::get('/v1/users/:userId/memberships')
        }

        // Set internal queries
-        $queries[] = Query::equal('userInternalId', [$user->getInternalId()]);
+        $queries[] = Query::equal('userInternalId', [$user->getSequence()]);

        $memberships = array_map(function ($membership) use ($dbForProject, $user) {
            $team = $dbForProject->getDocument('teams', $membership->getAttribute('teamId'));
@@ -848,6 +871,7 @@ App::get('/v1/users/:userId/logs')
    ->label('scope', 'users.read')
    ->label('sdk', new Method(
        namespace: 'users',
+        group: 'logs',
        name: 'listLogs',
        description: '/docs/references/users/list-user-logs.md',
        auth: [AuthType::KEY],
@@ -886,7 +910,7 @@ App::get('/v1/users/:userId/logs')

        $audit = new Audit($dbForProject);

-        $logs = $audit->getLogsByUser($user->getInternalId(), $queries);
+        $logs = $audit->getLogsByUser($user->getSequence(), $queries);

        $output = [];

@@ -933,7 +957,7 @@ App::get('/v1/users/:userId/logs')
        }

        $response->dynamic(new Document([
-            'total' => $audit->countLogsByUser($user->getInternalId(), $queries),
+            'total' => $audit->countLogsByUser($user->getSequence(), $queries),
            'logs' => $output,
        ]), Response::MODEL_LOG_LIST);
    });
@@ -944,6 +968,7 @@ App::get('/v1/users/:userId/targets')
    ->label('scope', 'targets.read')
    ->label('sdk', new Method(
        namespace: 'users',
+        group: 'targets',
        name: 'listTargets',
        description: '/docs/references/users/list-user-targets.md',
        auth: [AuthType::KEY, AuthType::ADMIN],
@@ -996,10 +1021,15 @@ App::get('/v1/users/:userId/targets')

            $cursor->setValue($cursorDocument);
        }
-
+        try {
+            $targets = $dbForProject->find('targets', $queries);
+            $total = $dbForProject->count('targets', $queries, APP_LIMIT_COUNT);
+        } catch (OrderException $e) {
+            throw new Exception(Exception::DATABASE_QUERY_ORDER_NULL, "The order attribute '{$e->getAttribute()}' had a null value. Cursor pagination requires all documents order attribute values are non-null.");
+        }
        $response->dynamic(new Document([
-            'targets' => $dbForProject->find('targets', $queries),
-            'total' => $dbForProject->count('targets', $queries, APP_LIMIT_COUNT),
+            'targets' => $targets,
+            'total' => $total,
        ]), Response::MODEL_TARGET_LIST);
    });

@@ -1009,6 +1039,7 @@ App::get('/v1/users/identities')
    ->label('scope', 'users.read')
    ->label('sdk', new Method(
        namespace: 'users',
+        group: 'identities',
        name: 'listIdentities',
        description: '/docs/references/users/list-identities.md',
        auth: [AuthType::KEY],
@@ -1061,10 +1092,15 @@ App::get('/v1/users/identities')
        }

        $filterQueries = Query::groupByType($queries)['filters'];
-
+        try {
+            $identities = $dbForProject->find('identities', $queries);
+            $total = $dbForProject->count('identities', $filterQueries, APP_LIMIT_COUNT);
+        } catch (OrderException $e) {
+            throw new Exception(Exception::DATABASE_QUERY_ORDER_NULL, "The order attribute '{$e->getAttribute()}' had a null value. Cursor pagination requires all documents order attribute values are non-null.");
+        }
        $response->dynamic(new Document([
-            'identities' => $dbForProject->find('identities', $queries),
-            'total' => $dbForProject->count('identities', $filterQueries, APP_LIMIT_COUNT),
+            'identities' => $identities,
+            'total' => $total,
        ]), Response::MODEL_IDENTITY_LIST);
    });

@@ -1078,6 +1114,7 @@ App::patch('/v1/users/:userId/status')
    ->label('audits.userId', '{response.$id}')
    ->label('sdk', new Method(
        namespace: 'users',
+        group: 'users',
        name: 'updateStatus',
        description: '/docs/references/users/update-user-status.md',
        auth: [AuthType::KEY],
@@ -1118,6 +1155,7 @@ App::put('/v1/users/:userId/labels')
    ->label('audits.resource', 'user/{response.$id}')
    ->label('sdk', new Method(
        namespace: 'users',
+        group: 'users',
        name: 'updateLabels',
        description: '/docs/references/users/update-user-labels.md',
        auth: [AuthType::KEY],
@@ -1160,6 +1198,7 @@ App::patch('/v1/users/:userId/verification/phone')
    ->label('audits.resource', 'user/{response.$id}')
    ->label('sdk', new Method(
        namespace: 'users',
+        group: 'users',
        name: 'updatePhoneVerification',
        description: '/docs/references/users/update-user-phone-verification.md',
        auth: [AuthType::KEY],
@@ -1201,6 +1240,7 @@ App::patch('/v1/users/:userId/name')
    ->label('audits.userId', '{response.$id}')
    ->label('sdk', new Method(
        namespace: 'users',
+        group: 'users',
        name: 'updateName',
        description: '/docs/references/users/update-user-name.md',
        auth: [AuthType::KEY],
@@ -1243,6 +1283,7 @@ App::patch('/v1/users/:userId/password')
    ->label('audits.userId', '{response.$id}')
    ->label('sdk', new Method(
        namespace: 'users',
+        group: 'users',
        name: 'updatePassword',
        description: '/docs/references/users/update-user-password.md',
        auth: [AuthType::KEY],
@@ -1325,6 +1366,7 @@ App::patch('/v1/users/:userId/email')
    ->label('audits.userId', '{response.$id}')
    ->label('sdk', new Method(
        namespace: 'users',
+        group: 'users',
        name: 'updateEmail',
        description: '/docs/references/users/update-user-email.md',
        auth: [AuthType::KEY],
@@ -1354,7 +1396,7 @@ App::patch('/v1/users/:userId/email')
            // Makes sure this email is not already used in another identity
            $identityWithMatchingEmail = $dbForProject->findOne('identities', [
                Query::equal('providerEmail', [$email]),
-                Query::notEqual('userInternalId', $user->getInternalId()),
+                Query::notEqual('userInternalId', $user->getSequence()),
            ]);
            if (!$identityWithMatchingEmail->isEmpty()) {
                throw new Exception(Exception::USER_EMAIL_ALREADY_EXISTS);
@@ -1398,7 +1440,7 @@ App::patch('/v1/users/:userId/email')
                            Permission::delete(Role::user($user->getId())),
                        ],
                        'userId' => $user->getId(),
-                        'userInternalId' => $user->getInternalId(),
+                        'userInternalId' => $user->getSequence(),
                        'providerType' => 'email',
                        'identifier' => $email,
                    ]));
@@ -1424,6 +1466,7 @@ App::patch('/v1/users/:userId/phone')
    ->label('audits.resource', 'user/{response.$id}')
    ->label('sdk', new Method(
        namespace: 'users',
+        group: 'users',
        name: 'updatePhone',
        description: '/docs/references/users/update-user-phone.md',
        auth: [AuthType::KEY],
@@ -1486,7 +1529,7 @@ App::patch('/v1/users/:userId/phone')
                            Permission::delete(Role::user($user->getId())),
                        ],
                        'userId' => $user->getId(),
-                        'userInternalId' => $user->getInternalId(),
+                        'userInternalId' => $user->getSequence(),
                        'providerType' => 'sms',
                        'identifier' => $number,
                    ]));
@@ -1513,6 +1556,7 @@ App::patch('/v1/users/:userId/verification')
    ->label('audits.userId', '{request.userId}')
    ->label('sdk', new Method(
        namespace: 'users',
+        group: 'users',
        name: 'updateEmailVerification',
        description: '/docs/references/users/update-user-email-verification.md',
        auth: [AuthType::KEY],
@@ -1550,6 +1594,7 @@ App::patch('/v1/users/:userId/prefs')
    ->label('scope', 'users.write')
    ->label('sdk', new Method(
        namespace: 'users',
+        group: 'users',
        name: 'updatePrefs',
        description: '/docs/references/users/update-user-prefs.md',
        auth: [AuthType::KEY],
@@ -1590,6 +1635,7 @@ App::patch('/v1/users/:userId/targets/:targetId')
    ->label('scope', 'targets.write')
    ->label('sdk', new Method(
        namespace: 'users',
+        group: 'targets',
        name: 'updateTarget',
        description: '/docs/references/users/update-target.md',
        auth: [AuthType::KEY, AuthType::ADMIN],
@@ -1665,7 +1711,7 @@ App::patch('/v1/users/:userId/targets/:targetId')

            $target
                ->setAttribute('providerId', $provider->getId())
-                ->setAttribute('providerInternalId', $provider->getInternalId());
+                ->setAttribute('providerInternalId', $provider->getSequence());
        }

        if ($name) {
@@ -1694,6 +1740,7 @@ App::patch('/v1/users/:userId/mfa')
    ->label('usage.metric', 'users.{scope}.requests.update')
    ->label('sdk', new Method(
        namespace: 'users',
+        group: 'users',
        name: 'updateMfa',
        description: '/docs/references/users/update-user-mfa.md',
        auth: [AuthType::KEY],
@@ -1733,6 +1780,7 @@ App::get('/v1/users/:userId/mfa/factors')
    ->label('usage.metric', 'users.{scope}.requests.read')
    ->label('sdk', new Method(
        namespace: 'users',
+        group: 'mfa',
        name: 'listMfaFactors',
        description: '/docs/references/users/list-mfa-factors.md',
        auth: [AuthType::KEY],
@@ -1771,6 +1819,7 @@ App::get('/v1/users/:userId/mfa/recovery-codes')
    ->label('usage.metric', 'users.{scope}.requests.read')
    ->label('sdk', new Method(
        namespace: 'users',
+        group: 'mfa',
        name: 'getMfaRecoveryCodes',
        description: '/docs/references/users/get-mfa-recovery-codes.md',
        auth: [AuthType::KEY],
@@ -1815,6 +1864,7 @@ App::patch('/v1/users/:userId/mfa/recovery-codes')
    ->label('usage.metric', 'users.{scope}.requests.update')
    ->label('sdk', new Method(
        namespace: 'users',
+        group: 'mfa',
        name: 'createMfaRecoveryCodes',
        description: '/docs/references/users/create-mfa-recovery-codes.md',
        auth: [AuthType::KEY],
@@ -1856,7 +1906,7 @@ App::patch('/v1/users/:userId/mfa/recovery-codes')
    });

 App::put('/v1/users/:userId/mfa/recovery-codes')
-    ->desc('Regenerate MFA recovery codes')
+    ->desc('Update MFA recovery codes (regenerate)')
    ->groups(['api', 'users'])
    ->label('event', 'users.[userId].update.mfa.recovery-codes')
    ->label('scope', 'users.write')
@@ -1866,6 +1916,7 @@ App::put('/v1/users/:userId/mfa/recovery-codes')
    ->label('usage.metric', 'users.{scope}.requests.update')
    ->label('sdk', new Method(
        namespace: 'users',
+        group: 'mfa',
        name: 'updateMfaRecoveryCodes',
        description: '/docs/references/users/update-mfa-recovery-codes.md',
        auth: [AuthType::KEY],
@@ -1916,6 +1967,7 @@ App::delete('/v1/users/:userId/mfa/authenticators/:type')
    ->label('usage.metric', 'users.{scope}.requests.update')
    ->label('sdk', new Method(
        namespace: 'users',
+        group: 'mfa',
        name: 'deleteMfaAuthenticator',
        description: '/docs/references/users/delete-mfa-authenticator.md',
        auth: [AuthType::KEY],
@@ -1963,6 +2015,7 @@ App::post('/v1/users/:userId/sessions')
    ->label('usage.metric', 'sessions.{scope}.requests.create')
    ->label('sdk', new Method(
        namespace: 'users',
+        group: 'sessions',
        name: 'createSession',
        description: '/docs/references/users/create-session.md',
        auth: [AuthType::KEY],
@@ -1998,7 +2051,7 @@ App::post('/v1/users/:userId/sessions')
            [
                '$id' => ID::unique(),
                'userId' => $user->getId(),
-                'userInternalId' => $user->getInternalId(),
+                'userInternalId' => $user->getSequence(),
                'provider' => Auth::SESSION_PROVIDER_SERVER,
                'secret' => Auth::hash($secret), // One way hash encryption to protect DB leak
                'userAgent' => $request->getUserAgent('UNKNOWN'),
@@ -2047,6 +2100,7 @@ App::post('/v1/users/:userId/tokens')
    ->label('audits.resource', 'user/{request.userId}')
    ->label('sdk', new Method(
        namespace: 'users',
+        group: 'sessions',
        name: 'createToken',
        description: '/docs/references/users/create-token.md',
        auth: [AuthType::KEY],
@@ -2077,7 +2131,7 @@ App::post('/v1/users/:userId/tokens')
        $token = new Document([
            '$id' => ID::unique(),
            'userId' => $user->getId(),
-            'userInternalId' => $user->getInternalId(),
+            'userInternalId' => $user->getSequence(),
            'type' => Auth::TOKEN_TYPE_GENERIC,
            'secret' => Auth::hash($secret),
            'expire' => $expire,
@@ -2109,6 +2163,7 @@ App::delete('/v1/users/:userId/sessions/:sessionId')
    ->label('audits.resource', 'user/{request.userId}')
    ->label('sdk', new Method(
        namespace: 'users',
+        group: 'sessions',
        name: 'deleteSession',
        description: '/docs/references/users/delete-user-session.md',
        auth: [AuthType::KEY],
@@ -2159,6 +2214,7 @@ App::delete('/v1/users/:userId/sessions')
    ->label('audits.resource', 'user/{user.$id}')
    ->label('sdk', new Method(
        namespace: 'users',
+        group: 'sessions',
        name: 'deleteSessions',
        description: '/docs/references/users/delete-user-sessions.md',
        auth: [AuthType::KEY],
@@ -2208,6 +2264,7 @@ App::delete('/v1/users/:userId')
    ->label('audits.resource', 'user/{request.userId}')
    ->label('sdk', new Method(
        namespace: 'users',
+        group: 'users',
        name: 'delete',
        description: '/docs/references/users/delete.md',
        auth: [AuthType::KEY],
@@ -2236,6 +2293,8 @@ App::delete('/v1/users/:userId')
        $clone = clone $user;

        $dbForProject->deleteDocument('users', $userId);
+        DeleteIdentities::delete($dbForProject, Query::equal('userInternalId', [$user->getSequence()]));
+        DeleteTargets::delete($dbForProject, Query::equal('userInternalId', [$user->getSequence()]));

        $queueForDeletes
            ->setType(DELETE_TYPE_DOCUMENT)
@@ -2257,6 +2316,7 @@ App::delete('/v1/users/:userId/targets/:targetId')
    ->label('scope', 'targets.write')
    ->label('sdk', new Method(
        namespace: 'users',
+        group: 'targets',
        name: 'deleteTarget',
        description: '/docs/references/users/delete-target.md',
        auth: [AuthType::KEY, AuthType::ADMIN],
@@ -2314,6 +2374,7 @@ App::delete('/v1/users/identities/:identityId')
    ->label('audits.resource', 'identity/{request.$identityId}')
    ->label('sdk', new Method(
        namespace: 'users',
+        group: 'identities',
        name: 'deleteIdentity',
        description: '/docs/references/users/delete-identity.md',
        auth: [AuthType::KEY],
@@ -2353,6 +2414,7 @@ App::post('/v1/users/:userId/jwts')
    ->label('scope', 'users.write')
    ->label('sdk', new Method(
        namespace: 'users',
+        group: 'sessions',
        name: 'createJWT',
        description: '/docs/references/users/create-user-jwt.md',
        auth: [AuthType::KEY],
@@ -2408,6 +2470,7 @@ App::get('/v1/users/usage')
    ->label('scope', 'users.read')
    ->label('sdk', new Method(
        namespace: 'users',
+        group: null,
        name: 'getUsage',
        description: '/docs/references/users/get-usage.md',
        auth: [AuthType::ADMIN],
@@ -19,6 +19,7 @@ use Utopia\Database\Database;
 use Utopia\Database\DateTime;
 use Utopia\Database\Document;
 use Utopia\Database\Exception\Duplicate;
+use Utopia\Database\Exception\Order as OrderException;
 use Utopia\Database\Exception\Query as QueryException;
 use Utopia\Database\Helpers\ID;
 use Utopia\Database\Helpers\Permission;
@@ -77,11 +78,11 @@ $createGitDeployments = function (GitHub $github, string $providerInstallationId
            $resourceCollection = $resourceType === "function" ? 'functions' : 'sites';
            $resourceId = $repository->getAttribute('resourceId');
            $resource = Authorization::skip(fn () => $dbForProject->getDocument($resourceCollection, $resourceId));
-            $resourceInternalId = $resource->getInternalId();
+            $resourceInternalId = $resource->getSequence();

            $deploymentId = ID::unique();
            $repositoryId = $repository->getId();
-            $repositoryInternalId = $repository->getInternalId();
+            $repositoryInternalId = $repository->getSequence();
            $providerRepositoryId = $repository->getAttribute('providerRepositoryId');
            $installationId = $repository->getAttribute('installationId');
            $installationInternalId = $repository->getAttribute('installationInternalId');
@@ -156,7 +157,7 @@ $createGitDeployments = function (GitHub $github, string $providerInstallationId
                            ],
                            'installationInternalId' => $installationInternalId,
                            'installationId' => $installationId,
-                            'projectInternalId' => $project->getInternalId(),
+                            'projectInternalId' => $project->getSequence(),
                            'projectId' => $project->getId(),
                            'providerRepositoryId' => $providerRepositoryId,
                            'providerBranch' => $providerBranch,
@@ -251,13 +252,12 @@ $createGitDeployments = function (GitHub $github, string $providerInstallationId
                'providerCommitUrl' => $providerCommitUrl,
                'providerCommentId' => \strval($latestCommentId),
                'providerBranch' => $providerBranch,
-                'search' => implode(' ', [$deploymentId, $resource->getAttribute('entrypoint', '')]),
                'activate' => $activate,
            ])));

            $resource = $resource
                ->setAttribute('latestDeploymentId', $deployment->getId())
-                ->setAttribute('latestDeploymentInternalId', $deployment->getInternalId())
+                ->setAttribute('latestDeploymentInternalId', $deployment->getSequence())
                ->setAttribute('latestDeploymentCreatedAt', $deployment->getCreatedAt())
                ->setAttribute('latestDeploymentStatus', $deployment->getAttribute('status', ''));
            Authorization::skip(fn () => $dbForProject->updateDocument($resource->getCollection(), $resource->getId(), $resource));
@@ -273,12 +273,12 @@ $createGitDeployments = function (GitHub $github, string $providerInstallationId
                    fn () => $dbForPlatform->createDocument('rules', new Document([
                        '$id' => $ruleId,
                        'projectId' => $project->getId(),
-                        'projectInternalId' => $project->getInternalId(),
+                        'projectInternalId' => $project->getSequence(),
                        'domain' => $domain,
                        'type' => 'deployment',
                        'trigger' => 'deployment',
                        'deploymentId' => $deployment->getId(),
-                        'deploymentInternalId' => $deployment->getInternalId(),
+                        'deploymentInternalId' => $deployment->getSequence(),
                        'deploymentResourceType' => 'site',
                        'deploymentResourceId' => $resourceId,
                        'deploymentResourceInternalId' => $resourceInternalId,
@@ -300,12 +300,12 @@ $createGitDeployments = function (GitHub $github, string $providerInstallationId
                            fn () => $dbForPlatform->createDocument('rules', new Document([
                                '$id' => $ruleId,
                                'projectId' => $project->getId(),
-                                'projectInternalId' => $project->getInternalId(),
+                                'projectInternalId' => $project->getSequence(),
                                'domain' => $domain,
                                'type' => 'deployment',
                                'trigger' => 'deployment',
                                'deploymentId' => $deployment->getId(),
-                                'deploymentInternalId' => $deployment->getInternalId(),
+                                'deploymentInternalId' => $deployment->getSequence(),
                                'deploymentResourceType' => 'site',
                                'deploymentResourceId' => $resourceId,
                                'deploymentResourceInternalId' => $resourceInternalId,
@@ -331,12 +331,12 @@ $createGitDeployments = function (GitHub $github, string $providerInstallationId
                            fn () => $dbForPlatform->createDocument('rules', new Document([
                                '$id' => $ruleId,
                                'projectId' => $project->getId(),
-                                'projectInternalId' => $project->getInternalId(),
+                                'projectInternalId' => $project->getSequence(),
                                'domain' => $domain,
                                'type' => 'deployment',
                                'trigger' => 'deployment',
                                'deploymentId' => $deployment->getId(),
-                                'deploymentInternalId' => $deployment->getInternalId(),
+                                'deploymentInternalId' => $deployment->getSequence(),
                                'deploymentResourceType' => 'site',
                                'deploymentResourceId' => $resourceId,
                                'deploymentResourceInternalId' => $resourceInternalId,
@@ -397,12 +397,13 @@ $createGitDeployments = function (GitHub $github, string $providerInstallationId
 };

 App::get('/v1/vcs/github/authorize')
-    ->desc('Install GitHub app')
+    ->desc('Create GitHub app installation')
    ->groups(['api', 'vcs'])
    ->label('scope', 'vcs.read')
    ->label('error', __DIR__ . '/../../views/general/error.phtml')
    ->label('sdk', new Method(
        namespace: 'vcs',
+        group: 'installations',
        name: 'createGitHubInstallation',
        description: '/docs/references/vcs/create-github-installation.md',
        auth: [AuthType::ADMIN],
@@ -446,7 +447,7 @@ App::get('/v1/vcs/github/authorize')
    });

 App::get('/v1/vcs/github/callback')
-    ->desc('Capture installation and authorization from GitHub app')
+    ->desc('Get installation and authorization from GitHub app')
    ->groups(['api', 'vcs'])
    ->label('scope', 'public')
    ->label('error', __DIR__ . '/../../views/general/error.phtml')
@@ -502,7 +503,7 @@ App::get('/v1/vcs/github/callback')
            $github->initializeVariables($providerInstallationId, $privateKey, $githubAppId);
            $owner = $github->getOwnerName($providerInstallationId) ?? '';

-            $projectInternalId = $project->getInternalId();
+            $projectInternalId = $project->getSequence();

            $installation = $dbForPlatform->findOne('installations', [
                Query::equal('providerInstallationId', [$providerInstallationId]),
@@ -584,6 +585,7 @@ App::get('/v1/vcs/github/installations/:installationId/providerRepositories/:pro
    ->label('scope', 'vcs.read')
    ->label('sdk', new Method(
        namespace: 'vcs',
+        group: 'repositories',
        name: 'getRepositoryContents',
        description: '/docs/references/vcs/get-repository-contents.md',
        auth: [AuthType::ADMIN],
@@ -651,6 +653,7 @@ App::post('/v1/vcs/github/installations/:installationId/detections')
    ->label('scope', 'vcs.write')
    ->label('sdk', new Method(
        namespace: 'vcs',
+        group: 'repositories',
        name: 'createRepositoryDetection',
        description: '/docs/references/vcs/create-repository-detection.md',
        auth: [AuthType::ADMIN],
@@ -808,6 +811,7 @@ App::get('/v1/vcs/github/installations/:installationId/providerRepositories')
    ->label('scope', 'vcs.read')
    ->label('sdk', new Method(
        namespace: 'vcs',
+        group: 'repositories',
        name: 'listRepositories',
        description: '/docs/references/vcs/list-repositories.md',
        auth: [AuthType::ADMIN],
@@ -959,6 +963,7 @@ App::post('/v1/vcs/github/installations/:installationId/providerRepositories')
    ->label('scope', 'vcs.write')
    ->label('sdk', new Method(
        namespace: 'vcs',
+        group: 'repositories',
        name: 'createRepository',
        description: '/docs/references/vcs/create-repository.md',
        auth: [AuthType::ADMIN],
@@ -994,7 +999,7 @@ App::post('/v1/vcs/github/installations/:installationId/providerRepositories')
            if (empty($accessToken) || empty($refreshToken) || empty($accessTokenExpiry)) {
                $identity = $dbForPlatform->findOne('identities', [
                    Query::equal('provider', ['github']),
-                    Query::equal('userInternalId', [$user->getInternalId()]),
+                    Query::equal('userInternalId', [$user->getSequence()]),
                ]);
                if ($identity->isEmpty()) {
                    throw new Exception(Exception::USER_IDENTITY_NOT_FOUND);
@@ -1071,6 +1076,7 @@ App::get('/v1/vcs/github/installations/:installationId/providerRepositories/:pro
    ->label('scope', 'vcs.read')
    ->label('sdk', new Method(
        namespace: 'vcs',
+        group: 'repositories',
        name: 'getRepository',
        description: '/docs/references/vcs/get-repository.md',
        auth: [AuthType::ADMIN],
@@ -1125,6 +1131,7 @@ App::get('/v1/vcs/github/installations/:installationId/providerRepositories/:pro
    ->label('scope', 'vcs.read')
    ->label('sdk', new Method(
        namespace: 'vcs',
+        group: 'repositories',
        name: 'listRepositoryBranches',
        description: '/docs/references/vcs/list-repository-branches.md',
        auth: [AuthType::ADMIN],
@@ -1239,7 +1246,7 @@ App::post('/v1/vcs/github/events')

                    foreach ($installations as $installation) {
                        $repositories = Authorization::skip(fn () => $dbForPlatform->find('repositories', [
-                            Query::equal('installationInternalId', [$installation->getInternalId()]),
+                            Query::equal('installationInternalId', [$installation->getSequence()]),
                            Query::limit(1000)
                        ]));

@@ -1318,6 +1325,7 @@ App::get('/v1/vcs/installations')
    ->label('scope', 'vcs.read')
    ->label('sdk', new Method(
        namespace: 'vcs',
+        group: 'installations',
        name: 'listInstallations',
        description: '/docs/references/vcs/list-installations.md',
        auth: [AuthType::ADMIN],
@@ -1341,7 +1349,7 @@ App::get('/v1/vcs/installations')
            throw new Exception(Exception::GENERAL_QUERY_INVALID, $e->getMessage());
        }

-        $queries[] = Query::equal('projectInternalId', [$project->getInternalId()]);
+        $queries[] = Query::equal('projectInternalId', [$project->getSequence()]);

        if (!empty($search)) {
            $queries[] = Query::search('search', $search);
@@ -1373,9 +1381,12 @@ App::get('/v1/vcs/installations')
        }

        $filterQueries = Query::groupByType($queries)['filters'];
-
-        $results = $dbForPlatform->find('installations', $queries);
-        $total = $dbForPlatform->count('installations', $filterQueries, APP_LIMIT_COUNT);
+        try {
+            $results = $dbForPlatform->find('installations', $queries);
+            $total = $dbForPlatform->count('installations', $filterQueries, APP_LIMIT_COUNT);
+        } catch (OrderException $e) {
+            throw new Exception(Exception::DATABASE_QUERY_ORDER_NULL, "The order attribute '{$e->getAttribute()}' had a null value. Cursor pagination requires all documents order attribute values are non-null.");
+        }

        $response->dynamic(new Document([
            'installations' => $results,
@@ -1389,6 +1400,7 @@ App::get('/v1/vcs/installations/:installationId')
    ->label('scope', 'vcs.read')
    ->label('sdk', new Method(
        namespace: 'vcs',
+        group: 'installations',
        name: 'getInstallation',
        description: '/docs/references/vcs/get-installation.md',
        auth: [AuthType::ADMIN],
@@ -1410,7 +1422,7 @@ App::get('/v1/vcs/installations/:installationId')
            throw new Exception(Exception::INSTALLATION_NOT_FOUND);
        }

-        if ($installation->getAttribute('projectInternalId') !== $project->getInternalId()) {
+        if ($installation->getAttribute('projectInternalId') !== $project->getSequence()) {
            throw new Exception(Exception::INSTALLATION_NOT_FOUND);
        }

@@ -1423,6 +1435,7 @@ App::delete('/v1/vcs/installations/:installationId')
    ->label('scope', 'vcs.write')
    ->label('sdk', new Method(
        namespace: 'vcs',
+        group: 'installations',
        name: 'deleteInstallation',
        description: '/docs/references/vcs/delete-installation.md',
        auth: [AuthType::ADMIN],
@@ -1458,11 +1471,12 @@ App::delete('/v1/vcs/installations/:installationId')
    });

 App::patch('/v1/vcs/github/installations/:installationId/repositories/:repositoryId')
-    ->desc('Authorize external deployment')
+    ->desc('Update external deployment (authorize)')
    ->groups(['api', 'vcs'])
    ->label('scope', 'vcs.write')
    ->label('sdk', new Method(
        namespace: 'vcs',
+        group: 'repositories',
        name: 'updateExternalDeployments',
        description: '/docs/references/vcs/update-external-deployments.md',
        auth: [AuthType::ADMIN],
@@ -1491,7 +1505,7 @@ App::patch('/v1/vcs/github/installations/:installationId/repositories/:repositor
        }

        $repository = Authorization::skip(fn () => $dbForPlatform->getDocument('repositories', $repositoryId, [
-            Query::equal('projectInternalId', [$project->getInternalId()])
+            Query::equal('projectInternalId', [$project->getSequence()])
        ]));

        if ($repository->isEmpty()) {
@@ -79,11 +79,18 @@ function router(App $utopia, Database $dbForPlatform, callable $getProjectDB, Sw
    $url = (System::getEnv('_APP_OPTIONS_FORCE_HTTPS') == 'disabled' ? 'http' : 'https') . '://' . System::getEnv('_APP_DOMAIN', '');

    if ($rule->isEmpty()) {
-        if ($host === System::getEnv('_APP_DOMAIN_FUNCTIONS', '') || $host === System::getEnv('_APP_DOMAIN_SITES', '')) {
+        $appDomainFunctionsFallback = System::getEnv('_APP_DOMAIN_FUNCTIONS_FALLBACK', '');
+        $appDomainFunctions = System::getEnv('_APP_DOMAIN_FUNCTIONS', '');
+        $appDomainSites = System::getEnv('_APP_DOMAIN_SITES', '');
+        if (!empty($appDomainFunctionsFallback) && \str_ends_with($host, $appDomainFunctionsFallback)) {
+            $appDomainFunctions = $appDomainFunctionsFallback;
+        }
+
+        if ($host === $appDomainFunctions || $host === $appDomainSites) {
            throw new AppwriteException(AppwriteException::GENERAL_ACCESS_FORBIDDEN, 'This domain cannot be used for security reasons. Please use any subdomain instead.', view: $errorView);
        }

-        if (\str_ends_with($host, System::getEnv('_APP_DOMAIN_FUNCTIONS', '')) || \str_ends_with($host, System::getEnv('_APP_DOMAIN_SITES', ''))) {
+        if (\str_ends_with($host, $appDomainFunctions) || \str_ends_with($host, $appDomainSites)) {
            $exception = new AppwriteException(AppwriteException::RULE_NOT_FOUND, 'This domain is not connected to any Appwrite resources. Visit domains tab under function/site settings to configure it.', view: $errorView);

            $exception->addCTA('Start with this domain', $url . '/console');
@@ -142,7 +149,31 @@ function router(App $utopia, Database $dbForPlatform, callable $getProjectDB, Sw
        $dbForProject = $getProjectDB($project);

        /** @var Document $deployment */
-        $deployment = Authorization::skip(fn () => $dbForProject->getDocument('deployments', $rule->getAttribute('deploymentId')));
+        if (!empty($rule->getAttribute('deploymentId', ''))) {
+            $deployment = Authorization::skip(fn () => $dbForProject->getDocument('deployments', $rule->getAttribute('deploymentId')));
+        } else {
+            // 1.6.x DB schema compatibility
+            // TODO: Make sure deploymentId is never empty, and remove this code
+
+            // Check if site or function; should never be site, but better safe than sorry
+            // Attempts to use attribute from both schemas (1.6 and 1.7)
+            $resourceType = $rule->getAttribute('deploymentResourceType', $rule->getAttribute('resourceType', ''));
+
+            // ID of site or function
+            $resourceId = $rule->getAttribute('deploymentResourceId', '');
+
+            // Document of site or function
+            $resource = $resourceType === 'function' ?
+                Authorization::skip(fn () => $dbForProject->getDocument('functions', $resourceId)) :
+                Authorization::skip(fn () => $dbForProject->getDocument('sites', $resourceId));
+
+            // ID of active deployments
+            // Attempts to use attribute from both schemas (1.6 and 1.7)
+            $activeDeploymentId = $resource->getAttribute('deploymentId', $resource->getAttribute('deployment', ''));
+
+            // Get deployment document, as intended originally
+            $deployment = Authorization::skip(fn () => $dbForProject->getDocument('deployments', $activeDeploymentId));
+        }

        if ($deployment->getAttribute('resourceType', '') === 'functions') {
            $type = 'function';
@@ -360,9 +391,9 @@ function router(App $utopia, Database $dbForPlatform, callable $getProjectDB, Sw
        $execution = new Document([
            '$id' => $executionId,
            '$permissions' => [],
-            'resourceInternalId' => $resource->getInternalId(),
+            'resourceInternalId' => $resource->getSequence(),
            'resourceId' => $resource->getId(),
-            'deploymentInternalId' => $deployment->getInternalId(),
+            'deploymentInternalId' => $deployment->getSequence(),
            'deploymentId' => $deployment->getId(),
            'responseStatusCode' => 0,
            'responseHeaders' => [],
@@ -421,16 +452,33 @@ function router(App $utopia, Database $dbForPlatform, callable $getProjectDB, Sw
        $endpoint = $protocol . '://' . $hostname . "/v1";

        // Appwrite vars
+        if ($type === 'function') {
+            $vars = \array_merge($vars, [
+                'APPWRITE_FUNCTION_API_ENDPOINT' => $endpoint,
+                'APPWRITE_FUNCTION_ID' => $resource->getId(),
+                'APPWRITE_FUNCTION_NAME' => $resource->getAttribute('name'),
+                'APPWRITE_FUNCTION_DEPLOYMENT' => $deployment->getId(),
+                'APPWRITE_FUNCTION_PROJECT_ID' => $project->getId(),
+                'APPWRITE_FUNCTION_RUNTIME_NAME' => $runtime['name'] ?? '',
+                'APPWRITE_FUNCTION_RUNTIME_VERSION' => $runtime['version'] ?? '',
+                'APPWRITE_FUNCTION_CPUS' => $spec['cpus'] ?? APP_COMPUTE_CPUS_DEFAULT,
+                'APPWRITE_FUNCTION_MEMORY' => $spec['memory'] ?? APP_COMPUTE_MEMORY_DEFAULT,
+            ]);
+        } elseif ($type === 'site') {
+            $vars = \array_merge($vars, [
+                'APPWRITE_SITE_API_ENDPOINT' => $endpoint,
+                'APPWRITE_SITE_ID' => $resource->getId(),
+                'APPWRITE_SITE_NAME' => $resource->getAttribute('name'),
+                'APPWRITE_SITE_DEPLOYMENT' => $deployment->getId(),
+                'APPWRITE_SITE_PROJECT_ID' => $project->getId(),
+                'APPWRITE_SITE_RUNTIME_NAME' => $runtime['name'] ?? '',
+                'APPWRITE_SITE_RUNTIME_VERSION' => $runtime['version'] ?? '',
+                'APPWRITE_SITE_CPUS' => $spec['cpus'] ?? APP_COMPUTE_CPUS_DEFAULT,
+                'APPWRITE_SITE_MEMORY' => $spec['memory'] ?? APP_COMPUTE_MEMORY_DEFAULT,
+            ]);
+        }
+
        $vars = \array_merge($vars, [
-            'APPWRITE_FUNCTION_API_ENDPOINT' => $endpoint,
-            'APPWRITE_FUNCTION_ID' => $resource->getId(),
-            'APPWRITE_FUNCTION_NAME' => $resource->getAttribute('name'),
-            'APPWRITE_FUNCTION_DEPLOYMENT' => $deployment->getId(),
-            'APPWRITE_FUNCTION_PROJECT_ID' => $project->getId(),
-            'APPWRITE_FUNCTION_RUNTIME_NAME' => $runtime['name'] ?? '',
-            'APPWRITE_FUNCTION_RUNTIME_VERSION' => $runtime['version'] ?? '',
-            'APPWRITE_FUNCTION_CPUS' => $spec['cpus'] ?? APP_COMPUTE_CPUS_DEFAULT,
-            'APPWRITE_FUNCTION_MEMORY' => $spec['memory'] ?? APP_COMPUTE_MEMORY_DEFAULT,
            'APPWRITE_VERSION' => APP_VERSION_STABLE,
            'APPWRITE_REGION' => $project->getAttribute('region'),
            'APPWRITE_DEPLOYMENT_TYPE' => $deployment->getAttribute('type', ''),
@@ -644,11 +692,11 @@ function router(App $utopia, Database $dbForPlatform, callable $getProjectDB, Sw
        }

        $metricTypeExecutions = str_replace(['{resourceType}'], [$deployment->getAttribute('resourceType')], METRIC_RESOURCE_TYPE_EXECUTIONS);
-        $metricTypeIdExecutions = str_replace(['{resourceType}', '{resourceInternalId}'], [$deployment->getAttribute('resourceType'), $resource->getInternalId()], METRIC_RESOURCE_TYPE_ID_EXECUTIONS);
+        $metricTypeIdExecutions = str_replace(['{resourceType}', '{resourceInternalId}'], [$deployment->getAttribute('resourceType'), $resource->getSequence()], METRIC_RESOURCE_TYPE_ID_EXECUTIONS);
        $metricTypeExecutionsCompute = str_replace(['{resourceType}'], [$deployment->getAttribute('resourceType')], METRIC_RESOURCE_TYPE_EXECUTIONS_COMPUTE);
-        $metricTypeIdExecutionsCompute = str_replace(['{resourceType}', '{resourceInternalId}'], [$deployment->getAttribute('resourceType'), $resource->getInternalId()], METRIC_RESOURCE_TYPE_ID_EXECUTIONS_COMPUTE);
+        $metricTypeIdExecutionsCompute = str_replace(['{resourceType}', '{resourceInternalId}'], [$deployment->getAttribute('resourceType'), $resource->getSequence()], METRIC_RESOURCE_TYPE_ID_EXECUTIONS_COMPUTE);
        $metricTypeExecutionsMbSeconds = str_replace(['{resourceType}'], [$deployment->getAttribute('resourceType')], METRIC_RESOURCE_TYPE_EXECUTIONS_MB_SECONDS);
-        $metricTypeIdExecutionsMBSeconds = str_replace(['{resourceType}', '{resourceInternalId}'], [$deployment->getAttribute('resourceType'), $resource->getInternalId()], METRIC_RESOURCE_TYPE_ID_EXECUTIONS_MB_SECONDS);
+        $metricTypeIdExecutionsMBSeconds = str_replace(['{resourceType}', '{resourceInternalId}'], [$deployment->getAttribute('resourceType'), $resource->getSequence()], METRIC_RESOURCE_TYPE_ID_EXECUTIONS_MB_SECONDS);
        if ($deployment->getAttribute('resourceType') === 'sites') {
            $queueForStatsUsage
                ->disableMetric(METRIC_NETWORK_REQUESTS)
@@ -671,9 +719,9 @@ function router(App $utopia, Database $dbForPlatform, callable $getProjectDB, Sw
                ->addMetric(METRIC_SITES_REQUESTS, 1)
                ->addMetric(METRIC_SITES_INBOUND, $request->getSize() + $fileSize)
                ->addMetric(METRIC_SITES_OUTBOUND, $response->getSize())
-                ->addMetric(str_replace('{siteInternalId}', $resource->getInternalId(), METRIC_SITES_ID_REQUESTS), 1)
-                ->addMetric(str_replace('{siteInternalId}', $resource->getInternalId(), METRIC_SITES_ID_INBOUND), $request->getSize() + $fileSize)
-                ->addMetric(str_replace('{siteInternalId}', $resource->getInternalId(), METRIC_SITES_ID_OUTBOUND), $response->getSize())
+                ->addMetric(str_replace('{siteInternalId}', $resource->getSequence(), METRIC_SITES_ID_REQUESTS), 1)
+                ->addMetric(str_replace('{siteInternalId}', $resource->getSequence(), METRIC_SITES_ID_INBOUND), $request->getSize() + $fileSize)
+                ->addMetric(str_replace('{siteInternalId}', $resource->getSequence(), METRIC_SITES_ID_OUTBOUND), $response->getSize())
            ;
        }

@@ -843,8 +891,17 @@ App::init()
                    }

                    $owner = '';
+                    $functionsDomainFallback = System::getEnv('_APP_DOMAIN_FUNCTIONS_FALLBACK', '');
                    $functionsDomain = System::getEnv('_APP_DOMAIN_FUNCTIONS', '');
-                    if (!empty($functionsDomain) && \str_ends_with($domain->get(), $functionsDomain)) {
+                    $siteDomain = System::getEnv('_APP_DOMAIN_SITES', '');
+                    if (!empty($functionsDomainFallback) && \str_ends_with($host, $functionsDomainFallback)) {
+                        $functionsDomain = $functionsDomainFallback;
+                    }
+
+                    if (
+                        (!empty($functionsDomain) && \str_ends_with($domain->get(), $functionsDomain)) ||
+                        (!empty($siteDomain) && \str_ends_with($domain->get(), $siteDomain))
+                    ) {
                        $owner = 'Appwrite';
                    }

@@ -857,7 +914,7 @@ App::init()
                            'type' => 'api',
                            'status' => 'verifying',
                            'projectId' => $console->getId(),
-                            'projectInternalId' => $console->getInternalId(),
+                            'projectInternalId' => $console->getSequence(),
                            'search' => implode(' ', [$ruleId, $domain->get()]),
                            'owner' => $owner,
                            'region' => $console->getAttribute('region')
@@ -907,7 +964,7 @@ App::init()
                )[0] ?? new Document();
            }

-            if (!$rule->isEmpty() && $rule->getAttribute('projectInternalId') === $project->getInternalId()) {
+            if (!$rule->isEmpty() && $rule->getAttribute('projectInternalId') === $project->getSequence()) {
                $refDomainOrigin = $origin;
            }
        }
@@ -990,7 +1047,7 @@ App::init()
            ->addHeader('Server', 'Appwrite')
            ->addHeader('X-Content-Type-Options', 'nosniff')
            ->addHeader('Access-Control-Allow-Methods', 'GET, POST, PUT, PATCH, DELETE')
-            ->addHeader('Access-Control-Allow-Headers', 'Origin, Cookie, Set-Cookie, X-Requested-With, Content-Type, Access-Control-Allow-Origin, Access-Control-Request-Headers, Accept, X-Appwrite-Project, X-Appwrite-Key, X-Appwrite-Locale, X-Appwrite-Mode, X-Appwrite-JWT, X-Appwrite-Response-Format, X-Appwrite-Timeout, X-SDK-Version, X-SDK-Name, X-SDK-Language, X-SDK-Platform, X-SDK-GraphQL, X-Appwrite-ID, X-Appwrite-Timestamp, Content-Range, Range, Cache-Control, Expires, Pragma, X-Forwarded-For, X-Forwarded-User-Agent')
+            ->addHeader('Access-Control-Allow-Headers', 'Origin, Cookie, Set-Cookie, X-Requested-With, Content-Type, Access-Control-Allow-Origin, Access-Control-Request-Headers, Accept, X-Appwrite-Project, X-Appwrite-Key, X-Appwrite-Dev-Key, X-Appwrite-Locale, X-Appwrite-Mode, X-Appwrite-JWT, X-Appwrite-Response-Format, X-Appwrite-Timeout, X-SDK-Version, X-SDK-Name, X-SDK-Language, X-SDK-Platform, X-SDK-GraphQL, X-Appwrite-ID, X-Appwrite-Timestamp, Content-Range, Range, Cache-Control, Expires, Pragma, X-Forwarded-For, X-Forwarded-User-Agent')
            ->addHeader('Access-Control-Expose-Headers', 'X-Appwrite-Session, X-Fallback-Cookies')
            ->addHeader('Access-Control-Allow-Origin', $refDomain)
            ->addHeader('Access-Control-Allow-Credentials', 'true');
@@ -1053,7 +1110,7 @@ App::options()
        $response
            ->addHeader('Server', 'Appwrite')
            ->addHeader('Access-Control-Allow-Methods', 'GET, POST, PUT, PATCH, DELETE')
-            ->addHeader('Access-Control-Allow-Headers', 'Origin, Cookie, Set-Cookie, X-Requested-With, Content-Type, Access-Control-Allow-Origin, Access-Control-Request-Headers, Accept, X-Appwrite-Project, X-Appwrite-Key, X-Appwrite-Locale, X-Appwrite-Mode, X-Appwrite-JWT, X-Appwrite-Response-Format, X-Appwrite-Timeout, X-SDK-Version, X-SDK-Name, X-SDK-Language, X-SDK-Platform, X-SDK-GraphQL, X-Appwrite-ID, X-Appwrite-Timestamp, Content-Range, Range, Cache-Control, Expires, Pragma, X-Appwrite-Session, X-Fallback-Cookies, X-Forwarded-For, X-Forwarded-User-Agent')
+            ->addHeader('Access-Control-Allow-Headers', 'Origin, Cookie, Set-Cookie, X-Requested-With, Content-Type, Access-Control-Allow-Origin, Access-Control-Request-Headers, Accept, X-Appwrite-Project, X-Appwrite-Key, X-Appwrite-Dev-Key, X-Appwrite-Locale, X-Appwrite-Mode, X-Appwrite-JWT, X-Appwrite-Response-Format, X-Appwrite-Timeout, X-SDK-Version, X-SDK-Name, X-SDK-Language, X-SDK-Platform, X-SDK-GraphQL, X-Appwrite-ID, X-Appwrite-Timestamp, Content-Range, Range, Cache-Control, Expires, Pragma, X-Appwrite-Session, X-Fallback-Cookies, X-Forwarded-For, X-Forwarded-User-Agent')
            ->addHeader('Access-Control-Expose-Headers', 'X-Appwrite-Session, X-Fallback-Cookies')
            ->addHeader('Access-Control-Allow-Origin', $origin)
            ->addHeader('Access-Control-Allow-Credentials', 'true')
@@ -1120,35 +1177,11 @@ App::error()
                        break;
                }
                break;
-            case 'Utopia\Database\Exception\Conflict':
-                $error = new AppwriteException(AppwriteException::DOCUMENT_UPDATE_CONFLICT, previous: $error);
-                break;
-            case 'Utopia\Database\Exception\Timeout':
-                $error = new AppwriteException(AppwriteException::DATABASE_TIMEOUT, previous: $error);
-                break;
-            case 'Utopia\Database\Exception\Query':
-                $error = new AppwriteException(AppwriteException::GENERAL_QUERY_INVALID, $error->getMessage(), previous: $error);
-                break;
-            case 'Utopia\Database\Exception\Structure':
-                $error = new AppwriteException(AppwriteException::DOCUMENT_INVALID_STRUCTURE, $error->getMessage(), previous: $error);
-                break;
-            case 'Utopia\Database\Exception\Duplicate':
-                $error = new AppwriteException(AppwriteException::DOCUMENT_ALREADY_EXISTS);
-                break;
-            case 'Utopia\Database\Exception\Restricted':
-                $error = new AppwriteException(AppwriteException::DOCUMENT_DELETE_RESTRICTED);
-                break;
            case 'Utopia\Database\Exception\Authorization':
                $error = new AppwriteException(AppwriteException::USER_UNAUTHORIZED);
                break;
-            case 'Utopia\Database\Exception\Relationship':
-                $error = new AppwriteException(AppwriteException::RELATIONSHIP_VALUE_INVALID, $error->getMessage(), previous: $error);
-                break;
-            case 'Utopia\Database\Exception\NotFound':
-                $error = new AppwriteException(AppwriteException::COLLECTION_NOT_FOUND, $error->getMessage(), previous: $error);
-                break;
-            case 'Utopia\Database\Exception\Dependency':
-                $error = new AppwriteException(AppwriteException::INDEX_DEPENDENCY, null, previous: $error);
+            case 'Utopia\Database\Exception\Timeout':
+                $error = new AppwriteException(AppwriteException::DATABASE_TIMEOUT, previous: $error);
                break;
        }

@@ -1474,6 +1507,7 @@ App::get('/v1/ping')
    ->label('event', 'projects.[projectId].ping')
    ->label('sdk', new Method(
        namespace: 'ping',
+        group: null,
        name: 'get',
        hide: true,
        description: <<<EOT
@@ -185,7 +185,7 @@ App::post('/v1/mock/api-key-unprefixed')
                Permission::update(Role::any()),
                Permission::delete(Role::any()),
            ],
-            'projectInternalId' => $project->getInternalId(),
+            'projectInternalId' => $project->getSequence(),
            'projectId' => $project->getId(),
            'name' => 'Outdated key',
            'scopes' => $scopes,
@@ -235,7 +235,7 @@ App::get('/v1/mock/github/callback')
            $github->initializeVariables($providerInstallationId, $privateKey, $githubAppId);
            $owner = $github->getOwnerName($providerInstallationId) ?? '';

-            $projectInternalId = $project->getInternalId();
+            $projectInternalId = $project->getSequence();

            $teamId = $project->getAttribute('teamId', '');

@@ -92,8 +92,20 @@ $eventDatabaseListener = function (Document $project, Document $document, Respon

 $usageDatabaseListener = function (string $event, Document $document, StatsUsage $queueForStatsUsage) {
    $value = 1;
-    if ($event === Database::EVENT_DOCUMENT_DELETE) {
-        $value = -1;
+
+    switch ($event) {
+        case Database::EVENT_DOCUMENT_DELETE:
+            $value = -1;
+            break;
+        case Database::EVENT_DOCUMENTS_DELETE:
+            $value = -1 * $document->getAttribute('modified', 0);
+            break;
+        case Database::EVENT_DOCUMENTS_CREATE:
+            $value = $document->getAttribute('modified', 0);
+            break;
+        case Database::EVENT_DOCUMENTS_UPSERT:
+            $value = $document->getAttribute('created', 0);
+            break;
    }

    switch (true) {
@@ -249,34 +261,36 @@ App::init()
                    subject: 'keys'
                );

-                if ($dbKey) {
-                    $accessedAt = $dbKey->getAttribute('accessedAt', 0);
+                if (!$dbKey) {
+                    throw new Exception(Exception::USER_UNAUTHORIZED);
+                }

-                    if (DateTime::formatTz(DateTime::addSeconds(new \DateTime(), -APP_KEY_ACCESS)) > $accessedAt) {
-                        $dbKey->setAttribute('accessedAt', DateTime::now());
+                $accessedAt = $dbKey->getAttribute('accessedAt', 0);
+
+                if (DateTime::formatTz(DateTime::addSeconds(new \DateTime(), -APP_KEY_ACCESS)) > $accessedAt) {
+                    $dbKey->setAttribute('accessedAt', DateTime::now());
+                    $dbForPlatform->updateDocument('keys', $dbKey->getId(), $dbKey);
+                    $dbForPlatform->purgeCachedDocument('projects', $project->getId());
+                }
+
+                $sdkValidator = new WhiteList($servers, true);
+                $sdk = $request->getHeader('x-sdk-name', 'UNKNOWN');
+
+                if ($sdk !== 'UNKNOWN' && $sdkValidator->isValid($sdk)) {
+                    $sdks = $dbKey->getAttribute('sdks', []);
+
+                    if (!in_array($sdk, $sdks)) {
+                        $sdks[] = $sdk;
+                        $dbKey->setAttribute('sdks', $sdks);
+
+                        /** Update access time as well */
+                        $dbKey->setAttribute('accessedAt', Datetime::now());
                        $dbForPlatform->updateDocument('keys', $dbKey->getId(), $dbKey);
                        $dbForPlatform->purgeCachedDocument('projects', $project->getId());
                    }
-
-                    $sdkValidator = new WhiteList($servers, true);
-                    $sdk = $request->getHeader('x-sdk-name', 'UNKNOWN');
-
-                    if ($sdk !== 'UNKNOWN' && $sdkValidator->isValid($sdk)) {
-                        $sdks = $dbKey->getAttribute('sdks', []);
-
-                        if (!in_array($sdk, $sdks)) {
-                            $sdks[] = $sdk;
-                            $dbKey->setAttribute('sdks', $sdks);
-
-                            /** Update access time as well */
-                            $dbKey->setAttribute('accessedAt', Datetime::now());
-                            $dbForPlatform->updateDocument('keys', $dbKey->getId(), $dbKey);
-                            $dbForPlatform->purgeCachedDocument('projects', $project->getId());
-                        }
-                    }
-
-                    $queueForAudits->setUser($user);
                }
+
+                $queueForAudits->setUser($user);
            }
        } // Admin User Authentication
        elseif (($project->getId() === 'console' && !$team->isEmpty() && !$user->isEmpty()) || ($project->getId() !== 'console' && !$user->isEmpty() && $mode === APP_MODE_ADMIN)) {
@@ -337,6 +351,8 @@ App::init()
         */
        $method = $route->getLabel('sdk', false);

+        // Take the first method if there's more than one,
+        // namespace can not differ between methods on the same route
        if (\is_array($method)) {
            $method = $method[0];
        }
@@ -523,6 +539,9 @@ App::init()
        $dbForProject
            ->on(Database::EVENT_DOCUMENT_CREATE, 'calculate-usage', fn ($event, $document) => $usageDatabaseListener($event, $document, $queueForStatsUsage))
            ->on(Database::EVENT_DOCUMENT_DELETE, 'calculate-usage', fn ($event, $document) => $usageDatabaseListener($event, $document, $queueForStatsUsage))
+            ->on(Database::EVENT_DOCUMENTS_CREATE, 'calculate-usage', fn ($event, $document) => $usageDatabaseListener($event, $document, $queueForStatsUsage))
+            ->on(Database::EVENT_DOCUMENTS_DELETE, 'calculate-usage', fn ($event, $document) => $usageDatabaseListener($event, $document, $queueForStatsUsage))
+            ->on(Database::EVENT_DOCUMENTS_UPSERT, 'calculate-usage', fn ($event, $document) => $usageDatabaseListener($event, $document, $queueForStatsUsage))
            ->on(Database::EVENT_DOCUMENT_CREATE, 'create-trigger-events', fn ($event, $document) => $eventDatabaseListener(
                $project,
                $document,
@@ -539,7 +558,7 @@ App::init()
            $isImageTransformation = $route->getPath() === '/v1/storage/buckets/:bucketId/files/:fileId/preview';
            $isDisabled = isset($plan['imageTransformations']) && $plan['imageTransformations'] === -1 && !Auth::isPrivilegedUser(Authorization::getRoles());

-            $key = md5($request->getURI() . '*' . implode('*', $request->getParams()) . '*' . APP_CACHE_BUSTER);
+            $key = $request->cacheIdentifier();
            $cacheLog  = Authorization::skip(fn () => $dbForProject->getDocument('cache', $key));
            $cache = new Cache(
                new Filesystem(APP_STORAGE_CACHE . DIRECTORY_SEPARATOR . 'app-' . $project->getId())
@@ -548,14 +567,14 @@ App::init()
            $data = $cache->load($key, $timestamp);

            if (!empty($data) && !$cacheLog->isEmpty()) {
-                $parts = explode('/', $cacheLog->getAttribute('resourceType'));
+                $parts = explode('/', $cacheLog->getAttribute('resourceType', ''));
                $type = $parts[0] ?? null;

                if ($type === 'bucket' && (!$isImageTransformation || !$isDisabled)) {
                    $bucketId = $parts[1] ?? null;
                    $bucket = Authorization::skip(fn () => $dbForProject->getDocument('buckets', $bucketId));

-                    $isToken = !$resourceToken->isEmpty() && $resourceToken->getAttribute('bucketInternalId') === $bucket->getInternalId();
+                    $isToken = !$resourceToken->isEmpty() && $resourceToken->getAttribute('bucketInternalId') === $bucket->getSequence();
                    $isAPIKey = Auth::isAppUser(Authorization::getRoles());
                    $isPrivilegedUser = Auth::isPrivilegedUser(Authorization::getRoles());

@@ -574,12 +593,12 @@ App::init()
                    $fileId = $parts[1] ?? null;

                    if ($fileSecurity && !$valid && !$isToken) {
-                        $file = $dbForProject->getDocument('bucket_' . $bucket->getInternalId(), $fileId);
+                        $file = $dbForProject->getDocument('bucket_' . $bucket->getSequence(), $fileId);
                    } else {
-                        $file = Authorization::skip(fn () => $dbForProject->getDocument('bucket_' . $bucket->getInternalId(), $fileId));
+                        $file = Authorization::skip(fn () => $dbForProject->getDocument('bucket_' . $bucket->getSequence(), $fileId));
                    }

-                    if (!$resourceToken->isEmpty() && $resourceToken->getAttribute('fileInternalId') !== $file->getInternalId()) {
+                    if (!$resourceToken->isEmpty() && $resourceToken->getAttribute('fileInternalId') !== $file->getSequence()) {
                        throw new Exception(Exception::USER_UNAUTHORIZED);
                    }

@@ -805,7 +824,7 @@ App::shutdown()
                    $resourceType = $parseLabel($pattern, $responsePayload, $requestParams, $user);
                }

-                $key = md5($request->getURI() . '*' . implode('*', $request->getParams()) . '*' . APP_CACHE_BUSTER);
+                $key = $request->cacheIdentifier();
                $signature = md5($data['payload']);
                $cacheLog  =  Authorization::skip(fn () => $dbForProject->getDocument('cache', $key));
                $accessedAt = $cacheLog->getAttribute('accessedAt', 0);
@@ -15,9 +15,11 @@ use Utopia\Audit\Audit;
 use Utopia\CLI\Console;
 use Utopia\Compression\Compression;
 use Utopia\Config\Config;
+use Utopia\Database\Adapter\Pool as DatabasePool;
 use Utopia\Database\Database;
 use Utopia\Database\DateTime;
 use Utopia\Database\Document;
+use Utopia\Database\Exception\Duplicate as DuplicateException;
 use Utopia\Database\Helpers\ID;
 use Utopia\Database\Helpers\Permission;
 use Utopia\Database\Helpers\Role;
@@ -46,29 +48,6 @@ $http = new Server(
 $payloadSize = 12 * (1024 * 1024); // 12MB - adding slight buffer for headers and other data that might be sent with the payload - update later with valid testing
 $totalWorkers = intval(System::getEnv('_APP_CPU_NUM', swoole_cpu_num())) * intval(System::getEnv('_APP_WORKER_PER_CORE', 6));

-$http
-    ->set([
-        'worker_num' => $totalWorkers,
-        'dispatch_func' => 'dispatch',
-        'open_http2_protocol' => true,
-        'http_compression' => false,
-        'package_max_length' => $payloadSize,
-        'buffer_output_size' => $payloadSize,
-        'task_worker_num' => 1, // required for the task to fetch domains background
-    ]);
-
-$http->on(Constant::EVENT_WORKER_START, function ($server, $workerId) {
-    Console::success('Worker ' . ++$workerId . ' started successfully');
-});
-
-$http->on(Constant::EVENT_BEFORE_RELOAD, function ($server, $workerId) {
-    Console::success('Starting reload...');
-});
-
-$http->on(Constant::EVENT_AFTER_RELOAD, function ($server, $workerId) {
-    Console::success('Reload completed...');
-});
-
 /**
 * Assigns HTTP requests to worker threads by analyzing its payload/content.
 *
@@ -86,76 +65,105 @@ $http->on(Constant::EVENT_AFTER_RELOAD, function ($server, $workerId) {
 */
 function dispatch(Server $server, int $fd, int $type, $data = null): int
 {
-    global $totalWorkers, $domains;
+    $resolveWorkerId = function (Server $server, $data = null) {
+        global $totalWorkers, $domains;

-    // If data is not set we can send request to any worker
-    // first we try to pick idle worker, if not we randomly pick a worker
-    if ($data === null) {
+        // If data is not set we can send request to any worker
+        // first we try to pick idle worker, if not we randomly pick a worker
+        if ($data === null) {
+            for ($i = 0; $i < $totalWorkers; $i++) {
+                if ($server->getWorkerStatus($i) === SWOOLE_WORKER_IDLE) {
+                    return $i;
+                }
+            }
+            return rand(0, $totalWorkers - 1);
+        }
+
+        $riskyWorkersPercent = intval(System::getEnv('_APP_RISKY_WORKERS_PERCENT', 80)) / 100; // Decimal form 0 to 1
+
+        // Each worker has numeric ID, starting from 0 and incrementing
+        // From 0 to riskyWorkers, we consider safe workers
+        // From riskyWorkers to totalWorkers, we consider risky workers
+        $riskyWorkers = (int)floor($totalWorkers * $riskyWorkersPercent); // Absolute amount of risky workers
+
+        $domain = '';
+        // max up to 3 as first line has request details and second line has host
+        $lines = explode("\n", $data, 3);
+        $request = $lines[0];
+        if (count($lines) > 1) {
+            $domain = trim(explode('Host: ', $lines[1])[1]);
+        }
+
+        // Sync executions are considered risky
+        $risky = false;
+        if (str_starts_with($request, 'POST') && str_contains($request, '/executions')) {
+            $risky = true;
+        } elseif (str_ends_with($domain, System::getEnv('_APP_DOMAIN_FUNCTIONS'))) {
+            $risky = true;
+        } elseif ($domains->get(md5($domain), 'value') === 1) {
+            // executions request coming from custom domain
+            $risky = true;
+        }
+
+        if ($risky) {
+            // If risky request, only consider risky workers
+            for ($j = $riskyWorkers; $j < $totalWorkers; $j++) {
+                /** Reference https://openswoole.com/docs/modules/swoole-server-getWorkerStatus#description */
+                if ($server->getWorkerStatus($j) === SWOOLE_WORKER_IDLE) {
+                    // If idle worker found, give to him
+                    return $j;
+                }
+            }
+
+            // If no idle workers, give to random risky worker
+            $worker = rand($riskyWorkers, $totalWorkers - 1);
+            Console::warning("swoole_dispatch: Risky branch: did not find a idle worker, picking random worker {$worker}");
+            return $worker;
+        }
+
+        // If safe request, give to any idle worker
+        // Its fine to pick risky worker here, because it's idle. Idle is never actually risky
        for ($i = 0; $i < $totalWorkers; $i++) {
            if ($server->getWorkerStatus($i) === SWOOLE_WORKER_IDLE) {
                return $i;
            }
        }
-        return rand(0, $totalWorkers - 1);
-    }

-    $riskyWorkersPercent = intval(System::getEnv('_APP_RISKY_WORKERS_PERCENT', 80)) / 100; // Decimal form 0 to 1
-
-    // Each worker has numeric ID, starting from 0 and incrementing
-    // From 0 to riskyWorkers, we consider safe workers
-    // From riskyWorkers to totalWorkers, we consider risky workers
-    $riskyWorkers = (int) floor($totalWorkers * $riskyWorkersPercent); // Absolute amount of risky workers
-
-    $domain = '';
-    // max up to 3 as first line has request details and second line has host
-    $lines = explode("\n", $data, 3);
-    $request = $lines[0];
-    if (count($lines) > 1) {
-        $domain = trim(explode('Host: ', $lines[1])[1]);
-    }
-
-    // Sync executions are considered risky
-    $risky = false;
-    if (str_starts_with($request, 'POST') && str_contains($request, '/executions')) {
-        $risky = true;
-    } elseif (str_ends_with($domain, System::getEnv('_APP_DOMAIN_FUNCTIONS'))) {
-        $risky = true;
-    } elseif ($domains->get(md5($domain), 'value') === 1) {
-        // executions request coming from custom domain
-        $risky = true;
-    }
-
-    if ($risky) {
-        // If risky request, only consider risky workers
-        for ($j = $riskyWorkers; $j < $totalWorkers; $j++) {
-            /** Reference https://openswoole.com/docs/modules/swoole-server-getWorkerStatus#description */
-            if ($server->getWorkerStatus($j) === SWOOLE_WORKER_IDLE) {
-                // If idle worker found, give to him
-                return $j;
-            }
-        }
-
-        // If no idle workers, give to random risky worker
-        $worker = rand($riskyWorkers, $totalWorkers - 1);
-        Console::warning("swoole_dispatch: Risky branch: did not find a idle worker, picking random worker {$worker}");
+        // If no idle worker found, give to random safe worker
+        // We avoid risky workers here, as it could be in work - not idle. Thats exactly when they are risky.
+        $worker = rand(0, $riskyWorkers - 1);
+        Console::warning("swoole_dispatch: Non-risky branch: did not find a idle worker, picking random worker {$worker}");
        return $worker;
-    }
-
-    // If safe request, give to any idle worker
-    // Its fine to pick risky worker here, because it's idle. Idle is never actually risky
-    for ($i = 0; $i < $totalWorkers; $i++) {
-        if ($server->getWorkerStatus($i) === SWOOLE_WORKER_IDLE) {
-            return $i;
-        }
-    }
-
-    // If no idle worker found, give to random safe worker
-    // We avoid risky workers here, as it could be in work - not idle. Thats exactly when they are risky.
-    $worker = rand(0, $riskyWorkers - 1);
-    Console::warning("swoole_dispatch: Non-risky branch: did not find a idle worker, picking random worker {$worker}");
-    return $worker;
+    };
+    $workerId = $resolveWorkerId($server, $data);
+    $server->bind($fd, $workerId);
+    return $workerId;
 }

+
+$http
+    ->set([
+        Constant::OPTION_WORKER_NUM => $totalWorkers,
+        Constant::OPTION_DISPATCH_FUNC => dispatch(...),
+        Constant::OPTION_DISPATCH_MODE => SWOOLE_DISPATCH_UIDMOD,
+        Constant::OPTION_HTTP_COMPRESSION => false,
+        Constant::OPTION_PACKAGE_MAX_LENGTH => $payloadSize,
+        Constant::OPTION_OUTPUT_BUFFER_SIZE => $payloadSize,
+        Constant::OPTION_TASK_WORKER_NUM => 1, // required for the task to fetch domains background
+    ]);
+
+$http->on(Constant::EVENT_WORKER_START, function ($server, $workerId) {
+    Console::success('Worker ' . ++$workerId . ' started successfully');
+});
+
+$http->on(Constant::EVENT_BEFORE_RELOAD, function ($server, $workerId) {
+    Console::success('Starting reload...');
+});
+
+$http->on(Constant::EVENT_AFTER_RELOAD, function ($server, $workerId) {
+    Console::success('Reload completed...');
+});
+
 include __DIR__ . '/controllers/general.php';

 function createDatabase(App $app, string $resourceKey, string $dbName, array $collections, mixed $pools, callable $extraSetup = null): void
@@ -164,7 +172,7 @@ function createDatabase(App $app, string $resourceKey, string $dbName, array $co
    $sleep = 1;
    $attempts = 0;

-    do {
+    while (true) {
        try {
            $attempts++;
            $resource = $app->getResource($resourceKey);
@@ -173,13 +181,12 @@ function createDatabase(App $app, string $resourceKey, string $dbName, array $co
            break; // exit loop on success
        } catch (\Exception $e) {
            Console::warning("  └── Database not ready. Retrying connection ({$attempts})...");
-            $pools->reclaim();
            if ($attempts >= $max) {
                throw new \Exception('  └── Failed to connect to database: ' . $e->getMessage());
            }
            sleep($sleep);
        }
-    } while ($attempts < $max);
+    }

    Console::success("[Setup] - $dbName database init started...");

@@ -302,7 +309,7 @@ $http->on(Constant::EVENT_START, function (Server $http) use ($payloadSize, $reg
                    'orders' => $index['orders'],
                ]), $files['indexes']);

-                $dbForPlatform->createCollection('bucket_' . $bucket->getInternalId(), $attributes, $indexes);
+                $dbForPlatform->createCollection('bucket_' . $bucket->getSequence(), $attributes, $indexes);
            }

            if (Authorization::skip(fn () => $dbForPlatform->getDocument('buckets', 'screenshots')->isEmpty())) {
@@ -311,7 +318,7 @@ $http->on(Constant::EVENT_START, function (Server $http) use ($payloadSize, $reg
                    '$id' => ID::custom('screenshots'),
                    '$collection' => ID::custom('buckets'),
                    'name' => 'Screenshots',
-                    'maximumFileSize' => 5000000, // ~5MB
+                    'maximumFileSize' => 20000000, // ~20MB
                    'allowedFileExtensions' => [ 'png' ],
                    'enabled' => true,
                    'compression' => Compression::GZIP,
@@ -350,7 +357,7 @@ $http->on(Constant::EVENT_START, function (Server $http) use ($payloadSize, $reg
                    'orders' => $index['orders'],
                ]), $files['indexes']);

-                Authorization::skip(fn () => $dbForPlatform->createCollection('bucket_' . $bucket->getInternalId(), $attributes, $indexes));
+                Authorization::skip(fn () => $dbForPlatform->createCollection('bucket_' . $bucket->getSequence(), $attributes, $indexes));
            }
        });

@@ -362,11 +369,7 @@ $http->on(Constant::EVENT_START, function (Server $http) use ($payloadSize, $reg
        $cache = $app->getResource('cache');

        foreach ($sharedTablesV2 as $hostname) {
-            $adapter = $pools
-                ->get($hostname)
-                ->pop()
-                ->getResource();
-
+            $adapter = new DatabasePool($pools->get($hostname));
            $dbForProject = (new Database($adapter, $cache))
                ->setDatabase('appwrite')
                ->setSharedTables(true)
@@ -376,7 +379,7 @@ $http->on(Constant::EVENT_START, function (Server $http) use ($payloadSize, $reg
            try {
                Console::success('[Setup] - Creating project database: ' . $hostname . '...');
                $dbForProject->create();
-            } catch (Duplicate) {
+            } catch (DuplicateException) {
                Console::success('[Setup] - Skip: metadata table already exists');
            }

@@ -402,7 +405,6 @@ $http->on(Constant::EVENT_START, function (Server $http) use ($payloadSize, $reg
            }
        }

-        $pools->reclaim();
        Console::success('[Setup] - Server database init completed...');
    });

@@ -517,6 +519,7 @@ $http->on(Constant::EVENT_REQUEST, function (SwooleRequest $swooleRequest, Swool
        Console::error('[Error] Message: ' . $th->getMessage());
        Console::error('[Error] File: ' . $th->getFile());
        Console::error('[Error] Line: ' . $th->getLine());
+        Console::error('[Error] Trace: ' . $th->getTraceAsString());

        $swooleResponse->setStatusCode(500);

@@ -534,13 +537,11 @@ $http->on(Constant::EVENT_REQUEST, function (SwooleRequest $swooleRequest, Swool
        ];

        $swooleResponse->end(\json_encode($output));
-    } finally {
-        $pools->reclaim();
    }
 });

 // Fetch domains every `DOMAIN_SYNC_TIMER` seconds and update in the memory
-$http->on('Task', function () use ($register, $domains) {
+$http->on(Constant::EVENT_TASK, function () use ($register, $domains) {
    $lastSyncUpdate = null;
    $pools = $register->get('pools');
    App::setResource('pools', fn () => $pools);
@@ -6,6 +6,10 @@ const APP_NAME = 'Appwrite';
 const APP_DOMAIN = 'appwrite.io';
 const APP_EMAIL_TEAM = 'team@localhost.test'; // Default email address
 const APP_EMAIL_SECURITY = ''; // Default security email address
+const APP_EMAIL_LOGO_URL = 'https://cloud.appwrite.io/images/mails/logo.png';
+const APP_EMAIL_ACCENT_COLOR = '#fd366e';
+const APP_EMAIL_TERMS_URL = 'https://appwrite.io/terms';
+const APP_EMAIL_PRIVACY_URL = 'https://appwrite.io/privacy';
 const APP_USERAGENT = APP_NAME . '-Server v%s. Please report abuse at %s';
 const APP_MODE_DEFAULT = 'default';
 const APP_MODE_ADMIN = 'admin';
@@ -26,13 +30,15 @@ const APP_LIMIT_SUBSCRIBERS_SUBQUERY = 1_000_000;
 const APP_LIMIT_WRITE_RATE_DEFAULT = 60; // Default maximum write rate per rate period
 const APP_LIMIT_WRITE_RATE_PERIOD_DEFAULT = 60; // Default maximum write rate period in seconds
 const APP_LIMIT_LIST_DEFAULT = 25; // Default maximum number of items to return in list API calls
+const APP_LIMIT_DATABASE_BATCH = 100; // Default maximum batch size for database operations
 const APP_KEY_ACCESS = 24 * 60 * 60; // 24 hours
 const APP_USER_ACCESS = 24 * 60 * 60; // 24 hours
 const APP_PROJECT_ACCESS = 24 * 60 * 60; // 24 hours
+const APP_RESOURCE_TOKEN_ACCESS = 24 * 60 * 60; // 24 hours
 const APP_FILE_ACCESS = 24 * 60 * 60; // 24 hours
 const APP_CACHE_UPDATE = 24 * 60 * 60; // 24 hours
-const APP_CACHE_BUSTER = 4318;
-const APP_VERSION_STABLE = '1.7.0';
+const APP_CACHE_BUSTER = 4320;
+const APP_VERSION_STABLE = '1.7.4';
 const APP_DATABASE_ATTRIBUTE_EMAIL = 'email';
 const APP_DATABASE_ATTRIBUTE_ENUM = 'enum';
 const APP_DATABASE_ATTRIBUTE_IP = 'ip';
@@ -45,6 +51,7 @@ const APP_DATABASE_TIMEOUT_MILLISECONDS_API = 15 * 1000; // 15 seconds
 const APP_DATABASE_TIMEOUT_MILLISECONDS_WORKER = 300 * 1000; // 5 minutes
 const APP_DATABASE_TIMEOUT_MILLISECONDS_TASK = 300 * 1000; // 5 minutes
 const APP_DATABASE_QUERY_MAX_VALUES = 500;
+const APP_DATABASE_ENCRYPT_SIZE_MIN = 150;
 const APP_STORAGE_UPLOADS = '/storage/uploads';
 const APP_STORAGE_SITES = '/storage/sites';
 const APP_STORAGE_FUNCTIONS = '/storage/functions';
@@ -60,6 +67,7 @@ const APP_SOCIAL_FACEBOOK = 'https://www.facebook.com/appwrite.io';
 const APP_SOCIAL_LINKEDIN = 'https://www.linkedin.com/company/appwrite';
 const APP_SOCIAL_INSTAGRAM = 'https://www.instagram.com/appwrite.io';
 const APP_SOCIAL_GITHUB = 'https://github.com/appwrite';
+const APP_SOCIAL_GITHUB_APPWRITE = 'https://github.com/appwrite/appwrite';
 const APP_SOCIAL_DISCORD = 'https://appwrite.io/discord';
 const APP_SOCIAL_DISCORD_CHANNEL = '564160730845151244';
 const APP_SOCIAL_DEV = 'https://dev.to/appwrite';
@@ -257,3 +265,10 @@ const RESOURCE_TYPE_PROVIDERS = 'providers';
 const RESOURCE_TYPE_TOPICS = 'topics';
 const RESOURCE_TYPE_SUBSCRIBERS = 'subscribers';
 const RESOURCE_TYPE_MESSAGES = 'messages';
+
+// Resource types for Tokens
+
+const TOKENS_RESOURCE_TYPE_FILES = 'files';
+const TOKENS_RESOURCE_TYPE_SITES = 'sites';
+const TOKENS_RESOURCE_TYPE_FUNCTIONS = 'functions';
+const TOKENS_RESOURCE_TYPE_DATABASES = 'databases';
@@ -71,18 +71,27 @@ Database::addFilter(
    },
    function (mixed $value, Document $document, Database $database) {
        $attributes = $database->find('attributes', [
-            Query::equal('collectionInternalId', [$document->getInternalId()]),
+            Query::equal('collectionInternalId', [$document->getSequence()]),
            Query::equal('databaseInternalId', [$document->getAttribute('databaseInternalId')]),
            Query::limit($database->getLimitForAttributes()),
        ]);

        foreach ($attributes as $attribute) {
-            if ($attribute->getAttribute('type') === Database::VAR_RELATIONSHIP) {
-                $options = $attribute->getAttribute('options');
-                foreach ($options as $key => $value) {
-                    $attribute->setAttribute($key, $value);
-                }
-                $attribute->removeAttribute('options');
+            $attributeType = $attribute->getAttribute('type');
+
+            switch ($attributeType) {
+                case Database::VAR_RELATIONSHIP:
+                    $options = $attribute->getAttribute('options');
+                    foreach ($options as $key => $value) {
+                        $attribute->setAttribute($key, $value);
+                    }
+                    $attribute->removeAttribute('options');
+                    break;
+
+                case Database::VAR_STRING:
+                    $filters = $attribute->getAttribute('filters', []);
+                    $attribute->setAttribute('encrypt', in_array('encrypt', $filters));
+                    break;
            }
        }

@@ -98,7 +107,7 @@ Database::addFilter(
    function (mixed $value, Document $document, Database $database) {
        return $database
            ->find('indexes', [
-                Query::equal('collectionInternalId', [$document->getInternalId()]),
+                Query::equal('collectionInternalId', [$document->getSequence()]),
                Query::equal('databaseInternalId', [$document->getAttribute('databaseInternalId')]),
                Query::limit($database->getLimitForIndexes()),
            ]);
@@ -113,7 +122,7 @@ Database::addFilter(
    function (mixed $value, Document $document, Database $database) {
        return $database
            ->find('platforms', [
-                Query::equal('projectInternalId', [$document->getInternalId()]),
+                Query::equal('projectInternalId', [$document->getSequence()]),
                Query::limit(APP_LIMIT_SUBQUERY),
            ]);
    }
@@ -127,7 +136,7 @@ Database::addFilter(
    function (mixed $value, Document $document, Database $database) {
        return $database
            ->find('keys', [
-                Query::equal('projectInternalId', [$document->getInternalId()]),
+                Query::equal('projectInternalId', [$document->getSequence()]),
                Query::limit(APP_LIMIT_SUBQUERY),
            ]);
    }
@@ -141,7 +150,7 @@ Database::addFilter(
    function (mixed $value, Document $document, Database $database) {
        return $database
            ->find('devKeys', [
-                Query::equal('projectInternalId', [$document->getInternalId()]),
+                Query::equal('projectInternalId', [$document->getSequence()]),
                Query::limit(APP_LIMIT_SUBQUERY),
            ]);
    }
@@ -155,7 +164,7 @@ Database::addFilter(
    function (mixed $value, Document $document, Database $database) {
        return $database
            ->find('webhooks', [
-                Query::equal('projectInternalId', [$document->getInternalId()]),
+                Query::equal('projectInternalId', [$document->getSequence()]),
                Query::limit(APP_LIMIT_SUBQUERY),
            ]);
    }
@@ -168,7 +177,7 @@ Database::addFilter(
    },
    function (mixed $value, Document $document, Database $database) {
        return Authorization::skip(fn () => $database->find('sessions', [
-            Query::equal('userInternalId', [$document->getInternalId()]),
+            Query::equal('userInternalId', [$document->getSequence()]),
            Query::limit(APP_LIMIT_SUBQUERY),
        ]));
    }
@@ -182,7 +191,7 @@ Database::addFilter(
    function (mixed $value, Document $document, Database $database) {
        return Authorization::skip(fn () => $database
            ->find('tokens', [
-                Query::equal('userInternalId', [$document->getInternalId()]),
+                Query::equal('userInternalId', [$document->getSequence()]),
                Query::limit(APP_LIMIT_SUBQUERY),
            ]));
    }
@@ -196,7 +205,7 @@ Database::addFilter(
    function (mixed $value, Document $document, Database $database) {
        return Authorization::skip(fn () => $database
            ->find('challenges', [
-                Query::equal('userInternalId', [$document->getInternalId()]),
+                Query::equal('userInternalId', [$document->getSequence()]),
                Query::limit(APP_LIMIT_SUBQUERY),
            ]));
    }
@@ -210,7 +219,7 @@ Database::addFilter(
    function (mixed $value, Document $document, Database $database) {
        return Authorization::skip(fn () => $database
            ->find('authenticators', [
-                Query::equal('userInternalId', [$document->getInternalId()]),
+                Query::equal('userInternalId', [$document->getSequence()]),
                Query::limit(APP_LIMIT_SUBQUERY),
            ]));
    }
@@ -224,7 +233,7 @@ Database::addFilter(
    function (mixed $value, Document $document, Database $database) {
        return Authorization::skip(fn () => $database
            ->find('memberships', [
-                Query::equal('userInternalId', [$document->getInternalId()]),
+                Query::equal('userInternalId', [$document->getSequence()]),
                Query::limit(APP_LIMIT_SUBQUERY),
            ]));
    }
@@ -238,7 +247,7 @@ Database::addFilter(
    function (mixed $value, Document $document, Database $database) {
        return $database
            ->find('variables', [
-                Query::equal('resourceInternalId', [$document->getInternalId()]),
+                Query::equal('resourceInternalId', [$document->getSequence()]),
                Query::equal('resourceType', ['function', 'site']),
                Query::limit(APP_LIMIT_SUBQUERY),
            ]);
@@ -316,7 +325,7 @@ Database::addFilter(
    function (mixed $value, Document $document, Database $database) {
        return Authorization::skip(fn () => $database
            ->find('targets', [
-                Query::equal('userInternalId', [$document->getInternalId()]),
+                Query::equal('userInternalId', [$document->getSequence()]),
                Query::limit(APP_LIMIT_SUBQUERY)
            ]));
    }
@@ -331,13 +340,13 @@ Database::addFilter(
        $targetIds = Authorization::skip(fn () => \array_map(
            fn ($document) => $document->getAttribute('targetInternalId'),
            $database->find('subscribers', [
-                Query::equal('topicInternalId', [$document->getInternalId()]),
+                Query::equal('topicInternalId', [$document->getSequence()]),
                Query::limit(APP_LIMIT_SUBSCRIBERS_SUBQUERY)
            ])
        ));
        if (\count($targetIds) > 0) {
            return $database->skipValidation(fn () => $database->find('targets', [
-                Query::equal('$internalId', $targetIds)
+                Query::equal('$sequence', $targetIds)
            ]));
        }
        return [];
@@ -15,6 +15,7 @@ use Utopia\Config\Config;
 use Utopia\Database\Adapter\MariaDB;
 use Utopia\Database\Adapter\MySQL;
 use Utopia\Database\Adapter\SQL;
+use Utopia\Database\PDO;
 use Utopia\Domains\Validator\PublicDomain;
 use Utopia\DSN\DSN;
 use Utopia\Logger\Adapter\AppSignal;
@@ -215,13 +216,13 @@ $register->set('pools', function () {
                'mysql',
                'mariadb' => function () use ($dsnHost, $dsnPort, $dsnUser, $dsnPass, $dsnDatabase) {
                    return new PDOProxy(function () use ($dsnHost, $dsnPort, $dsnUser, $dsnPass, $dsnDatabase) {
-                        return new PDO("mysql:host={$dsnHost};port={$dsnPort};dbname={$dsnDatabase};charset=utf8mb4", $dsnUser, $dsnPass, array(
-                            PDO::ATTR_TIMEOUT => 3, // Seconds
-                            PDO::ATTR_PERSISTENT => false,
-                            PDO::ATTR_DEFAULT_FETCH_MODE => PDO::FETCH_ASSOC,
-                            PDO::ATTR_EMULATE_PREPARES => true,
-                            PDO::ATTR_STRINGIFY_FETCHES => true
-                        ));
+                        return new PDO("mysql:host={$dsnHost};port={$dsnPort};dbname={$dsnDatabase};charset=utf8mb4", $dsnUser, $dsnPass, [
+                            \PDO::ATTR_TIMEOUT => 3, // Seconds
+                            \PDO::ATTR_PERSISTENT => false,
+                            \PDO::ATTR_DEFAULT_FETCH_MODE => \PDO::FETCH_ASSOC,
+                            \PDO::ATTR_EMULATE_PREPARES => true,
+                            \PDO::ATTR_STRINGIFY_FETCHES => true
+                        ]);
                    });
                },
                'redis' => function () use ($dsnHost, $dsnPort, $dsnPass) {
@@ -24,10 +24,12 @@ use Appwrite\Utopia\Request;
 use Executor\Executor;
 use Utopia\Abuse\Adapters\TimeLimit\Redis as TimeLimitRedis;
 use Utopia\App;
+use Utopia\Cache\Adapter\Pool as CachePool;
 use Utopia\Cache\Adapter\Sharding;
 use Utopia\Cache\Cache;
 use Utopia\CLI\Console;
 use Utopia\Config\Config;
+use Utopia\Database\Adapter\Pool as DatabasePool;
 use Utopia\Database\Database;
 use Utopia\Database\DateTime as DatabaseDateTime;
 use Utopia\Database\Document;
@@ -38,6 +40,7 @@ use Utopia\DSN\DSN;
 use Utopia\Locale\Locale;
 use Utopia\Logger\Log;
 use Utopia\Pools\Group;
+use Utopia\Queue\Broker\Pool as BrokerPool;
 use Utopia\Queue\Publisher;
 use Utopia\Storage\Device;
 use Utopia\Storage\Device\AWS;
@@ -49,6 +52,7 @@ use Utopia\Storage\Device\S3;
 use Utopia\Storage\Device\Wasabi;
 use Utopia\Storage\Storage;
 use Utopia\System\System;
+use Utopia\Telemetry\Adapter\None as NoTelemetry;
 use Utopia\Validator\Hostname;
 use Utopia\Validator\WhiteList;
 use Utopia\VCS\Adapter\Git\GitHub as VcsGitHub;
@@ -72,10 +76,10 @@ App::setResource('localeCodes', function () {

 // Queues
 App::setResource('publisher', function (Group $pools) {
-    return $pools->get('publisher')->pop()->getResource();
+    return new BrokerPool(publisher: $pools->get('publisher'));
 }, ['pools']);
 App::setResource('consumer', function (Group $pools) {
-    return $pools->get('consumer')->pop()->getResource();
+    return new BrokerPool(consumer: $pools->get('consumer'));
 }, ['pools']);
 App::setResource('queueForMessaging', function (Publisher $publisher) {
    return new Messaging($publisher);
@@ -329,12 +333,8 @@ App::setResource('dbForProject', function (Group $pools, Database $dbForPlatform
        $dsn = new DSN('mysql://' . $project->getAttribute('database'));
    }

-    $dbAdapter = $pools
-        ->get($dsn->getHost())
-        ->pop()
-        ->getResource();
-
-    $database = new Database($dbAdapter, $cache);
+    $adapter = new DatabasePool($pools->get($dsn->getHost()));
+    $database = new Database($adapter, $cache);

    $database
        ->setMetadata('host', \gethostname())
@@ -347,25 +347,21 @@ App::setResource('dbForProject', function (Group $pools, Database $dbForPlatform
    if (\in_array($dsn->getHost(), $sharedTables)) {
        $database
            ->setSharedTables(true)
-            ->setTenant($project->getInternalId())
+            ->setTenant($project->getSequence())
            ->setNamespace($dsn->getParam('namespace'));
    } else {
        $database
            ->setSharedTables(false)
            ->setTenant(null)
-            ->setNamespace('_' . $project->getInternalId());
+            ->setNamespace('_' . $project->getSequence());
    }

    return $database;
 }, ['pools', 'dbForPlatform', 'cache', 'project']);

 App::setResource('dbForPlatform', function (Group $pools, Cache $cache) {
-    $dbAdapter = $pools
-        ->get('console')
-        ->pop()
-        ->getResource();
-
-    $database = new Database($dbAdapter, $cache);
+    $adapter = new DatabasePool($pools->get('console'));
+    $database = new Database($adapter, $cache);

    $database
        ->setNamespace('_console')
@@ -378,7 +374,7 @@ App::setResource('dbForPlatform', function (Group $pools, Cache $cache) {
 }, ['pools', 'cache']);

 App::setResource('getProjectDB', function (Group $pools, Database $dbForPlatform, $cache) {
-    $databases = []; // TODO: @Meldiron This should probably be responsibility of utopia-php/pools
+    $databases = [];

    return function (Document $project) use ($pools, $dbForPlatform, $cache, &$databases) {
        if ($project->isEmpty() || $project->getId() === 'console') {
@@ -404,13 +400,13 @@ App::setResource('getProjectDB', function (Group $pools, Database $dbForPlatform
            if (\in_array($dsn->getHost(), $sharedTables)) {
                $database
                    ->setSharedTables(true)
-                    ->setTenant($project->getInternalId())
+                    ->setTenant($project->getSequence())
                    ->setNamespace($dsn->getParam('namespace'));
            } else {
                $database
                    ->setSharedTables(false)
                    ->setTenant(null)
-                    ->setNamespace('_' . $project->getInternalId());
+                    ->setNamespace('_' . $project->getSequence());
            }
        });

@@ -420,12 +416,8 @@ App::setResource('getProjectDB', function (Group $pools, Database $dbForPlatform
            return $database;
        }

-        $dbAdapter = $pools
-            ->get($dsn->getHost())
-            ->pop()
-            ->getResource();
-
-        $database = new Database($dbAdapter, $cache);
+        $adapter = new DatabasePool($pools->get($dsn->getHost()));
+        $database = new Database($adapter, $cache);
        $databases[$dsn->getHost()] = $database;
        $configure($database);

@@ -435,21 +427,15 @@ App::setResource('getProjectDB', function (Group $pools, Database $dbForPlatform

 App::setResource('getLogsDB', function (Group $pools, Cache $cache) {
    $database = null;
-    return function (?Document $project = null) use ($pools, $cache, $database) {
+
+    return function (?Document $project = null) use ($pools, $cache, &$database) {
        if ($database !== null && $project !== null && !$project->isEmpty() && $project->getId() !== 'console') {
-            $database->setTenant($project->getInternalId());
+            $database->setTenant($project->getSequence());
            return $database;
        }

-        $dbAdapter = $pools
-            ->get('logs')
-            ->pop()
-            ->getResource();
-
-        $database = new Database(
-            $dbAdapter,
-            $cache
-        );
+        $adapter = new DatabasePool($pools->get('logs'));
+        $database = new Database($adapter, $cache);

        $database
            ->setSharedTables(true)
@@ -459,23 +445,21 @@ App::setResource('getLogsDB', function (Group $pools, Cache $cache) {

        // set tenant
        if ($project !== null && !$project->isEmpty() && $project->getId() !== 'console') {
-            $database->setTenant($project->getInternalId());
+            $database->setTenant($project->getSequence());
        }

        return $database;
    };
 }, ['pools', 'cache']);

+App::setResource('telemetry', fn () => new NoTelemetry());
+
 App::setResource('cache', function (Group $pools) {
    $list = Config::getParam('pools-cache', []);
    $adapters = [];

    foreach ($list as $value) {
-        $adapters[] = $pools
-            ->get($value)
-            ->pop()
-            ->getResource()
-        ;
+        $adapters[] = new CachePool($pools->get($value));
    }

    return new Cache(new Sharding($adapters));
@@ -505,23 +489,18 @@ App::setResource('timelimit', function (\Redis $redis) {
 App::setResource('deviceForLocal', function () {
    return new Local();
 });
-
 App::setResource('deviceForFiles', function ($project) {
    return getDevice(APP_STORAGE_UPLOADS . '/app-' . $project->getId());
 }, ['project']);
-
 App::setResource('deviceForSites', function ($project) {
    return getDevice(APP_STORAGE_SITES . '/app-' . $project->getId());
 }, ['project']);
-
-App::setResource('deviceForImports', function (Document $project) {
+App::setResource('deviceForImports', function ($project) {
    return getDevice(APP_STORAGE_IMPORTS . '/app-' . $project->getId());
 }, ['project']);
-
 App::setResource('deviceForFunctions', function ($project) {
    return getDevice(APP_STORAGE_FUNCTIONS . '/app-' . $project->getId());
 }, ['project']);
-
 App::setResource('deviceForBuilds', function ($project) {
    return getDevice(APP_STORAGE_BUILDS . '/app-' . $project->getId());
 }, ['project']);
@@ -553,7 +532,8 @@ function getDevice(string $root, string $connection = ''): Device
        switch ($device) {
            case Storage::DEVICE_S3:
                if (!empty($url)) {
-                    return new S3($root, $accessKey, $accessSecret, $url, $region, $acl);
+                    $bucketRoot = (!empty($bucket) ? $bucket . '/' : '') . \ltrim($root, '/');
+                    return new S3($bucketRoot, $accessKey, $accessSecret, $url, $region, $acl);
                } else {
                    return new AWS($root, $accessKey, $accessSecret, $bucket, $region, $acl);
                }
@@ -585,7 +565,8 @@ function getDevice(string $root, string $connection = ''): Device
                $s3Acl = 'private';
                $s3EndpointUrl = System::getEnv('_APP_STORAGE_S3_ENDPOINT', '');
                if (!empty($s3EndpointUrl)) {
-                    return new S3($root, $s3AccessKey, $s3SecretKey, $s3EndpointUrl, $s3Region, $s3Acl);
+                    $bucketRoot = (!empty($s3Bucket) ? $s3Bucket . '/' : '') . \ltrim($root, '/');
+                    return new S3($bucketRoot, $s3AccessKey, $s3SecretKey, $s3EndpointUrl, $s3Region, $s3Acl);
                } else {
                    return new AWS($root, $s3AccessKey, $s3SecretKey, $s3Bucket, $s3Region, $s3Acl);
                }
@@ -816,7 +797,7 @@ App::setResource('devKey', function (Request $request, Document $project, array

    // add sdk to key
    $sdkValidator = new WhiteList($servers, true);
-    $sdk = $request->getHeader('x-sdk-name', 'UNKNOWN');
+    $sdk = \strtolower($request->getHeader('x-sdk-name', 'UNKNOWN'));

    if ($sdk !== 'UNKNOWN' && $sdkValidator->isValid($sdk)) {
        $sdks = $key->getAttribute('sdks', []);
@@ -855,7 +836,7 @@ App::setResource('team', function (Document $project, Database $dbForPlatform, A

    $team = Authorization::skip(function () use ($dbForPlatform, $teamInternalId) {
        return $dbForPlatform->findOne('teams', [
-            Query::equal('$internalId', [$teamInternalId]),
+            Query::equal('$sequence', [$teamInternalId]),
        ]);
    });

@@ -902,7 +883,7 @@ App::setResource('resourceToken', function ($project, $dbForProject, $request) {
    $tokenJWT = $request->getParam('token');

    if (!empty($tokenJWT) && !$project->isEmpty()) { // JWT authentication
-        $jwt = new JWT(App::getEnv('_APP_OPENSSL_KEY_V1'), 'HS256', 900, 10); // Instantiate with key, algo, maxAge and leeway.
+        $jwt = new JWT(System::getEnv('_APP_OPENSSL_KEY_V1'), 'HS256', 900, 10); // Instantiate with key, algo, maxAge and leeway.

        try {
            $payload = $jwt->decode($tokenJWT);
@@ -911,32 +892,52 @@ App::setResource('resourceToken', function ($project, $dbForProject, $request) {
        }

        $tokenId = $payload['tokenId'] ?? '';
-        $secret = $payload['secret'] ?? '';
-        if (empty($tokenId) || empty($secret)) {
+        if (empty($tokenId)) {
            return new Document([]);
        }

        $token = Authorization::skip(fn () => $dbForProject->getDocument('resourceTokens', $tokenId));

-        if ($token->isEmpty() || $token->getAttribute('secret') !== $secret) {
+        if ($token->isEmpty()) {
            return new Document([]);
        }

-        if ($token->getAttribute('resourceType') === 'file') {
-            $internalIds = explode(':', $token->getAttribute('resourceInternalId'));
-            $ids = explode(':', $token->getAttribute('resourceId'));
+        $expiry = $token->getAttribute('expire');

-            if (count($internalIds) !== 2 || count($ids) !== 2) {
+        if ($expiry !== null) {
+            $now = new \DateTime();
+            $expiryDate = new \DateTime($expiry);
+
+            if ($expiryDate < $now) {
                return new Document([]);
            }
-
-            return new Document([
-                'bucketId' => $ids[0],
-                'fileId' => $ids[1],
-                'bucketInternalId' => $internalIds[0],
-                'fileInternalId' => $internalIds[1],
-            ]);
        }
+
+        return match ($token->getAttribute('resourceType')) {
+            TOKENS_RESOURCE_TYPE_FILES => (function () use ($token, $dbForProject) {
+                $sequences = explode(':', $token->getAttribute('resourceInternalId'));
+                $ids = explode(':', $token->getAttribute('resourceId'));
+
+                if (count($sequences) !== 2 || count($ids) !== 2) {
+                    return new Document([]);
+                }
+
+                $accessedAt = $token->getAttribute('accessedAt', 0);
+                if (empty($accessedAt) || DatabaseDateTime::formatTz(DatabaseDateTime::addSeconds(new \DateTime(), - APP_RESOURCE_TOKEN_ACCESS)) > $accessedAt) {
+                    $token->setAttribute('accessedAt', DatabaseDateTime::now());
+                    Authorization::skip(fn () => $dbForProject->updateDocument('resourceTokens', $token->getId(), $token));
+                }
+
+                return new Document([
+                    'bucketId' => $ids[0],
+                    'fileId' => $ids[1],
+                    'bucketInternalId' => $sequences[0],
+                    'fileInternalId' => $sequences[1],
+                ]);
+            })(),
+
+            default => throw new Exception(Exception::TOKEN_RESOURCE_TYPE_INVALID),
+        };
    }
    return new Document([]);
 }, ['project', 'dbForProject', 'request']);
@@ -5,6 +5,7 @@ use Appwrite\Extend\Exception;
 use Appwrite\Extend\Exception as AppwriteException;
 use Appwrite\Messaging\Adapter\Realtime;
 use Appwrite\Network\Validator\Origin;
+use Appwrite\PubSub\Adapter\Pool as PubSubPool;
 use Appwrite\Utopia\Request;
 use Appwrite\Utopia\Response;
 use Swoole\Http\Request as SwooleRequest;
@@ -15,10 +16,12 @@ use Swoole\Timer;
 use Utopia\Abuse\Abuse;
 use Utopia\Abuse\Adapters\TimeLimit\Redis as TimeLimitRedis;
 use Utopia\App;
+use Utopia\Cache\Adapter\Pool as CachePool;
 use Utopia\Cache\Adapter\Sharding;
 use Utopia\Cache\Cache;
 use Utopia\CLI\Console;
 use Utopia\Config\Config;
+use Utopia\Database\Adapter\Pool as DatabasePool;
 use Utopia\Database\Database;
 use Utopia\Database\DateTime;
 use Utopia\Database\Document;
@@ -28,13 +31,15 @@ use Utopia\Database\Query;
 use Utopia\Database\Validator\Authorization;
 use Utopia\DSN\DSN;
 use Utopia\Logger\Log;
+use Utopia\Pools\Group;
+use Utopia\Registry\Registry;
 use Utopia\System\System;
 use Utopia\Telemetry\Adapter\None as NoTelemetry;
 use Utopia\WebSocket\Adapter;
 use Utopia\WebSocket\Server;

 /**
- * @var \Utopia\Registry\Registry $register
+ * @var Registry $register
 */
 require_once __DIR__ . '/init.php';

@@ -46,17 +51,17 @@ if (!function_exists('getConsoleDB')) {
    {
        global $register;

-        /** @var \Utopia\Pools\Group $pools */
+        static $database = null;
+
+        if ($database !== null) {
+            return $database;
+        }
+
+        /** @var Group $pools */
        $pools = $register->get('pools');

-        $dbAdapter = $pools
-            ->get('console')
-            ->pop()
-            ->getResource()
-        ;
-
-        $database = new Database($dbAdapter, getCache());
-
+        $adapter = new DatabasePool($pools->get('console'));
+        $database = new Database($adapter, getCache());
        $database
            ->setNamespace('_console')
            ->setMetadata('host', \gethostname())
@@ -72,7 +77,13 @@ if (!function_exists('getProjectDB')) {
    {
        global $register;

-        /** @var \Utopia\Pools\Group $pools */
+        static $databases = [];
+
+        if (isset($databases[$project->getSequence()])) {
+            return $databases[$project->getSequence()];
+        }
+
+        /** @var Group $pools */
        $pools = $register->get('pools');

        if ($project->isEmpty() || $project->getId() === 'console') {
@@ -86,11 +97,7 @@ if (!function_exists('getProjectDB')) {
            $dsn = new DSN('mysql://' . $project->getAttribute('database'));
        }

-        $adapter = $pools
-            ->get($dsn->getHost())
-            ->pop()
-            ->getResource();
-
+        $adapter = new DatabasePool($pools->get($dsn->getHost()));
        $database = new Database($adapter, getCache());

        $sharedTables = \explode(',', System::getEnv('_APP_DATABASE_SHARED_TABLES', ''));
@@ -98,20 +105,20 @@ if (!function_exists('getProjectDB')) {
        if (\in_array($dsn->getHost(), $sharedTables)) {
            $database
                ->setSharedTables(true)
-                ->setTenant($project->getInternalId())
+                ->setTenant($project->getSequence())
                ->setNamespace($dsn->getParam('namespace'));
        } else {
            $database
                ->setSharedTables(false)
                ->setTenant(null)
-                ->setNamespace('_' . $project->getInternalId());
+                ->setNamespace('_' . $project->getSequence());
        }

        $database
            ->setMetadata('host', \gethostname())
            ->setMetadata('project', $project->getId());

-        return $database;
+        return $databases[$project->getSequence()] = $database;
    }
 }

@@ -121,20 +128,22 @@ if (!function_exists('getCache')) {
    {
        global $register;

-        $pools = $register->get('pools'); /** @var \Utopia\Pools\Group $pools */
+        static $cache = null;
+
+        if ($cache !== null) {
+            return $cache;
+        }
+
+        $pools = $register->get('pools'); /** @var Group $pools */

        $list = Config::getParam('pools-cache', []);
        $adapters = [];

        foreach ($list as $value) {
-            $adapters[] = $pools
-                ->get($value)
-                ->pop()
-                ->getResource()
-            ;
+            $adapters[] = new CachePool($pools->get($value));
        }

-        return new Cache(new Sharding($adapters));
+        return $cache = new Cache(new Sharding($adapters));
    }
 }

@@ -142,6 +151,12 @@ if (!function_exists('getCache')) {
 if (!function_exists('getRedis')) {
    function getRedis(): \Redis
    {
+        static $redis = null;
+
+        if ($redis !== null) {
+            return $redis;
+        }
+
        $host = System::getEnv('_APP_REDIS_HOST', 'localhost');
        $port = System::getEnv('_APP_REDIS_PORT', 6379);
        $pass = System::getEnv('_APP_REDIS_PASS', '');
@@ -160,21 +175,39 @@ if (!function_exists('getRedis')) {
 if (!function_exists('getTimelimit')) {
    function getTimelimit(): TimeLimitRedis
    {
-        return new TimeLimitRedis("", 0, 1, getRedis());
+        static $timelimit = null;
+
+        if ($timelimit !== null) {
+            return $timelimit;
+        }
+
+        return $timelimit = new TimeLimitRedis("", 0, 1, getRedis());
    }
 }

 if (!function_exists('getRealtime')) {
    function getRealtime(): Realtime
    {
-        return new Realtime();
+        static $realtime = null;
+
+        if ($realtime !== null) {
+            return $realtime;
+        }
+
+        return $realtime = new Realtime();
    }
 }

 if (!function_exists('getTelemetry')) {
    function getTelemetry(int $workerId): Utopia\Telemetry\Adapter
    {
-        return new NoTelemetry();
+        static $telemetry = null;
+
+        if ($telemetry !== null) {
+            return $telemetry;
+        }
+
+        return $telemetry = new NoTelemetry();
    }
 }

@@ -273,7 +306,6 @@ $server->onStart(function () use ($stats, $register, $containerId, &$statsDocume
                sleep(DATABASE_RECONNECT_SLEEP);
            }
        } while (true);
-        $register->get('pools')->reclaim();
    });

    /**
@@ -299,9 +331,7 @@ $server->onStart(function () use ($stats, $register, $containerId, &$statsDocume

                Authorization::skip(fn () => $database->updateDocument('realtime', $statsDocument->getId(), $statsDocument));
            } catch (Throwable $th) {
-                call_user_func($logError, $th, "updateWorkerDocument");
-            } finally {
-                $register->get('pools')->reclaim();
+                $logError($th, "updateWorkerDocument");
            }
        });
    }
@@ -370,8 +400,6 @@ $server->onWorkerStart(function (int $workerId) use ($server, $register, $stats,
                        'data' => $event['data']
                    ]));
                }
-
-                $register->get('pools')->reclaim();
            }
        }
        /**
@@ -407,8 +435,8 @@ $server->onWorkerStart(function (int $workerId) use ($server, $register, $stats,
            }
            $start = time();

-            /** @var \Appwrite\PubSub\Adapter $pubsub */
-            $pubsub = $register->get('pools')->get('pubsub')->pop()->getResource();
+            $pubsub = new PubSubPool($register->get('pools')->get('pubsub'));
+
            if ($pubsub->ping(true)) {
                $attempts = 0;
                Console::success('Pub/sub connection established (worker: ' . $workerId . ')');
@@ -436,8 +464,6 @@ $server->onWorkerStart(function (int $workerId) use ($server, $register, $stats,

                        $realtime->unsubscribe($connection);
                        $realtime->subscribe($projectId, $connection, $roles, $channels);
-
-                        $register->get('pools')->reclaim();
                    }
                }

@@ -463,14 +489,12 @@ $server->onWorkerStart(function (int $workerId) use ($server, $register, $stats,
                }
            });
        } catch (Throwable $th) {
-            call_user_func($logError, $th, "pubSubConnection");
+            $logError($th, "pubSubConnection");

            Console::error('Pub/sub error: ' . $th->getMessage());
            $attempts++;
            sleep(DATABASE_RECONNECT_SLEEP);
            continue;
-        } finally {
-            $register->get('pools')->reclaim();
        }
    }

@@ -572,7 +596,7 @@ $server->onOpen(function (int $connection, SwooleRequest $request) use ($server,
        $stats->incr($project->getId(), 'connections');
        $stats->incr($project->getId(), 'connectionsTotal');
    } catch (Throwable $th) {
-        call_user_func($logError, $th, "initServer");
+        $logError($th, "initServer");

        // Handle SQL error code is 'HY000'
        $code = $th->getCode();
@@ -596,8 +620,6 @@ $server->onOpen(function (int $connection, SwooleRequest $request) use ($server,
            Console::error('[Error] Code: ' . $response['data']['code']);
            Console::error('[Error] Message: ' . $response['data']['message']);
        }
-    } finally {
-        $register->get('pools')->reclaim();
    }
 });

@@ -696,8 +718,6 @@ $server->onMessage(function (int $connection, string $message) use ($server, $re
        if ($th->getCode() === 1008) {
            $server->close($connection, $th->getCode());
        }
-    } finally {
-        $register->get('pools')->reclaim();
    }
 });

@@ -479,35 +479,37 @@ switch ($type) {
            </div>
        </div>

-        <div x-show="page === 'trace'" class="error-trace">
-            <button class="back-button" x-on:click="page = 'error'">
-                Back
-            </button>
-            <div class="trace-grid-header">Error trace</div>
-            <?php foreach ($trace as $index => $traceItem): ?>
-                <div class="trace-grid">
-                    <?php if (isset($traceItem['file'])): ?>
-                        <div class="trace-label">file</div>
-                        <div class="trace-value"><?php echo $this->print($traceItem['file']); ?></div>
-                    <?php endif; ?>
+        <?php if ($development) : ?>
+            <div x-show="page === 'trace'" class="error-trace">
+                <button class="back-button" x-on:click="page = 'error'">
+                    Back
+                </button>
+                <div class="trace-grid-header">Error trace</div>
+                <?php foreach ($trace as $index => $traceItem): ?>
+                    <div class="trace-grid">
+                        <?php if (isset($traceItem['file'])): ?>
+                            <div class="trace-label">file</div>
+                            <div class="trace-value"><?php echo $this->print($traceItem['file']); ?></div>
+                        <?php endif; ?>

-                    <?php if (isset($traceItem['line'])): ?>
-                        <div class="trace-label">line</div>
-                        <div class="trace-value"><?php echo $this->print($traceItem['line']); ?></div>
-                    <?php endif; ?>
+                        <?php if (isset($traceItem['line'])): ?>
+                            <div class="trace-label">line</div>
+                            <div class="trace-value"><?php echo $this->print($traceItem['line']); ?></div>
+                        <?php endif; ?>

-                    <?php if (isset($traceItem['function'])): ?>
-                        <div class="trace-label">function</div>
-                        <div class="trace-value"><?php echo $this->print($traceItem['function']); ?></div>
-                    <?php endif; ?>
+                        <?php if (isset($traceItem['function'])): ?>
+                            <div class="trace-label">function</div>
+                            <div class="trace-value"><?php echo $this->print($traceItem['function']); ?></div>
+                        <?php endif; ?>

-                    <?php if (isset($traceItem['args'])): ?>
-                        <div class="trace-label">args</div>
-                        <div class="trace-args"><pre><?php echo $this->print(\var_export($traceItem['args'], true)); ?></pre></div>
-                    <?php endif; ?>
-                </div>
-            <?php endforeach; ?>
-        </div>
+                        <?php if (isset($traceItem['args'])): ?>
+                            <div class="trace-label">args</div>
+                            <div class="trace-args"><pre><?php echo $this->print(\var_export($traceItem['args'], true)); ?></pre></div>
+                        <?php endif; ?>
+                    </div>
+                <?php endforeach; ?>
+            </div>
+        <?php endif; ?>
    </div>

    <div x-show="page === 'error'" class="brand">
@@ -61,6 +61,7 @@ $image = $this->getParam('image', '');
      - traefik.http.routers.appwrite_api_https.tls=true
    volumes:
      - appwrite-uploads:/storage/uploads:rw
+      - appwrite-imports:/storage/imports:rw
      - appwrite-cache:/storage/cache:rw
      - appwrite-config:/storage/config:rw
      - appwrite-certificates:/storage/certificates:rw
@@ -151,6 +152,7 @@ $image = $this->getParam('image', '');
      - _APP_LOGGING_CONFIG
      - _APP_MAINTENANCE_INTERVAL
      - _APP_MAINTENANCE_DELAY
+      - _APP_MAINTENANCE_START_TIME
      - _APP_MAINTENANCE_RETENTION_EXECUTION
      - _APP_MAINTENANCE_RETENTION_CACHE
      - _APP_MAINTENANCE_RETENTION_ABUSE
@@ -175,7 +177,7 @@ $image = $this->getParam('image', '');
  appwrite-console:
    <<: *x-logging
    container_name: appwrite-console
-    image: <?php echo $organization; ?>/console:5.2.53
+    image: <?php echo $organization; ?>/console:6.0.13
    restart: unless-stopped
    networks:
      - appwrite
@@ -615,6 +617,8 @@ $image = $this->getParam('image', '');
    restart: unless-stopped
    networks:
      - appwrite
+    volumes:
+      - appwrite-imports:/storage/imports:rw
    depends_on:
      - mariadb
    environment:
@@ -681,11 +685,9 @@ $image = $this->getParam('image', '');
    container_name: appwrite-task-stats-resources
    entrypoint: stats-resources
    <<: *x-logging
+    restart: unless-stopped
    networks:
      - appwrite
-    volumes:
-      - ./app:/usr/src/code/app
-      - ./src:/usr/src/code/src
    depends_on:
      - redis
      - mariadb
@@ -763,34 +765,6 @@ $image = $this->getParam('image', '');
      - _APP_LOGGING_CONFIG
      - _APP_USAGE_AGGREGATION_INTERVAL

-  appwrite-worker-stats-usage-dump:
-    image: <?php echo $organization; ?>/<?php echo $image; ?>:<?php echo $version."\n"; ?>
-    entrypoint: worker-stats-usage-dump
-    <<: *x-logging
-    container_name: appwrite-worker-stats-usage-dump
-    restart: unless-stopped
-    networks:
-      - appwrite
-    depends_on:
-      - redis
-      - mariadb
-    environment:
-      - _APP_ENV
-      - _APP_WORKER_PER_CORE
-      - _APP_OPENSSL_KEY_V1
-      - _APP_DB_HOST
-      - _APP_DB_PORT
-      - _APP_DB_SCHEMA
-      - _APP_DB_USER
-      - _APP_DB_PASS
-      - _APP_REDIS_HOST
-      - _APP_REDIS_PORT
-      - _APP_REDIS_USER
-      - _APP_REDIS_PASS
-      - _APP_USAGE_STATS
-      - _APP_LOGGING_CONFIG
-      - _APP_USAGE_AGGREGATION_INTERVAL
-
  appwrite-task-scheduler-functions:
    image: <?php echo $organization; ?>/<?php echo $image; ?>:<?php echo $version."\n"; ?>
    entrypoint: schedule-functions
@@ -877,7 +851,7 @@ $image = $this->getParam('image', '');
      - _APP_ASSISTANT_OPENAI_API_KEY
      
  appwrite-browser:
-    image: appwrite/browser:0.2.2
+    image: appwrite/browser:0.2.4
    container_name: appwrite-browser
    <<: *x-logging
    restart: unless-stopped
@@ -890,7 +864,7 @@ $image = $this->getParam('image', '');
    <<: *x-logging
    restart: unless-stopped
    stop_signal: SIGINT
-    image: openruntimes/executor:0.7.13
+    image: openruntimes/executor:0.7.14
    networks:
      - appwrite
      - runtimes
@@ -990,6 +964,7 @@ volumes:
  appwrite-redis:
  appwrite-cache:
  appwrite-uploads:
+  appwrite-imports:
  appwrite-certificates:
  appwrite-functions:
  appwrite-sites:
@@ -15,16 +15,17 @@ use Appwrite\Event\Messaging;
 use Appwrite\Event\Migration;
 use Appwrite\Event\Realtime;
 use Appwrite\Event\StatsUsage;
-use Appwrite\Event\StatsUsageDump;
 use Appwrite\Event\Webhook;
 use Appwrite\Platform\Appwrite;
 use Executor\Executor;
 use Swoole\Runtime;
 use Utopia\Abuse\Adapters\TimeLimit\Redis as TimeLimitRedis;
+use Utopia\Cache\Adapter\Pool as CachePool;
 use Utopia\Cache\Adapter\Sharding;
 use Utopia\Cache\Cache;
 use Utopia\CLI\Console;
 use Utopia\Config\Config;
+use Utopia\Database\Adapter\Pool as DatabasePool;
 use Utopia\Database\Database;
 use Utopia\Database\DateTime;
 use Utopia\Database\Document;
@@ -34,28 +35,26 @@ use Utopia\Logger\Log;
 use Utopia\Logger\Logger;
 use Utopia\Platform\Service;
 use Utopia\Pools\Group;
+use Utopia\Queue\Broker\Pool as BrokerPool;
 use Utopia\Queue\Message;
 use Utopia\Queue\Publisher;
 use Utopia\Queue\Server;
 use Utopia\Registry\Registry;
 use Utopia\System\System;
+use Utopia\Telemetry\Adapter\None as NoTelemetry;

 Authorization::disable();
-Runtime::enableCoroutine(SWOOLE_HOOK_ALL);
+Runtime::enableCoroutine();

 Server::setResource('register', fn () => $register);

 Server::setResource('dbForPlatform', function (Cache $cache, Registry $register) {
    $pools = $register->get('pools');
-    $database = $pools
-        ->get('console')
-        ->pop()
-        ->getResource();
+    $adapter = new DatabasePool($pools->get('console'));
+    $dbForPlatform = new Database($adapter, $cache);
+    $dbForPlatform->setNamespace('_console');

-    $adapter = new Database($database, $cache);
-    $adapter->setNamespace('_console');
-
-    return $adapter;
+    return $dbForPlatform;
 }, ['cache', 'register']);

 Server::setResource('project', function (Message $message, Database $dbForPlatform) {
@@ -83,32 +82,21 @@ Server::setResource('dbForProject', function (Cache $cache, Registry $register,
        $dsn = new DSN('mysql://' . $project->getAttribute('database'));
    }

-    $adapter = $pools
-        ->get($dsn->getHost())
-        ->pop()
-        ->getResource();
-
+    $adapter = new DatabasePool($pools->get($dsn->getHost()));
    $database = new Database($adapter, $cache);

-    try {
-        $dsn = new DSN($project->getAttribute('database'));
-    } catch (\InvalidArgumentException) {
-        // TODO: Temporary until all projects are using shared tables
-        $dsn = new DSN('mysql://' . $project->getAttribute('database'));
-    }
-
    $sharedTables = \explode(',', System::getEnv('_APP_DATABASE_SHARED_TABLES', ''));

    if (\in_array($dsn->getHost(), $sharedTables)) {
        $database
            ->setSharedTables(true)
-            ->setTenant($project->getInternalId())
+            ->setTenant($project->getSequence())
            ->setNamespace($dsn->getParam('namespace'));
    } else {
        $database
            ->setSharedTables(false)
            ->setTenant(null)
-            ->setNamespace('_' . $project->getInternalId());
+            ->setNamespace('_' . $project->getSequence());
    }

    $database->setTimeout(APP_DATABASE_TIMEOUT_MILLISECONDS_WORKER);
@@ -139,24 +127,20 @@ Server::setResource('getProjectDB', function (Group $pools, Database $dbForPlatf
            if (\in_array($dsn->getHost(), $sharedTables)) {
                $database
                    ->setSharedTables(true)
-                    ->setTenant($project->getInternalId())
+                    ->setTenant($project->getSequence())
                    ->setNamespace($dsn->getParam('namespace'));
            } else {
                $database
                    ->setSharedTables(false)
                    ->setTenant(null)
-                    ->setNamespace('_' . $project->getInternalId());
+                    ->setNamespace('_' . $project->getSequence());
            }

            return $database;
        }

-        $dbAdapter = $pools
-            ->get($dsn->getHost())
-            ->pop()
-            ->getResource();
-
-        $database = new Database($dbAdapter, $cache);
+        $adapter = new DatabasePool($pools->get($dsn->getHost()));
+        $database = new Database($adapter, $cache);

        $databases[$dsn->getHost()] = $database;

@@ -165,13 +149,13 @@ Server::setResource('getProjectDB', function (Group $pools, Database $dbForPlatf
        if (\in_array($dsn->getHost(), $sharedTables)) {
            $database
                ->setSharedTables(true)
-                ->setTenant($project->getInternalId())
+                ->setTenant($project->getSequence())
                ->setNamespace($dsn->getParam('namespace'));
        } else {
            $database
                ->setSharedTables(false)
                ->setTenant(null)
-                ->setNamespace('_' . $project->getInternalId());
+                ->setNamespace('_' . $project->getSequence());
        }

        $database->setTimeout(APP_DATABASE_TIMEOUT_MILLISECONDS_WORKER);
@@ -184,19 +168,12 @@ Server::setResource('getLogsDB', function (Group $pools, Cache $cache) {
    $database = null;
    return function (?Document $project = null) use ($pools, $cache, $database) {
        if ($database !== null && $project !== null && !$project->isEmpty() && $project->getId() !== 'console') {
-            $database->setTenant($project->getInternalId());
+            $database->setTenant($project->getSequence());
            return $database;
        }

-        $dbAdapter = $pools
-            ->get('logs')
-            ->pop()
-            ->getResource();
-
-        $database = new Database(
-            $dbAdapter,
-            $cache
-        );
+        $adapter = new DatabasePool($pools->get('logs'));
+        $database = new Database($adapter, $cache);

        $database
            ->setSharedTables(true)
@@ -206,7 +183,7 @@ Server::setResource('getLogsDB', function (Group $pools, Cache $cache) {

        // set tenant
        if ($project !== null && !$project->isEmpty() && $project->getId() !== 'console') {
-            $database->setTenant($project->getInternalId());
+            $database->setTenant($project->getSequence());
        }

        return $database;
@@ -234,11 +211,7 @@ Server::setResource('cache', function (Registry $register) {
    $adapters = [];

    foreach ($list as $value) {
-        $adapters[] = $pools
-            ->get($value)
-            ->pop()
-            ->getResource()
-        ;
+        $adapters[] = new CachePool($pools->get($value));
    }

    return new Cache(new Sharding($adapters));
@@ -267,22 +240,19 @@ Server::setResource('timelimit', function (\Redis $redis) {

 Server::setResource('log', fn () => new Log());

+
 Server::setResource('publisher', function (Group $pools) {
-    return $pools->get('publisher')->pop()->getResource();
+    return new BrokerPool(publisher: $pools->get('publisher'));
 }, ['pools']);

 Server::setResource('consumer', function (Group $pools) {
-    return $pools->get('consumer')->pop()->getResource();
+    return new BrokerPool(consumer: $pools->get('consumer'));
 }, ['pools']);

 Server::setResource('queueForStatsUsage', function (Publisher $publisher) {
    return new StatsUsage($publisher);
 }, ['publisher']);

-Server::setResource('queueForStatsUsageDump', function (Publisher $publisher) {
-    return new StatsUsageDump($publisher);
-}, ['publisher']);
-
 Server::setResource('queueForDatabase', function (Publisher $publisher) {
    return new EventDatabase($publisher);
 }, ['publisher']);
@@ -339,6 +309,8 @@ Server::setResource('pools', function (Registry $register) {
    return $register->get('pools');
 }, ['register']);

+Server::setResource('telemetry', fn () => new NoTelemetry());
+
 Server::setResource('deviceForSites', function (Document $project) {
    return getDevice(APP_STORAGE_SITES . '/app-' . $project->getId());
 }, ['project']);
@@ -368,6 +340,10 @@ Server::setResource(
    fn () => fn (Document $project, string $resourceType, ?string $resourceId) => false
 );

+Server::setResource('plan', function (array $plan = []) {
+    return [];
+});
+
 Server::setResource('certificates', function () {
    $email = System::getEnv('_APP_EMAIL_CERTIFICATES', System::getEnv('_APP_SYSTEM_SECURITY_EMAIL_ADDRESS'));
    if (empty($email)) {
@@ -461,13 +437,6 @@ try {

 $worker = $platform->getWorker();

-$worker
-    ->shutdown()
-    ->inject('pools')
-    ->action(function (Group $pools) {
-        $pools->reclaim();
-    });
-
 $worker
    ->error()
    ->inject('error')
@@ -475,8 +444,7 @@ $worker
    ->inject('log')
    ->inject('pools')
    ->inject('project')
-    ->action(function (Throwable $error, ?Logger $logger, Log $log, Group $pools, Document $project) use ($queueName) {
-        $pools->reclaim();
+    ->action(function (Throwable $error, ?Logger $logger, Log $log, Group $pools, Document $project) use ($worker, $queueName) {
        $version = System::getEnv('_APP_VERSION', 'UNKNOWN');

        if ($logger) {
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-php /usr/src/code/app/worker.php stats-usage-dump $@
@@ -31,7 +31,7 @@
        }
    },
    "require": {
-        "php": ">=8.0.0",
+        "php": ">=8.3.0",
        "ext-curl": "*",
        "ext-imagick": "*",
        "ext-mbstring": "*",
@@ -49,25 +49,25 @@
        "utopia-php/abuse": "0.52.*",
        "utopia-php/analytics": "0.10.*",
        "utopia-php/audit": "0.55.*",
-        "utopia-php/cache": "0.12.*",
+        "utopia-php/cache": "0.13.*",
        "utopia-php/cli": "0.15.*",
        "utopia-php/config": "0.2.*",
        "utopia-php/detector": "0.1.*",
-        "utopia-php/database": "0.64.*",
-        "utopia-php/domains": "0.5.*",
+        "utopia-php/database": "0.71.*",
+        "utopia-php/domains": "0.8.0",
        "utopia-php/dsn": "0.2.1",
        "utopia-php/framework": "0.33.*",
        "utopia-php/fetch": "0.4.*",
        "utopia-php/image": "0.8.*",
        "utopia-php/locale": "0.4.*",
        "utopia-php/logger": "0.6.*",
-        "utopia-php/messaging": "0.16.*",
-        "utopia-php/migration": "0.9.1",
+        "utopia-php/messaging": "0.17.*",
+        "utopia-php/migration": "0.10.*",
        "utopia-php/orchestration": "0.9.*",
        "utopia-php/platform": "0.7.*",
        "utopia-php/pools": "0.8.*",
        "utopia-php/preloader": "0.2.*",
-        "utopia-php/queue": "0.9.*",
+        "utopia-php/queue": "0.10.*",
        "utopia-php/registry": "0.5.*",
        "utopia-php/storage": "0.18.*",
        "utopia-php/swoole": "0.8.*",
@@ -206,13 +206,14 @@ services:
      - _APP_DATABASE_SHARED_TABLES_V1
      - _APP_DATABASE_SHARED_NAMESPACE
      - _APP_FUNCTIONS_CREATION_ABUSE_LIMIT
+      - _APP_CUSTOM_DOMAIN_DENY_LIST
    extra_hosts:
      - "host.docker.internal:host-gateway"

  appwrite-console:
    <<: *x-logging
    container_name: appwrite-console
-    image: appwrite/console:5.3.0-sites-rc.40
+    image: appwrite/console:6.0.13
    restart: unless-stopped
    networks:
      - appwrite
@@ -752,7 +753,7 @@ services:
      - _APP_MAINTENANCE_RETENTION_AUDIT_CONSOLE
      - _APP_MAINTENANCE_RETENTION_USAGE_HOURLY
      - _APP_MAINTENANCE_RETENTION_SCHEDULES
-      - _APP_MAINTENANCE_DELAY
+      - _APP_MAINTENANCE_START_TIME
      - _APP_DATABASE_SHARED_TABLES

  appwrite-task-stats-resources:
@@ -848,38 +849,6 @@ services:
      - _APP_USAGE_AGGREGATION_INTERVAL
      - _APP_DATABASE_SHARED_TABLES

-  appwrite-worker-stats-usage-dump:
-    entrypoint: worker-stats-usage-dump
-    <<: *x-logging
-    container_name: appwrite-worker-stats-usage-dump
-    image: appwrite-dev
-    networks:
-      - appwrite
-    volumes:
-      - ./app:/usr/src/code/app
-      - ./src:/usr/src/code/src
-    depends_on:
-      - redis
-      - mariadb
-    environment:
-      - _APP_ENV
-      - _APP_WORKER_PER_CORE
-      - _APP_OPENSSL_KEY_V1
-      - _APP_DB_HOST
-      - _APP_DB_PORT
-      - _APP_DB_SCHEMA
-      - _APP_DB_USER
-      - _APP_DB_PASS
-      - _APP_REDIS_HOST
-      - _APP_REDIS_PORT
-      - _APP_REDIS_USER
-      - _APP_REDIS_PASS
-      - _APP_USAGE_STATS
-      - _APP_LOGGING_CONFIG
-      - _APP_USAGE_AGGREGATION_INTERVAL
-      - _APP_DATABASE_SHARED_TABLES
-      - _APP_STATS_USAGE_DUAL_WRITING_DBS
-
  appwrite-task-scheduler-functions:
    entrypoint: schedule-functions
    <<: *x-logging
@@ -973,7 +942,7 @@ services:

  appwrite-browser:
    container_name: appwrite-browser
-    image: appwrite/browser:0.2.2
+    image: appwrite/browser:0.2.4
    networks:
      - appwrite

@@ -982,7 +951,7 @@ services:
    hostname: exc1
    <<: *x-logging
    stop_signal: SIGINT
-    image: openruntimes/executor:0.7.13
+    image: openruntimes/executor:0.7.16
    restart: unless-stopped
    networks:
      - appwrite
@@ -13,7 +13,7 @@ public class MainActivity extends AppCompatActivity {
        setContentView(R.layout.activity_main);

        Client client = new Client(getApplicationContext())
-            .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
+            .setEndpoint("https://<REGION>.cloud.appwrite.io/v1") // Your API Endpoint
            .setProject("5df5acd0d48c2"); // Your project ID

        Account account = new Account(client);
@@ -13,7 +13,7 @@ public class MainActivity extends AppCompatActivity {
        setContentView(R.layout.activity_main);

        Client client = new Client(getApplicationContext())
-            .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
+            .setEndpoint("https://<REGION>.cloud.appwrite.io/v1") // Your API Endpoint
            .setProject("5df5acd0d48c2"); // Your project ID

        Account account = new Account(client);
@@ -13,7 +13,7 @@ public class MainActivity extends AppCompatActivity {
        setContentView(R.layout.activity_main);

        Client client = new Client(getApplicationContext())
-            .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
+            .setEndpoint("https://<REGION>.cloud.appwrite.io/v1") // Your API Endpoint
            .setProject("5df5acd0d48c2"); // Your project ID

        Account account = new Account(client);
@@ -13,7 +13,7 @@ public class MainActivity extends AppCompatActivity {
        setContentView(R.layout.activity_main);

        Client client = new Client(getApplicationContext())
-            .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
+            .setEndpoint("https://<REGION>.cloud.appwrite.io/v1") // Your API Endpoint
            .setProject("5df5acd0d48c2"); // Your project ID

        Account account = new Account(client);
@@ -13,7 +13,7 @@ public class MainActivity extends AppCompatActivity {
        setContentView(R.layout.activity_main);

        Client client = new Client(getApplicationContext())
-            .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
+            .setEndpoint("https://<REGION>.cloud.appwrite.io/v1") // Your API Endpoint
            .setProject("5df5acd0d48c2"); // Your project ID

        Account account = new Account(client);
@@ -13,7 +13,7 @@ public class MainActivity extends AppCompatActivity {
        setContentView(R.layout.activity_main);

        Client client = new Client(getApplicationContext())
-            .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
+            .setEndpoint("https://<REGION>.cloud.appwrite.io/v1") // Your API Endpoint
            .setProject("5df5acd0d48c2"); // Your project ID

        Account account = new Account(client);
@@ -13,7 +13,7 @@ public class MainActivity extends AppCompatActivity {
        setContentView(R.layout.activity_main);

        Client client = new Client(getApplicationContext())
-            .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
+            .setEndpoint("https://<REGION>.cloud.appwrite.io/v1") // Your API Endpoint
            .setProject("5df5acd0d48c2"); // Your project ID

        Account account = new Account(client);
@@ -13,7 +13,7 @@ public class MainActivity extends AppCompatActivity {
        setContentView(R.layout.activity_main);

        Client client = new Client(getApplicationContext())
-            .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
+            .setEndpoint("https://<REGION>.cloud.appwrite.io/v1") // Your API Endpoint
            .setProject("5df5acd0d48c2"); // Your project ID

        Account account = new Account(client);
@@ -13,7 +13,7 @@ public class MainActivity extends AppCompatActivity {
        setContentView(R.layout.activity_main);

        Client client = new Client(getApplicationContext())
-            .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
+            .setEndpoint("https://<REGION>.cloud.appwrite.io/v1") // Your API Endpoint
            .setProject("5df5acd0d48c2"); // Your project ID

        Account account = new Account(client);
@@ -13,7 +13,7 @@ public class MainActivity extends AppCompatActivity {
        setContentView(R.layout.activity_main);

        Client client = new Client(getApplicationContext())
-            .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
+            .setEndpoint("https://<REGION>.cloud.appwrite.io/v1") // Your API Endpoint
            .setProject("5df5acd0d48c2"); // Your project ID

        Account account = new Account(client);
@@ -13,7 +13,7 @@ public class MainActivity extends AppCompatActivity {
        setContentView(R.layout.activity_main);

        Client client = new Client(getApplicationContext())
-            .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
+            .setEndpoint("https://<REGION>.cloud.appwrite.io/v1") // Your API Endpoint
            .setProject("5df5acd0d48c2"); // Your project ID

        Account account = new Account(client);
@@ -13,7 +13,7 @@ public class MainActivity extends AppCompatActivity {
        setContentView(R.layout.activity_main);

        Client client = new Client(getApplicationContext())
-            .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
+            .setEndpoint("https://<REGION>.cloud.appwrite.io/v1") // Your API Endpoint
            .setProject("5df5acd0d48c2"); // Your project ID

        Account account = new Account(client);
@@ -13,7 +13,7 @@ public class MainActivity extends AppCompatActivity {
        setContentView(R.layout.activity_main);

        Client client = new Client(getApplicationContext())
-            .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
+            .setEndpoint("https://<REGION>.cloud.appwrite.io/v1") // Your API Endpoint
            .setProject("5df5acd0d48c2"); // Your project ID

        Account account = new Account(client);
@@ -13,7 +13,7 @@ public class MainActivity extends AppCompatActivity {
        setContentView(R.layout.activity_main);

        Client client = new Client(getApplicationContext())
-            .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
+            .setEndpoint("https://<REGION>.cloud.appwrite.io/v1") // Your API Endpoint
            .setProject("5df5acd0d48c2"); // Your project ID

        Account account = new Account(client);
@@ -13,7 +13,7 @@ public class MainActivity extends AppCompatActivity {
        setContentView(R.layout.activity_main);

        Client client = new Client(getApplicationContext())
-            .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
+            .setEndpoint("https://<REGION>.cloud.appwrite.io/v1") // Your API Endpoint
            .setProject("5df5acd0d48c2"); // Your project ID

        Account account = new Account(client);
@@ -13,7 +13,7 @@ public class MainActivity extends AppCompatActivity {
        setContentView(R.layout.activity_main);

        Client client = new Client(getApplicationContext())
-            .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
+            .setEndpoint("https://<REGION>.cloud.appwrite.io/v1") // Your API Endpoint
            .setProject("5df5acd0d48c2"); // Your project ID

        Account account = new Account(client);
@@ -13,7 +13,7 @@ public class MainActivity extends AppCompatActivity {
        setContentView(R.layout.activity_main);

        Client client = new Client(getApplicationContext())
-            .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
+            .setEndpoint("https://<REGION>.cloud.appwrite.io/v1") // Your API Endpoint
            .setProject("5df5acd0d48c2"); // Your project ID

        Account account = new Account(client);
@@ -13,7 +13,7 @@ public class MainActivity extends AppCompatActivity {
        setContentView(R.layout.activity_main);

        Client client = new Client(getApplicationContext())
-            .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
+            .setEndpoint("https://<REGION>.cloud.appwrite.io/v1") // Your API Endpoint
            .setProject("5df5acd0d48c2"); // Your project ID

        Account account = new Account(client);
@@ -13,7 +13,7 @@ public class MainActivity extends AppCompatActivity {
        setContentView(R.layout.activity_main);

        Client client = new Client(getApplicationContext())
-            .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
+            .setEndpoint("https://<REGION>.cloud.appwrite.io/v1") // Your API Endpoint
            .setProject("5df5acd0d48c2"); // Your project ID

        Account account = new Account(client);
@@ -13,7 +13,7 @@ public class MainActivity extends AppCompatActivity {
        setContentView(R.layout.activity_main);

        Client client = new Client(getApplicationContext())
-            .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
+            .setEndpoint("https://<REGION>.cloud.appwrite.io/v1") // Your API Endpoint
            .setProject("5df5acd0d48c2"); // Your project ID

        Account account = new Account(client);
@@ -13,7 +13,7 @@ public class MainActivity extends AppCompatActivity {
        setContentView(R.layout.activity_main);

        Client client = new Client(getApplicationContext())
-            .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
+            .setEndpoint("https://<REGION>.cloud.appwrite.io/v1") // Your API Endpoint
            .setProject("5df5acd0d48c2"); // Your project ID

        Account account = new Account(client);
@@ -13,7 +13,7 @@ public class MainActivity extends AppCompatActivity {
        setContentView(R.layout.activity_main);

        Client client = new Client(getApplicationContext())
-            .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
+            .setEndpoint("https://<REGION>.cloud.appwrite.io/v1") // Your API Endpoint
            .setProject("5df5acd0d48c2"); // Your project ID

        Account account = new Account(client);
@@ -13,7 +13,7 @@ public class MainActivity extends AppCompatActivity {
        setContentView(R.layout.activity_main);

        Client client = new Client(getApplicationContext())
-            .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
+            .setEndpoint("https://<REGION>.cloud.appwrite.io/v1") // Your API Endpoint
            .setProject("5df5acd0d48c2"); // Your project ID

        Account account = new Account(client);
@@ -13,7 +13,7 @@ public class MainActivity extends AppCompatActivity {
        setContentView(R.layout.activity_main);

        Client client = new Client(getApplicationContext())
-            .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
+            .setEndpoint("https://<REGION>.cloud.appwrite.io/v1") // Your API Endpoint
            .setProject("5df5acd0d48c2"); // Your project ID

        Account account = new Account(client);
@@ -13,7 +13,7 @@ public class MainActivity extends AppCompatActivity {
        setContentView(R.layout.activity_main);

        Client client = new Client(getApplicationContext())
-            .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
+            .setEndpoint("https://<REGION>.cloud.appwrite.io/v1") // Your API Endpoint
            .setProject("5df5acd0d48c2"); // Your project ID

        Account account = new Account(client);
@@ -13,7 +13,7 @@ public class MainActivity extends AppCompatActivity {
        setContentView(R.layout.activity_main);

        Client client = new Client(getApplicationContext())
-            .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
+            .setEndpoint("https://<REGION>.cloud.appwrite.io/v1") // Your API Endpoint
            .setProject("5df5acd0d48c2"); // Your project ID

        Account account = new Account(client);
@@ -13,7 +13,7 @@ public class MainActivity extends AppCompatActivity {
        setContentView(R.layout.activity_main);

        Client client = new Client(getApplicationContext())
-            .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
+            .setEndpoint("https://<REGION>.cloud.appwrite.io/v1") // Your API Endpoint
            .setProject("5df5acd0d48c2"); // Your project ID

        Account account = new Account(client);
--- a/Show More
+++ b/Show More