Merge branch '1.4.x' of https://github.com/appwrite/appwrite into sync-1.4.x-to-1.5.x

2024-05-20 04:32:37 +12:00 · 2023-10-20 14:55:17 +05:30 · 2023-10-20 14:55:17 +05:30 · 161bbfb822
parent 36d257c847 8e44f350e5
commit 161bbfb822
297 changed files with 58709 additions and 3388 deletions
--- a/.gitmodules
+++ b/.gitmodules
@ -1,4 +1,4 @@
 [submodule "app/console"]
 	path = app/console
 	url = https://github.com/appwrite/console
-	branch = 3.2.1
+	branch = 3.2.3
--- a/CHANGES.md
+++ b/CHANGES.md
@ -1,3 +1,21 @@
+# Version 1.4.6
+
+## Changes
+- Bump console to version 3.2.3 in [#6947](https://github.com/appwrite/appwrite/pull/6947)
+- New health endpoints in [#6319](https://github.com/appwrite/appwrite/pull/6319)
+- 30 second sync executions timeout in [#6370](https://github.com/appwrite/appwrite/pull/6370)
+- Feat db per worker in [#6888](https://github.com/appwrite/appwrite/pull/6888)
+- Feat: Dart 3.1 support in [#6936](https://github.com/appwrite/appwrite/pull/6936)
+- chore: remove resque library and update health check endpoints in [#6946](https://github.com/appwrite/appwrite/pull/6946)
+- Refactor workers in [#6928](https://github.com/appwrite/appwrite/pull/6928)
+
+## Fixes
+- Fix realtime deletes in [#6897](https://github.com/appwrite/appwrite/pull/6897)
+- Update teamInternalId when updating project team in [#6898](https://github.com/appwrite/appwrite/pull/6898)
+- Fix: spanish translations (emails) in [#5290](https://github.com/appwrite/appwrite/pull/5290)
+- chore: fix spec links in [#6434](https://github.com/appwrite/appwrite/pull/6434)
+- Delegate custom deletes in [#6934](https://github.com/appwrite/appwrite/pull/6934)
+
 # Version 1.4.5

 ## Changes
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@ -206,7 +206,6 @@ Appwrite's current structure is a combination of both [Monolithic](https://en.wi
 │       ├── Network
 │       ├── OpenSSL
 │       ├── Promises
-│       ├── Resque
 │       ├── Specification
 │       ├── Task
 │       ├── Template
@ -251,7 +250,6 @@ Appwrite stack is a combination of a variety of open-source technologies and too
 - Imagemagick - for manipulating and managing image media files.
 - Webp - for better compression of images on supporting clients.
 - SMTP - for sending email messages and alerts.
- Resque - for managing data queues and scheduled tasks over a Redis server.

 ## Package Managers

--- a/HACKTOBERFEST.md
+++ b/HACKTOBERFEST.md
@ -0,0 +1,57 @@
+# Appwrite hacktoberfest contribution
+
+Welcome to the Appwrite Hacktoberfest contribution! We appreciate your interest in contributing to our open-source project. Please read this carefully to understand how to get started and make your contributions count.
+
+## Familiarize with the project
+
+Before you start contributing, familiarize yourself with our project by reading the [main README](https://github.com/appwrite/appwrite/blob/main/README.md).
+
+## Code of conduct
+
+Please ensure that you always follow our [Code of Conduct](https://github.com/appwrite/awesome-appwrite/blob/master/CODE_OF_CONDUCT.md). We aim to maintain a respectful and inclusive community.
+
+## Contributing guide
+
+Please review our [Contributing Guide](https://github.com/appwrite/appwrite/blob/main/CONTRIBUTING.md) before contributing. It will help you learn about the architecture, instructions on how to update code, run tests, and submit a PR.
+
+## Hacktoberfest contribution guidelines
+
+To participate in Hacktoberfest with Appwrite, follow these guidelines:
+
+1. **Valid issues**: To make your contribution count, please look for issues labeled with `hacktoberfest`. Only issues labeled with `hacktoberfest` will count as a valid contribution.
+
+2. **Wait for issue assignment**: After you have identified an issue to work on, please wait for it to be assigned to you by our team. We assign issues on a first-come, first-serve basis.
+
+3. **Knowing about labels**:  We do not have the `hacktoberfest` label in our repositories, but we use it on specific issues. For your pull request to be valid, our team will review and add the `hacktoberfest-accepted` label once it meets the criteria.
+
+4. **Discuss new issues**: If you're interested in finding and adding new issues for Hacktoberfest, please discuss it with the team on our [Discord server](https://appwrite.io/discord) in the `#hacktoberfest` channel.
+
+5. **Be patient with pull request reviews**: PR reviews may take up to 15 days due to the volume of contributions. However, we also host PR review parties every week where you can add your PRs for instant review.
+
+6. **Regular updates**: If you've been assigned an issue, it's essential to share updates every 3 days. Failure to do so may result in being unassigned from the issue.
+
+## Getting started
+
+1. Fork the Appwrite repository you'd like to contribute to.
+
+2. Clone your forked repository to your local machine.
+
+   ```bash
+   git clone https://github.com/your-username/repository-name.git
+   ```
+
+3. Create a new branch for your contribution.
+
+   ```bash
+   git checkout -b TYPE-ISSUE_ID-DESCRIPTION
+   ```
+4. Make your changes, commit them, and push them to your forked repository.
+
+   ```bash
+   git commit -m "Add your commit message here"
+   git push origin TYPE-ISSUE_ID-DESCRIPTION
+   ```
+ 
+5. Create a Pull Request (PR) from your forked repository to the Appwrite repository. Be sure to reference the issue you are addressing in your PR description.
+
+Thank you for contributing to Appwrite, and we look forward to your Hacktoberfest contributions! If you have any questions or need assistance, feel free to ask on our Discord server or in the issue discussion. Happy hacking!
--- a/README-CN.md
+++ b/README-CN.md
@ -66,7 +66,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.4.5
+    appwrite/appwrite:1.4.6
 ```

 ### Windows
@ -78,7 +78,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.4.5
+    appwrite/appwrite:1.4.6
 ```

 #### PowerShell
@ -88,7 +88,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.4.5
+    appwrite/appwrite:1.4.6
 ```

 运行后，可以在浏览器上访问 http://localhost 找到 Appwrite 控制台。在非 Linux 的本机主机上完成安装后，服务器可能需要几分钟才能启动。
--- a/README.md
+++ b/README.md
@ -76,7 +76,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.4.5
+    appwrite/appwrite:1.4.6
 ```

 ### Windows
@ -88,7 +88,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.4.5
+    appwrite/appwrite:1.4.6
 ```

 #### PowerShell
@ -98,7 +98,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.4.5
+    appwrite/appwrite:1.4.6
 ```

 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.
--- a/app/cli.php
+++ b/app/cli.php
@ -3,6 +3,8 @@
 require_once __DIR__ . '/init.php';
 require_once __DIR__ . '/controllers/general.php';

+use Appwrite\Event\Delete;
+use Appwrite\Event\Certificate;
 use Appwrite\Event\Func;
 use Appwrite\Platform\Appwrite;
 use Utopia\CLI\CLI;
@ -17,6 +19,7 @@ use Utopia\Database\Database;
 use Utopia\Database\Document;
 use Utopia\Logger\Log;
 use Utopia\Pools\Group;
+use Utopia\Queue\Connection;
 use Utopia\Registry\Registry;

 Authorization::disable();
@ -86,7 +89,7 @@ CLI::setResource('dbForConsole', function ($pools, $cache) {
 CLI::setResource('getProjectDB', function (Group $pools, Database $dbForConsole, $cache) {
    $databases = []; // TODO: @Meldiron This should probably be responsibility of utopia-php/pools

-    $getProjectDB = function (Document $project) use ($pools, $dbForConsole, $cache, &$databases) {
+    return function (Document $project) use ($pools, $dbForConsole, $cache, &$databases) {
        if ($project->isEmpty() || $project->getId() === 'console') {
            return $dbForConsole;
        }
@ -112,8 +115,6 @@ CLI::setResource('getProjectDB', function (Group $pools, Database $dbForConsole,

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

 CLI::setResource('influxdb', function (Registry $register) {
@ -140,10 +141,18 @@ CLI::setResource('influxdb', function (Registry $register) {
    return $database;
 }, ['register']);

-CLI::setResource('queueForFunctions', function (Group $pools) {
-    return new Func($pools->get('queue')->pop()->getResource());
+CLI::setResource('queue', function (Group $pools) {
+    return $pools->get('queue')->pop()->getResource();
 }, ['pools']);
-
+CLI::setResource('queueForFunctions', function (Connection $queue) {
+    return new Func($queue);
+}, ['queue']);
+CLI::setResource('queueForDeletes', function (Connection $queue) {
+    return new Delete($queue);
+}, ['queue']);
+CLI::setResource('queueForCertificates', function (Connection $queue) {
+    return new Certificate($queue);
+}, ['queue']);
 CLI::setResource('logError', function (Registry $register) {
    return function (Throwable $error, string $namespace, string $action) use ($register) {
        $logger = $register->get('logger');
--- a/app/config/errors.php
+++ b/app/config/errors.php
@ -470,12 +470,16 @@ return [
        'description' => 'Database not found',
        'code' => 404
    ],
-
    Exception::DATABASE_ALREADY_EXISTS => [
        'name' => Exception::DATABASE_ALREADY_EXISTS,
        'description' => 'Database already exists',
        'code' => 409
    ],
+    Exception::DATABASE_TIMEOUT => [
+        'name' => Exception::DATABASE_TIMEOUT,
+        'description' => 'Database timed out. Try adjusting your queries or adding an index.',
+        'code' => 408
+    ],

    /** Collections */
    Exception::COLLECTION_NOT_FOUND => [
--- a/app/config/locale/translations/es.json
+++ b/app/config/locale/translations/es.json
@ -2,31 +2,31 @@
    "settings.inspire": "\"El arte de ser sabio es el arte de saber qué pasar por alto\"",
    "settings.locale": "es",
    "settings.direction": "ltr",
-    "emails.sender": "Equipo %s",
+    "emails.sender": "El equipo de %s",
    "emails.verification.subject": "Verificación de cuenta",
-    "emails.verification.hello": "Hola {{user}}",
-    "emails.verification.body": "Haz clic en este enlace para verificar tu correo.",
+    "emails.verification.hello": "Hola, {{name}}",
+    "emails.verification.body": "Haz clic en este enlace para verificar tu correo:",
    "emails.verification.footer": "Si no has solicitado verificar este correo, puedes ignorar este mensaje.",
-    "emails.verification.thanks": "Gracias",
-    "emails.verification.signature": "Equipo de {{project}}",
+    "emails.verification.thanks": "Gracias.",
+    "emails.verification.signature": "El equipo de {{project}}.",
    "emails.magicSession.subject": "Inicio de sesión",
-    "emails.magicSession.hello": "Hola,",
-    "emails.magicSession.body": "Haz clic en este enlace para iniciar sesión.",
-    "emails.magicSession.footer": "Si no has solicitado ingresar usando este correo, puedes ignorar este mensaje.",
-    "emails.magicSession.thanks": "Gracias",
-    "emails.magicSession.signature": "Equipo de {{project}}",
+    "emails.magicSession.hello": "Hola",
+    "emails.magicSession.body": "Haz clic en este enlace para iniciar sesión:",
+    "emails.magicSession.footer": "Si no has solicitado iniciar sesión usando este correo, puedes ignorar este mensaje.",
+    "emails.magicSession.thanks": "Gracias.",
+    "emails.magicSession.signature": "El equipo de {{project}}",
    "emails.recovery.subject": "Restablecer contraseña",
-    "emails.recovery.hello": "Hola {{user}}",
-    "emails.recovery.body": "Haz clic en este enlace para restablecer la contraseña de {{project}}.",
+    "emails.recovery.hello": "Hola, {{name}}",
+    "emails.recovery.body": "Haz clic en este enlace para restablecer la contraseña de {{project}}:",
    "emails.recovery.footer": "Si no has solicitado restablecer la contraseña, puedes ignorar este mensaje.",
-    "emails.recovery.thanks": "Gracias",
-    "emails.recovery.signature": "Equipo de {{project}}",
+    "emails.recovery.thanks": "Gracias.",
+    "emails.recovery.signature": "El equipo de {{project}}",
    "emails.invitation.subject": "Invitación al equipo %s en %s",
    "emails.invitation.hello": "Hola",
-    "emails.invitation.body": "Este correo ha sido enviado a petición de {{owner}} quien quiere invitarte a formar parte del equipo {{team}} en {{project}}.",
-    "emails.invitation.footer": "Si no estas interesado, puedes ignorar este mensaje.",
-    "emails.invitation.thanks": "Gracias",
-    "emails.invitation.signature": "Equipo de {{project}}",
+    "emails.invitation.body": "Este correo ha sido enviado a petición de {{owner}} quién quiere invitarte a formar parte del equipo {{team}} en {{project}}.",
+    "emails.invitation.footer": "Si no estás interesado, puedes ignorar este mensaje.",
+    "emails.invitation.thanks": "Gracias.",
+    "emails.invitation.signature": "El equipo de {{project}}",
    "locale.country.unknown": "Desconocido",
    "countries.af": "Afganistán",
    "countries.ao": "Angola",
@ -229,4 +229,4 @@
    "continents.na": "América del Norte",
    "continents.oc": "Oceanía",
    "continents.sa": "América del Sur"
-}
+}
--- a/app/config/platforms.php
+++ b/app/config/platforms.php
@ -8,7 +8,7 @@ return [
    APP_PLATFORM_CLIENT => [
        'key' => APP_PLATFORM_CLIENT,
        'name' => 'Client',
-        'description' => 'Client libraries for integrating with Appwrite to build client-based applications and websites. Read the [getting started for web](/docs/getting-started-for-web) or [getting started for Flutter](/docs/getting-started-for-flutter) tutorials to start building your first application.',
+        'description' => 'Client libraries for integrating with Appwrite to build client-based applications and websites. Read the [getting started for web](https://appwrite.io/docs/getting-started-for-web) or [getting started for Flutter](https://appwrite.io/docs/getting-started-for-flutter) tutorials to start building your first application.',
        'enabled' => true,
        'beta' => false,
        'sdks' => [
@ -224,7 +224,7 @@ return [
    APP_PLATFORM_SERVER => [
        'key' => APP_PLATFORM_SERVER,
        'name' => 'Server',
-        'description' => 'Libraries for integrating with Appwrite to build server side integrations. Read the [getting started for server](/docs/getting-started-for-server) tutorial to start building your first server integration.',
+        'description' => 'Libraries for integrating with Appwrite to build server side integrations. Read the [getting started for server](https://appwrite.io/docs/getting-started-for-server) tutorial to start building your first server integration.',
        'enabled' => true,
        'beta' => false,
        'sdks' => [
--- a/app/config/specs/open-api3-0.12.x-client.json
+++ b/app/config/specs/open-api3-0.12.x-client.json
--- a/app/config/specs/open-api3-0.12.x-console.json
+++ b/app/config/specs/open-api3-0.12.x-console.json
--- a/app/config/specs/open-api3-0.12.x-server.json
+++ b/app/config/specs/open-api3-0.12.x-server.json
--- a/app/config/specs/open-api3-0.13.x-client.json
+++ b/app/config/specs/open-api3-0.13.x-client.json
--- a/app/config/specs/open-api3-0.13.x-console.json
+++ b/app/config/specs/open-api3-0.13.x-console.json
--- a/app/config/specs/open-api3-0.13.x-server.json
+++ b/app/config/specs/open-api3-0.13.x-server.json
--- a/app/config/specs/open-api3-0.14.x-client.json
+++ b/app/config/specs/open-api3-0.14.x-client.json
--- a/app/config/specs/open-api3-0.14.x-console.json
+++ b/app/config/specs/open-api3-0.14.x-console.json
--- a/app/config/specs/open-api3-0.14.x-server.json
+++ b/app/config/specs/open-api3-0.14.x-server.json
--- a/app/config/specs/open-api3-0.15.x-client.json
+++ b/app/config/specs/open-api3-0.15.x-client.json
--- a/app/config/specs/open-api3-0.15.x-console.json
+++ b/app/config/specs/open-api3-0.15.x-console.json
--- a/app/config/specs/open-api3-0.15.x-server.json
+++ b/app/config/specs/open-api3-0.15.x-server.json
--- a/app/config/specs/open-api3-1.0.x-client.json
+++ b/app/config/specs/open-api3-1.0.x-client.json
--- a/app/config/specs/open-api3-1.0.x-console.json
+++ b/app/config/specs/open-api3-1.0.x-console.json
--- a/app/config/specs/open-api3-1.0.x-server.json
+++ b/app/config/specs/open-api3-1.0.x-server.json
--- a/app/config/specs/open-api3-1.1.x-client.json
+++ b/app/config/specs/open-api3-1.1.x-client.json
--- a/app/config/specs/open-api3-1.1.x-console.json
+++ b/app/config/specs/open-api3-1.1.x-console.json
--- a/app/config/specs/open-api3-1.1.x-server.json
+++ b/app/config/specs/open-api3-1.1.x-server.json
--- a/app/config/specs/open-api3-1.2.x-client.json
+++ b/app/config/specs/open-api3-1.2.x-client.json
--- a/app/config/specs/open-api3-1.2.x-console.json
+++ b/app/config/specs/open-api3-1.2.x-console.json
--- a/app/config/specs/open-api3-1.2.x-server.json
+++ b/app/config/specs/open-api3-1.2.x-server.json
--- a/app/config/specs/open-api3-1.3.x-client.json
+++ b/app/config/specs/open-api3-1.3.x-client.json
--- a/app/config/specs/open-api3-1.3.x-console.json
+++ b/app/config/specs/open-api3-1.3.x-console.json
--- a/app/config/specs/open-api3-1.3.x-server.json
+++ b/app/config/specs/open-api3-1.3.x-server.json
--- a/app/config/specs/open-api3-1.4.x-client.json
+++ b/app/config/specs/open-api3-1.4.x-client.json
--- a/app/config/specs/open-api3-1.4.x-console.json
+++ b/app/config/specs/open-api3-1.4.x-console.json
--- a/app/config/specs/open-api3-1.4.x-server.json
+++ b/app/config/specs/open-api3-1.4.x-server.json
--- a/app/config/specs/open-api3-latest-client.json
+++ b/app/config/specs/open-api3-latest-client.json
--- a/app/config/specs/open-api3-latest-console.json
+++ b/app/config/specs/open-api3-latest-console.json
--- a/app/config/specs/open-api3-latest-server.json
+++ b/app/config/specs/open-api3-latest-server.json
--- a/app/config/specs/swagger2-0.10.x-client.json
+++ b/app/config/specs/swagger2-0.10.x-client.json
--- a/app/config/specs/swagger2-0.10.x-console.json
+++ b/app/config/specs/swagger2-0.10.x-console.json
--- a/app/config/specs/swagger2-0.10.x-server.json
+++ b/app/config/specs/swagger2-0.10.x-server.json
--- a/app/config/specs/swagger2-0.11.x-client.json
+++ b/app/config/specs/swagger2-0.11.x-client.json
--- a/app/config/specs/swagger2-0.11.x-console.json
+++ b/app/config/specs/swagger2-0.11.x-console.json
--- a/app/config/specs/swagger2-0.11.x-server.json
+++ b/app/config/specs/swagger2-0.11.x-server.json
--- a/app/config/specs/swagger2-0.12.x-client.json
+++ b/app/config/specs/swagger2-0.12.x-client.json
--- a/app/config/specs/swagger2-0.12.x-console.json
+++ b/app/config/specs/swagger2-0.12.x-console.json
--- a/app/config/specs/swagger2-0.12.x-server.json
+++ b/app/config/specs/swagger2-0.12.x-server.json
--- a/app/config/specs/swagger2-0.13.x-client.json
+++ b/app/config/specs/swagger2-0.13.x-client.json
--- a/app/config/specs/swagger2-0.13.x-console.json
+++ b/app/config/specs/swagger2-0.13.x-console.json
--- a/app/config/specs/swagger2-0.13.x-server.json
+++ b/app/config/specs/swagger2-0.13.x-server.json
--- a/app/config/specs/swagger2-0.14.x-client.json
+++ b/app/config/specs/swagger2-0.14.x-client.json
--- a/app/config/specs/swagger2-0.14.x-console.json
+++ b/app/config/specs/swagger2-0.14.x-console.json
--- a/app/config/specs/swagger2-0.14.x-server.json
+++ b/app/config/specs/swagger2-0.14.x-server.json
--- a/app/config/specs/swagger2-0.15.x-client.json
+++ b/app/config/specs/swagger2-0.15.x-client.json
--- a/app/config/specs/swagger2-0.15.x-console.json
+++ b/app/config/specs/swagger2-0.15.x-console.json
--- a/app/config/specs/swagger2-0.15.x-server.json
+++ b/app/config/specs/swagger2-0.15.x-server.json
--- a/app/config/specs/swagger2-0.6.x-client.json
+++ b/app/config/specs/swagger2-0.6.x-client.json
--- a/app/config/specs/swagger2-0.6.x-console.json
+++ b/app/config/specs/swagger2-0.6.x-console.json
--- a/app/config/specs/swagger2-0.6.x-server.json
+++ b/app/config/specs/swagger2-0.6.x-server.json
--- a/app/config/specs/swagger2-0.7.x-client.json
+++ b/app/config/specs/swagger2-0.7.x-client.json
--- a/app/config/specs/swagger2-0.7.x-console.json
+++ b/app/config/specs/swagger2-0.7.x-console.json
--- a/app/config/specs/swagger2-0.7.x-server.json
+++ b/app/config/specs/swagger2-0.7.x-server.json
--- a/app/config/specs/swagger2-0.8.x-client.json
+++ b/app/config/specs/swagger2-0.8.x-client.json
--- a/app/config/specs/swagger2-0.8.x-console.json
+++ b/app/config/specs/swagger2-0.8.x-console.json
--- a/app/config/specs/swagger2-0.8.x-server.json
+++ b/app/config/specs/swagger2-0.8.x-server.json
--- a/app/config/specs/swagger2-0.9.x-client.json
+++ b/app/config/specs/swagger2-0.9.x-client.json
--- a/app/config/specs/swagger2-0.9.x-console.json
+++ b/app/config/specs/swagger2-0.9.x-console.json
--- a/app/config/specs/swagger2-0.9.x-server.json
+++ b/app/config/specs/swagger2-0.9.x-server.json
--- a/app/config/specs/swagger2-1.0.x-client.json
+++ b/app/config/specs/swagger2-1.0.x-client.json
--- a/app/config/specs/swagger2-1.0.x-console.json
+++ b/app/config/specs/swagger2-1.0.x-console.json
--- a/app/config/specs/swagger2-1.0.x-server.json
+++ b/app/config/specs/swagger2-1.0.x-server.json
--- a/app/config/specs/swagger2-1.1.x-client.json
+++ b/app/config/specs/swagger2-1.1.x-client.json
--- a/app/config/specs/swagger2-1.1.x-console.json
+++ b/app/config/specs/swagger2-1.1.x-console.json
--- a/app/config/specs/swagger2-1.1.x-server.json
+++ b/app/config/specs/swagger2-1.1.x-server.json
--- a/app/config/specs/swagger2-1.2.x-client.json
+++ b/app/config/specs/swagger2-1.2.x-client.json
--- a/app/config/specs/swagger2-1.2.x-console.json
+++ b/app/config/specs/swagger2-1.2.x-console.json
--- a/app/config/specs/swagger2-1.2.x-server.json
+++ b/app/config/specs/swagger2-1.2.x-server.json
--- a/app/config/specs/swagger2-1.3.x-client.json
+++ b/app/config/specs/swagger2-1.3.x-client.json
--- a/app/config/specs/swagger2-1.3.x-console.json
+++ b/app/config/specs/swagger2-1.3.x-console.json
--- a/app/config/specs/swagger2-1.3.x-server.json
+++ b/app/config/specs/swagger2-1.3.x-server.json
--- a/app/config/specs/swagger2-1.4.x-client.json
+++ b/app/config/specs/swagger2-1.4.x-client.json
--- a/app/config/specs/swagger2-1.4.x-console.json
+++ b/app/config/specs/swagger2-1.4.x-console.json
--- a/app/config/specs/swagger2-1.4.x-server.json
+++ b/app/config/specs/swagger2-1.4.x-server.json
--- a/app/config/specs/swagger2-latest-client.json
+++ b/app/config/specs/swagger2-latest-client.json
--- a/app/config/specs/swagger2-latest-console.json
+++ b/app/config/specs/swagger2-latest-console.json
--- a/app/config/specs/swagger2-latest-server.json
+++ b/app/config/specs/swagger2-latest-server.json
--- a/app/console
+++ b/app/console
@ -1 +1 @@
-Subproject commit 2f47e4e77b3c832679c5a83a604dd7b8e8fc1903
+Subproject commit e9657389879c8d76a9b3a0d3486c1d86f43c3bb9
--- a/app/controllers/api/account.php
+++ b/app/controllers/api/account.php
@ -76,8 +76,9 @@ App::post('/v1/account')
    ->inject('user')
    ->inject('project')
    ->inject('dbForProject')
-    ->inject('events')
-    ->action(function (string $userId, string $email, string $password, string $name, Request $request, Response $response, Document $user, Document $project, Database $dbForProject, Event $events) {
+    ->inject('queueForEvents')
+    ->action(function (string $userId, string $email, string $password, string $name, Request $request, Response $response, Document $user, Document $project, Database $dbForProject, Event $queueForEvents) {
+
        $email = \strtolower($email);
        if ('console' === $project->getId()) {
            $whitelistEmails = $project->getAttribute('authWhitelistEmails');
@ -156,7 +157,7 @@ App::post('/v1/account')
        Authorization::setRole(Role::user($user->getId())->toString());
        Authorization::setRole(Role::users()->toString());

-        $events->setParam('userId', $user->getId());
+        $queueForEvents->setParam('userId', $user->getId());

        $response
            ->setStatusCode(Response::STATUS_CODE_CREATED)
@ -193,8 +194,8 @@ App::post('/v1/account/sessions/email')
    ->inject('project')
    ->inject('locale')
    ->inject('geodb')
-    ->inject('events')
-    ->action(function (string $email, string $password, Request $request, Response $response, Document $user, Database $dbForProject, Document $project, Locale $locale, Reader $geodb, Event $events) {
+    ->inject('queueForEvents')
+    ->action(function (string $email, string $password, Request $request, Response $response, Document $user, Database $dbForProject, Document $project, Locale $locale, Reader $geodb, Event $queueForEvents) {

        $email = \strtolower($email);
        $protocol = $request->getProtocol();
@ -276,7 +277,7 @@ App::post('/v1/account/sessions/email')
            ->setAttribute('expire', $expire)
        ;

-        $events
+        $queueForEvents
            ->setParam('userId', $user->getId())
            ->setParam('sessionId', $session->getId())
        ;
@ -440,8 +441,8 @@ App::get('/v1/account/sessions/oauth2/:provider/redirect')
    ->inject('user')
    ->inject('dbForProject')
    ->inject('geodb')
-    ->inject('events')
-    ->action(function (string $provider, string $code, string $state, string $error, string $error_description, Request $request, Response $response, Document $project, Document $user, Database $dbForProject, Reader $geodb, Event $events) use ($oauthDefaultSuccess) {
+    ->inject('queueForEvents')
+    ->action(function (string $provider, string $code, string $state, string $error, string $error_description, Request $request, Response $response, Document $project, Document $user, Database $dbForProject, Reader $geodb, Event $queueForEvents) use ($oauthDefaultSuccess) {

        $protocol = $request->getProtocol();
        $callback = $protocol . '://' . $request->getHostname() . '/v1/account/sessions/oauth2/callback/' . $provider . '/' . $project->getId();
@ -758,7 +759,7 @@ App::get('/v1/account/sessions/oauth2/:provider/redirect')

        $session->setAttribute('expire', $expire);

-        $events
+        $queueForEvents
            ->setParam('userId', $user->getId())
            ->setParam('sessionId', $session->getId())
            ->setPayload($response->output($session, Response::MODEL_SESSION))
@ -897,9 +898,9 @@ App::post('/v1/account/sessions/magic-url')
    ->inject('project')
    ->inject('dbForProject')
    ->inject('locale')
-    ->inject('events')
-    ->inject('mails')
-    ->action(function (string $userId, string $email, string $url, Request $request, Response $response, Document $user, Document $project, Database $dbForProject, Locale $locale, Event $events, Mail $mails) {
+    ->inject('queueForEvents')
+    ->inject('queueForMails')
+    ->action(function (string $userId, string $email, string $url, Request $request, Response $response, Document $user, Document $project, Database $dbForProject, Locale $locale, Event $queueForEvents, Mail $queueForMails) {

        if (empty(App::getEnv('_APP_SMTP_HOST'))) {
            throw new Exception(Exception::GENERAL_SMTP_DISABLED, 'SMTP disabled');
@ -1020,7 +1021,7 @@ App::post('/v1/account/sessions/magic-url')
                $replyTo = $smtp['replyTo'];
            }

-            $mails
+            $queueForMails
                ->setSmtpHost($smtp['host'] ?? '')
                ->setSmtpPort($smtp['port'] ?? '')
                ->setSmtpUsername($smtp['username'] ?? '')
@ -1042,7 +1043,7 @@ App::post('/v1/account/sessions/magic-url')
                $subject = $customTemplate['subject'] ?? $subject;
            }

-            $mails
+            $queueForMails
                ->setSmtpReplyTo($replyTo)
                ->setSmtpSenderEmail($senderEmail)
                ->setSmtpSenderName($senderName);
@ -1066,14 +1067,14 @@ App::post('/v1/account/sessions/magic-url')
            'redirect' => $url
        ];

-        $mails
+        $queueForMails
            ->setSubject($subject)
            ->setBody($body)
            ->setVariables($emailVariables)
            ->setRecipient($email)
            ->trigger();

-        $events->setPayload(
+        $queueForEvents->setPayload(
            $response->output(
                $token->setAttribute('secret', $loginSecret),
                Response::MODEL_TOKEN
@ -1117,8 +1118,8 @@ App::put('/v1/account/sessions/magic-url')
    ->inject('project')
    ->inject('locale')
    ->inject('geodb')
-    ->inject('events')
-    ->action(function (string $userId, string $secret, Request $request, Response $response, Document $user, Database $dbForProject, Document $project, Locale $locale, Reader $geodb, Event $events) {
+    ->inject('queueForEvents')
+    ->action(function (string $userId, string $secret, Request $request, Response $response, Document $user, Database $dbForProject, Document $project, Locale $locale, Reader $geodb, Event $queueForEvents) {

        /** @var Utopia\Database\Document $user */

@ -1186,7 +1187,7 @@ App::put('/v1/account/sessions/magic-url')
            throw new Exception(Exception::GENERAL_SERVER_ERROR, 'Failed saving user to DB');
        }

-        $events
+        $queueForEvents
            ->setParam('userId', $user->getId())
            ->setParam('sessionId', $session->getId());

@ -1235,10 +1236,10 @@ App::post('/v1/account/sessions/phone')
    ->inject('user')
    ->inject('project')
    ->inject('dbForProject')
-    ->inject('events')
-    ->inject('messaging')
+    ->inject('queueForEvents')
+    ->inject('queueForMessaging')
    ->inject('locale')
-    ->action(function (string $userId, string $phone, Request $request, Response $response, Document $user, Document $project, Database $dbForProject, Event $events, Messaging $messaging, Locale $locale) {
+    ->action(function (string $userId, string $phone, Request $request, Response $response, Document $user, Document $project, Database $dbForProject, Event $queueForEvents, Messaging $queueForMessaging, Locale $locale) {
        $provider = Authorization::skip(fn () => $dbForProject->findOne('providers', [
            Query::equal('default', [true]),
            Query::equal('type', ['sms'])
@ -1354,12 +1355,12 @@ App::post('/v1/account/sessions/phone')
            'providerInternalId' => $provider->getInternalId(),
        ]));

-        $messaging
+        $queueForMessaging
            ->setMessageId($messageDoc->getId())
            ->setProject($project)
            ->trigger();

-        $events->setPayload(
+        $queueForEvents->setPayload(
            $response->output(
                $token->setAttribute('secret', $secret),
                Response::MODEL_TOKEN
@ -1398,8 +1399,8 @@ App::put('/v1/account/sessions/phone')
    ->inject('project')
    ->inject('locale')
    ->inject('geodb')
-    ->inject('events')
-    ->action(function (string $userId, string $secret, Request $request, Response $response, Document $user, Database $dbForProject, Document $project, Locale $locale, Reader $geodb, Event $events) {
+    ->inject('queueForEvents')
+    ->action(function (string $userId, string $secret, Request $request, Response $response, Document $user, Database $dbForProject, Document $project, Locale $locale, Reader $geodb, Event $queueForEvents) {

        $userFromRequest = Authorization::skip(fn() => $dbForProject->getDocument('users', $userId));

@ -1463,7 +1464,7 @@ App::put('/v1/account/sessions/phone')
            throw new Exception(Exception::GENERAL_SERVER_ERROR, 'Failed saving user to DB');
        }

-        $events
+        $queueForEvents
            ->setParam('userId', $user->getId())
            ->setParam('sessionId', $session->getId())
        ;
@ -1518,8 +1519,8 @@ App::post('/v1/account/sessions/anonymous')
    ->inject('project')
    ->inject('dbForProject')
    ->inject('geodb')
-    ->inject('events')
-    ->action(function (Request $request, Response $response, Locale $locale, Document $user, Document $project, Database $dbForProject, Reader $geodb, Event $events) {
+    ->inject('queueForEvents')
+    ->action(function (Request $request, Response $response, Locale $locale, Document $user, Document $project, Database $dbForProject, Reader $geodb, Event $queueForEvents) {

        $protocol = $request->getProtocol();

@ -1602,7 +1603,7 @@ App::post('/v1/account/sessions/anonymous')

        $dbForProject->deleteCachedDocument('users', $user->getId());

-        $events
+        $queueForEvents
            ->setParam('userId', $user->getId())
            ->setParam('sessionId', $session->getId())
        ;
@ -1886,14 +1887,14 @@ App::patch('/v1/account/name')
    ->inject('response')
    ->inject('user')
    ->inject('dbForProject')
-    ->inject('events')
-    ->action(function (string $name, ?\DateTime $requestTimestamp, Response $response, Document $user, Database $dbForProject, Event $events) {
+    ->inject('queueForEvents')
+    ->action(function (string $name, ?\DateTime $requestTimestamp, Response $response, Document $user, Database $dbForProject, Event $queueForEvents) {

        $user->setAttribute('name', $name);

        $user = $dbForProject->withRequestTimestamp($requestTimestamp, fn () => $dbForProject->updateDocument('users', $user->getId(), $user));

-        $events->setParam('userId', $user->getId());
+        $queueForEvents->setParam('userId', $user->getId());

        $response->dynamic($user, Response::MODEL_ACCOUNT);
    });
@ -1923,8 +1924,8 @@ App::patch('/v1/account/password')
    ->inject('user')
    ->inject('project')
    ->inject('dbForProject')
-    ->inject('events')
-    ->action(function (string $password, string $oldPassword, ?\DateTime $requestTimestamp, Response $response, Document $user, Document $project, Database $dbForProject, Event $events) {
+    ->inject('queueForEvents')
+    ->action(function (string $password, string $oldPassword, ?\DateTime $requestTimestamp, Response $response, Document $user, Document $project, Database $dbForProject, Event $queueForEvents) {

        // Check old password only if its an existing user.
        if (!empty($user->getAttribute('passwordUpdate')) && !Auth::passwordVerify($oldPassword, $user->getAttribute('password'), $user->getAttribute('hash'), $user->getAttribute('hashOptions'))) { // Double check user password
@ -1960,7 +1961,7 @@ App::patch('/v1/account/password')

        $user = $dbForProject->withRequestTimestamp($requestTimestamp, fn () => $dbForProject->updateDocument('users', $user->getId(), $user));

-        $events->setParam('userId', $user->getId());
+        $queueForEvents->setParam('userId', $user->getId());

        $response->dynamic($user, Response::MODEL_ACCOUNT);
    });
@ -1988,8 +1989,8 @@ App::patch('/v1/account/email')
    ->inject('response')
    ->inject('user')
    ->inject('dbForProject')
-    ->inject('events')
-    ->action(function (string $email, string $password, ?\DateTime $requestTimestamp, Response $response, Document $user, Database $dbForProject, Event $events) {
+    ->inject('queueForEvents')
+    ->action(function (string $email, string $password, ?\DateTime $requestTimestamp, Response $response, Document $user, Database $dbForProject, Event $queueForEvents) {
        // passwordUpdate will be empty if the user has never set a password
        $passwordUpdate = $user->getAttribute('passwordUpdate');

@ -2030,7 +2031,7 @@ App::patch('/v1/account/email')
            throw new Exception(Exception::USER_EMAIL_ALREADY_EXISTS);
        }

-        $events->setParam('userId', $user->getId());
+        $queueForEvents->setParam('userId', $user->getId());

        $response->dynamic($user, Response::MODEL_ACCOUNT);
    });
@ -2058,8 +2059,8 @@ App::patch('/v1/account/phone')
    ->inject('response')
    ->inject('user')
    ->inject('dbForProject')
-    ->inject('events')
-    ->action(function (string $phone, string $password, ?\DateTime $requestTimestamp, Response $response, Document $user, Database $dbForProject, Event $events) {
+    ->inject('queueForEvents')
+    ->action(function (string $phone, string $password, ?\DateTime $requestTimestamp, Response $response, Document $user, Database $dbForProject, Event $queueForEvents) {
        // passwordUpdate will be empty if the user has never set a password
        $passwordUpdate = $user->getAttribute('passwordUpdate');

@ -2089,7 +2090,7 @@ App::patch('/v1/account/phone')
            throw new Exception(Exception::USER_PHONE_ALREADY_EXISTS);
        }

-        $events->setParam('userId', $user->getId());
+        $queueForEvents->setParam('userId', $user->getId());

        $response->dynamic($user, Response::MODEL_ACCOUNT);
    });
@ -2116,14 +2117,14 @@ App::patch('/v1/account/prefs')
    ->inject('response')
    ->inject('user')
    ->inject('dbForProject')
-    ->inject('events')
-    ->action(function (array $prefs, ?\DateTime $requestTimestamp, Response $response, Document $user, Database $dbForProject, Event $events) {
+    ->inject('queueForEvents')
+    ->action(function (array $prefs, ?\DateTime $requestTimestamp, Response $response, Document $user, Database $dbForProject, Event $queueForEvents) {

        $user->setAttribute('prefs', $prefs);

        $user = $dbForProject->withRequestTimestamp($requestTimestamp, fn () => $dbForProject->updateDocument('users', $user->getId(), $user));

-        $events->setParam('userId', $user->getId());
+        $queueForEvents->setParam('userId', $user->getId());

        $response->dynamic($user, Response::MODEL_ACCOUNT);
    });
@ -2148,14 +2149,14 @@ App::patch('/v1/account/status')
    ->inject('response')
    ->inject('user')
    ->inject('dbForProject')
-    ->inject('events')
-    ->action(function (?\DateTime $requestTimestamp, Request $request, Response $response, Document $user, Database $dbForProject, Event $events) {
+    ->inject('queueForEvents')
+    ->action(function (?\DateTime $requestTimestamp, Request $request, Response $response, Document $user, Database $dbForProject, Event $queueForEvents) {

        $user->setAttribute('status', false);

        $user = $dbForProject->withRequestTimestamp($requestTimestamp, fn () => $dbForProject->updateDocument('users', $user->getId(), $user));

-        $events
+        $queueForEvents
            ->setParam('userId', $user->getId())
            ->setPayload($response->output($user, Response::MODEL_ACCOUNT));

@ -2194,9 +2195,9 @@ App::delete('/v1/account/sessions/:sessionId')
    ->inject('user')
    ->inject('dbForProject')
    ->inject('locale')
-    ->inject('events')
+    ->inject('queueForEvents')
    ->inject('project')
-    ->action(function (?string $sessionId, ?\DateTime $requestTimestamp, Request $request, Response $response, Document $user, Database $dbForProject, Locale $locale, Event $events, Document $project) {
+    ->action(function (?string $sessionId, ?\DateTime $requestTimestamp, Request $request, Response $response, Document $user, Database $dbForProject, Locale $locale, Event $queueForEvents, Document $project) {

        $protocol = $request->getProtocol();
        $authDuration = $project->getAttribute('auths', [])['duration'] ?? Auth::TOKEN_EXPIRATION_LOGIN_LONG;
@ -2236,7 +2237,7 @@ App::delete('/v1/account/sessions/:sessionId')

                $dbForProject->deleteCachedDocument('users', $user->getId());

-                $events
+                $queueForEvents
                    ->setParam('userId', $user->getId())
                    ->setParam('sessionId', $session->getId())
                    ->setPayload($response->output($session, Response::MODEL_SESSION))
@ -2272,8 +2273,8 @@ App::patch('/v1/account/sessions/:sessionId')
    ->inject('dbForProject')
    ->inject('project')
    ->inject('locale')
-    ->inject('events')
-    ->action(function (?string $sessionId, Request $request, Response $response, Document $user, Database $dbForProject, Document $project, Locale $locale, Event $events) {
+    ->inject('queueForEvents')
+    ->action(function (?string $sessionId, Request $request, Response $response, Document $user, Database $dbForProject, Document $project, Locale $locale, Event $queueForEvents) {
        $authDuration = $project->getAttribute('auths', [])['duration'] ?? Auth::TOKEN_EXPIRATION_LOGIN_LONG;
        $sessionId = ($sessionId === 'current')
            ? Auth::sessionVerify($user->getAttribute('sessions'), Auth::$secret, $authDuration)
@ -2321,7 +2322,7 @@ App::patch('/v1/account/sessions/:sessionId')

                $session->setAttribute('expire', DateTime::formatTz(DateTime::addSeconds(new \DateTime($session->getCreatedAt()), $authDuration)));

-                $events
+                $queueForEvents
                    ->setParam('userId', $user->getId())
                    ->setParam('sessionId', $session->getId())
                    ->setPayload($response->output($session, Response::MODEL_SESSION))
@ -2354,8 +2355,8 @@ App::delete('/v1/account/sessions')
    ->inject('user')
    ->inject('dbForProject')
    ->inject('locale')
-    ->inject('events')
-    ->action(function (Request $request, Response $response, Document $user, Database $dbForProject, Locale $locale, Event $events) {
+    ->inject('queueForEvents')
+    ->action(function (Request $request, Response $response, Document $user, Database $dbForProject, Locale $locale, Event $queueForEvents) {

        $protocol = $request->getProtocol();
        $sessions = $user->getAttribute('sessions', []);
@ -2382,13 +2383,13 @@ App::delete('/v1/account/sessions')
                    ->addCookie(Auth::$cookieName, '', \time() - 3600, '/', Config::getParam('cookieDomain'), ('https' == $protocol), true, Config::getParam('cookieSamesite'));

                // Use current session for events.
-                $events->setPayload($response->output($session, Response::MODEL_SESSION));
+                $queueForEvents->setPayload($response->output($session, Response::MODEL_SESSION));
            }
        }

        $dbForProject->deleteCachedDocument('users', $user->getId());

-        $events
+        $queueForEvents
            ->setParam('userId', $user->getId())
            ->setParam('sessionId', $session->getId());

@ -2421,9 +2422,9 @@ App::post('/v1/account/recovery')
    ->inject('dbForProject')
    ->inject('project')
    ->inject('locale')
-    ->inject('mails')
-    ->inject('events')
-    ->action(function (string $email, string $url, Request $request, Response $response, Document $user, Database $dbForProject, Document $project, Locale $locale, Mail $mails, Event $events) {
+    ->inject('queueForMails')
+    ->inject('queueForEvents')
+    ->action(function (string $email, string $url, Request $request, Response $response, Document $user, Database $dbForProject, Document $project, Locale $locale, Mail $queueForMails, Event $queueForEvents) {

        if (empty(App::getEnv('_APP_SMTP_HOST'))) {
            throw new Exception(Exception::GENERAL_SMTP_DISABLED, 'SMTP Disabled');
@ -2505,7 +2506,7 @@ App::post('/v1/account/recovery')
                $replyTo = $smtp['replyTo'];
            }

-            $mails
+            $queueForMails
                ->setSmtpHost($smtp['host'] ?? '')
                ->setSmtpPort($smtp['port'] ?? '')
                ->setSmtpUsername($smtp['username'] ?? '')
@ -2527,7 +2528,7 @@ App::post('/v1/account/recovery')
                $subject = $customTemplate['subject'] ?? $subject;
            }

-            $mails
+            $queueForMails
                ->setSmtpReplyTo($replyTo)
                ->setSmtpSenderEmail($senderEmail)
                ->setSmtpSenderName($senderName);
@ -2552,7 +2553,7 @@ App::post('/v1/account/recovery')
        ];


-        $mails
+        $queueForMails
            ->setRecipient($profile->getAttribute('email', ''))
            ->setName($profile->getAttribute('name'))
            ->setBody($body)
@ -2560,7 +2561,7 @@ App::post('/v1/account/recovery')
            ->setSubject($subject)
            ->trigger();

-        $events
+        $queueForEvents
            ->setParam('userId', $profile->getId())
            ->setParam('tokenId', $recovery->getId())
            ->setUser($profile)
@ -2604,8 +2605,8 @@ App::put('/v1/account/recovery')
    ->inject('user')
    ->inject('dbForProject')
    ->inject('project')
-    ->inject('events')
-    ->action(function (string $userId, string $secret, string $password, string $passwordAgain, Response $response, Document $user, Database $dbForProject, Document $project, Event $events) {
+    ->inject('queueForEvents')
+    ->action(function (string $userId, string $secret, string $password, string $passwordAgain, Response $response, Document $user, Database $dbForProject, Document $project, Event $queueForEvents) {
        if ($password !== $passwordAgain) {
            throw new Exception(Exception::USER_PASSWORD_MISMATCH);
        }
@ -2658,7 +2659,7 @@ App::put('/v1/account/recovery')
        $dbForProject->deleteDocument('tokens', $recovery);
        $dbForProject->deleteCachedDocument('users', $profile->getId());

-        $events
+        $queueForEvents
            ->setParam('userId', $profile->getId())
            ->setParam('tokenId', $recoveryDocument->getId())
        ;
@ -2690,9 +2691,9 @@ App::post('/v1/account/verification')
    ->inject('user')
    ->inject('dbForProject')
    ->inject('locale')
-    ->inject('events')
-    ->inject('mails')
-    ->action(function (string $url, Request $request, Response $response, Document $project, Document $user, Database $dbForProject, Locale $locale, Event $events, Mail $mails) {
+    ->inject('queueForEvents')
+    ->inject('queueForMails')
+    ->action(function (string $url, Request $request, Response $response, Document $project, Document $user, Database $dbForProject, Locale $locale, Event $queueForEvents, Mail $queueForMails) {

        if (empty(App::getEnv('_APP_SMTP_HOST'))) {
            throw new Exception(Exception::GENERAL_SMTP_DISABLED, 'SMTP Disabled');
@ -2757,7 +2758,7 @@ App::post('/v1/account/verification')
                $replyTo = $smtp['replyTo'];
            }

-            $mails
+            $queueForMails
                ->setSmtpHost($smtp['host'] ?? '')
                ->setSmtpPort($smtp['port'] ?? '')
                ->setSmtpUsername($smtp['username'] ?? '')
@ -2779,7 +2780,7 @@ App::post('/v1/account/verification')
                $subject = $customTemplate['subject'] ?? $subject;
            }

-            $mails
+            $queueForMails
                ->setSmtpReplyTo($replyTo)
                ->setSmtpSenderEmail($senderEmail)
                ->setSmtpSenderName($senderName);
@ -2803,7 +2804,7 @@ App::post('/v1/account/verification')
            'redirect' => $url
        ];

-        $mails
+        $queueForMails
            ->setSubject($subject)
            ->setBody($body)
            ->setVariables($emailVariables)
@ -2811,7 +2812,7 @@ App::post('/v1/account/verification')
            ->setName($user->getAttribute('name') ?? '')
            ->trigger();

-        $events
+        $queueForEvents
            ->setParam('userId', $user->getId())
            ->setParam('tokenId', $verification->getId())
            ->setPayload($response->output(
@ -2849,8 +2850,8 @@ App::put('/v1/account/verification')
    ->inject('response')
    ->inject('user')
    ->inject('dbForProject')
-    ->inject('events')
-    ->action(function (string $userId, string $secret, Response $response, Document $user, Database $dbForProject, Event $events) {
+    ->inject('queueForEvents')
+    ->action(function (string $userId, string $secret, Response $response, Document $user, Database $dbForProject, Event $queueForEvents) {

        $profile = Authorization::skip(fn() => $dbForProject->getDocument('users', $userId));

@ -2880,7 +2881,7 @@ App::put('/v1/account/verification')
        $dbForProject->deleteDocument('tokens', $verification);
        $dbForProject->deleteCachedDocument('users', $profile->getId());

-        $events
+        $queueForEvents
            ->setParam('userId', $userId)
            ->setParam('tokenId', $verificationDocument->getId())
        ;
@ -2909,11 +2910,11 @@ App::post('/v1/account/verification/phone')
    ->inject('response')
    ->inject('user')
    ->inject('dbForProject')
-    ->inject('events')
-    ->inject('messaging')
+    ->inject('queueForEvents')
+    ->inject('queueForMessaging')
    ->inject('project')
    ->inject('locale')
-    ->action(function (Request $request, Response $response, Document $user, Database $dbForProject, Event $events, Messaging $messaging, Document $project, Locale $locale) {
+    ->action(function (Request $request, Response $response, Document $user, Database $dbForProject, Event $queueForEvents, Messaging $queueForMessaging, Document $project, Locale $locale) {
        $provider = Authorization::skip(fn () => $dbForProject->findOne('providers', [
            Query::equal('default', [true]),
            Query::equal('type', ['sms'])
@ -2989,12 +2990,12 @@ App::post('/v1/account/verification/phone')
            'providerInternalId' => $provider->getInternalId(),
        ]));

-        $messaging
+        $queueForMessaging
            ->setMessageId($messageDoc->getId())
            ->setProject($project)
            ->trigger();

-        $events
+        $queueForEvents
            ->setParam('userId', $user->getId())
            ->setParam('tokenId', $verification->getId())
            ->setPayload($response->output(
@ -3033,8 +3034,8 @@ App::put('/v1/account/verification/phone')
    ->inject('response')
    ->inject('user')
    ->inject('dbForProject')
-    ->inject('events')
-    ->action(function (string $userId, string $secret, Response $response, Document $user, Database $dbForProject, Event $events) {
+    ->inject('queueForEvents')
+    ->action(function (string $userId, string $secret, Response $response, Document $user, Database $dbForProject, Event $queueForEvents) {

        $profile = Authorization::skip(fn() => $dbForProject->getDocument('users', $userId));

@ -3062,7 +3063,7 @@ App::put('/v1/account/verification/phone')
        $dbForProject->deleteDocument('tokens', $verification);
        $dbForProject->deleteCachedDocument('users', $profile->getId());

-        $events
+        $queueForEvents
            ->setParam('userId', $user->getId())
            ->setParam('tokenId', $verificationDocument->getId())
        ;
--- a/app/controllers/api/databases.php
+++ b/app/controllers/api/databases.php
@ -12,21 +12,23 @@ use Appwrite\Utopia\Database\Validator\Queries\Attributes;
 use Appwrite\Utopia\Database\Validator\Queries\Collections;
 use Appwrite\Utopia\Database\Validator\Queries\Databases;
 use Appwrite\Utopia\Database\Validator\Queries\Indexes;
+use Appwrite\Utopia\Request;
 use Appwrite\Utopia\Response;
 use MaxMind\Db\Reader;
 use Utopia\App;
 use Utopia\Audit\Audit;
 use Utopia\Config\Config;
-use Utopia\Database\Adapter\MariaDB;
 use Utopia\Database\Database;
 use Utopia\Database\DateTime;
 use Utopia\Database\Document;
 use Utopia\Database\Exception\Authorization as AuthorizationException;
+use Utopia\Database\Exception\Conflict as ConflictException;
 use Utopia\Database\Exception\Duplicate as DuplicateException;
 use Utopia\Database\Exception\Limit as LimitException;
+use Utopia\Database\Exception\Query as QueryException;
 use Utopia\Database\Exception\Restricted as RestrictedException;
 use Utopia\Database\Exception\Structure as StructureException;
-use Utopia\Database\Exception\Query as QueryException;
+use Utopia\Database\Exception\Timeout as TimeoutException;
 use Utopia\Database\Helpers\ID;
 use Utopia\Database\Helpers\Permission;
 use Utopia\Database\Helpers\Role;
@ -37,8 +39,6 @@ use Utopia\Database\Validator\Index as IndexValidator;
 use Utopia\Database\Validator\Key;
 use Utopia\Database\Validator\Permissions;
 use Utopia\Database\Validator\Queries;
-use Utopia\Database\Validator\Queries\Document as DocumentQueriesValidator;
-use Utopia\Database\Validator\Queries\Documents;
 use Utopia\Database\Validator\Query\Limit;
 use Utopia\Database\Validator\Query\Offset;
 use Utopia\Database\Validator\Structure;
@ -57,13 +57,26 @@ use Utopia\Validator\URL;
 use Utopia\Validator\WhiteList;

 /**
- * Create attribute of varying type
- *
+ * * Create attribute of varying type
 *
+ * @param string $databaseId
+ * @param string $collectionId
+ * @param Document $attribute
+ * @param Response $response
+ * @param Database $dbForProject
+ * @param EventDatabase $queueForDatabase
+ * @param Event $queueForEvents
 * @return Document Newly created attribute document
+ * @throws AuthorizationException
+ * @throws Exception
+ * @throws LimitException
+ * @throws RestrictedException
+ * @throws StructureException
+ * @throws \Utopia\Database\Exception
+ * @throws ConflictException
 * @throws Exception
 */
-function createAttribute(string $databaseId, string $collectionId, Document $attribute, Response $response, Database $dbForProject, EventDatabase $database, Event $events): Document
+function createAttribute(string $databaseId, string $collectionId, Document $attribute, Response $response, Database $dbForProject, EventDatabase $queueForDatabase, Event $queueForEvents): Document
 {
    $key = $attribute->getAttribute('key');
    $type = $attribute->getAttribute('type', '');
@ -193,13 +206,13 @@ function createAttribute(string $databaseId, string $collectionId, Document $att
        $dbForProject->deleteCachedCollection('database_' . $db->getInternalId() . '_collection_' . $relatedCollection->getInternalId());
    }

-    $database
+    $queueForDatabase
        ->setType(DATABASE_TYPE_CREATE_ATTRIBUTE)
        ->setDatabase($db)
        ->setCollection($collection)
        ->setDocument($attribute);

-    $events
+    $queueForEvents
        ->setContext('collection', $collection)
        ->setContext('database', $db)
        ->setParam('databaseId', $databaseId)
@ -216,7 +229,7 @@ function updateAttribute(
    string $collectionId,
    string $key,
    Database $dbForProject,
-    Event $events,
+    Event $queueForEvents,
    string $type,
    string $filter = null,
    string|bool|int|float $default = null,
@ -360,7 +373,7 @@ function updateAttribute(
    $attribute = $dbForProject->updateDocument('attributes', $db->getInternalId() . '_' . $collection->getInternalId() . '_' . $key, $attribute);
    $dbForProject->deleteCachedDocument('database_' . $db->getInternalId(), $collection->getId());

-    $events
+    $queueForEvents
        ->setContext('collection', $collection)
        ->setContext('database', $db)
        ->setParam('databaseId', $databaseId)
@ -370,6 +383,18 @@ function updateAttribute(
    return $attribute;
 }

+App::init()
+    ->groups(['api', 'database'])
+    ->inject('request')
+    ->inject('dbForProject')
+    ->action(function (Request $request, Database $dbForProject) {
+        $timeout = \intval($request->getHeader('x-appwrite-timeout'));
+
+        if (!empty($timeout) && App::isDevelopment()) {
+            $dbForProject->setTimeout($timeout);
+        }
+    });
+
 App::post('/v1/databases')
    ->desc('Create database')
    ->groups(['api', 'database'])
@ -390,8 +415,8 @@ App::post('/v1/databases')
    ->param('enabled', true, new Boolean(), 'Is the database enabled? When set to \'disabled\', users cannot access the database but Server SDKs with an API key can still read and write to the database. No data is lost when this is toggled.', true)
    ->inject('response')
    ->inject('dbForProject')
-    ->inject('events')
-    ->action(function (string $databaseId, string $name, bool $enabled, Response $response, Database $dbForProject, Event $events) {
+    ->inject('queueForEvents')
+    ->action(function (string $databaseId, string $name, bool $enabled, Response $response, Database $dbForProject, Event $queueForEvents) {

        $databaseId = $databaseId == 'unique()' ? ID::unique() : $databaseId;

@ -440,7 +465,7 @@ App::post('/v1/databases')
            throw new Exception(Exception::DATABASE_ALREADY_EXISTS);
        }

-        $events->setParam('databaseId', $database->getId());
+        $queueForEvents->setParam('databaseId', $database->getId());

        $response
            ->setStatusCode(Response::STATUS_CODE_CREATED)
@ -627,8 +652,8 @@ App::put('/v1/databases/:databaseId')
    ->param('enabled', true, new Boolean(), 'Is database enabled? When set to \'disabled\', users cannot access the database but Server SDKs with an API key can still read and write to the database. No data is lost when this is toggled.', true)
    ->inject('response')
    ->inject('dbForProject')
-    ->inject('events')
-    ->action(function (string $databaseId, string $name, bool $enabled, Response $response, Database $dbForProject, Event $events) {
+    ->inject('queueForEvents')
+    ->action(function (string $databaseId, string $name, bool $enabled, Response $response, Database $dbForProject, Event $queueForEvents) {

        $database = $dbForProject->getDocument('databases', $databaseId);

@ -647,7 +672,7 @@ App::put('/v1/databases/:databaseId')
            throw new Exception(Exception::DOCUMENT_INVALID_STRUCTURE, 'Bad structure. ' . $exception->getMessage());
        }

-        $events->setParam('databaseId', $database->getId());
+        $queueForEvents->setParam('databaseId', $database->getId());

        $response->dynamic($database, Response::MODEL_DATABASE);
    });
@ -669,9 +694,9 @@ App::delete('/v1/databases/:databaseId')
    ->param('databaseId', '', new UID(), 'Database ID.')
    ->inject('response')
    ->inject('dbForProject')
-    ->inject('events')
-    ->inject('deletes')
-    ->action(function (string $databaseId, Response $response, Database $dbForProject, Event $events, Delete $deletes) {
+    ->inject('queueForDatabase')
+    ->inject('queueForEvents')
+    ->action(function (string $databaseId, Response $response, Database $dbForProject, EventDatabase $queueForDatabase, Event $queueForEvents) {

        $database = $dbForProject->getDocument('databases', $databaseId);

@ -686,11 +711,11 @@ App::delete('/v1/databases/:databaseId')
        $dbForProject->deleteCachedDocument('databases', $database->getId());
        $dbForProject->deleteCachedCollection('databases_' . $database->getInternalId());

-        $deletes
-            ->setType(DELETE_TYPE_DOCUMENT)
-            ->setDocument($database);
+        $queueForDatabase
+            ->setType(DATABASE_TYPE_DELETE_DATABASE)
+            ->setDatabase($database);

-        $events
+        $queueForEvents
            ->setParam('databaseId', $database->getId())
            ->setPayload($response->output($database, Response::MODEL_DATABASE));

@ -716,14 +741,14 @@ App::post('/v1/databases/:databaseId/collections')
    ->param('databaseId', '', new UID(), 'Database ID.')
    ->param('collectionId', '', new CustomId(), 'Unique 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.')
    ->param('name', '', new Text(128), 'Collection name. Max length: 128 chars.')
-    ->param('permissions', null, new Permissions(APP_LIMIT_ARRAY_PARAMS_SIZE), 'An array of permissions strings. By default, no user is granted with any permissions. [Learn more about permissions](/docs/permissions).', true)
-    ->param('documentSecurity', false, new Boolean(true), 'Enables configuring permissions for individual documents. A user needs one of document or collection level permissions to access a document. [Learn more about permissions](/docs/permissions).', true)
+    ->param('permissions', null, new Permissions(APP_LIMIT_ARRAY_PARAMS_SIZE), 'An array of permissions strings. By default, no user is granted with any permissions. [Learn more about permissions](https://appwrite.io/docs/permissions).', true)
+    ->param('documentSecurity', false, new Boolean(true), 'Enables configuring permissions for individual documents. A user needs one of document or collection level permissions to access a document. [Learn more about permissions](https://appwrite.io/docs/permissions).', true)
    ->param('enabled', true, new Boolean(), 'Is collection enabled? When set to \'disabled\', users cannot access the collection but Server SDKs with and API key can still read and write to the collection. No data is lost when this is toggled.', true)
    ->inject('response')
    ->inject('dbForProject')
    ->inject('mode')
-    ->inject('events')
-    ->action(function (string $databaseId, string $collectionId, string $name, ?array $permissions, bool $documentSecurity, bool $enabled, Response $response, Database $dbForProject, string $mode, Event $events) {
+    ->inject('queueForEvents')
+    ->action(function (string $databaseId, string $collectionId, string $name, ?array $permissions, bool $documentSecurity, bool $enabled, Response $response, Database $dbForProject, string $mode, Event $queueForEvents) {

        $database = Authorization::skip(fn() => $dbForProject->getDocument('databases', $databaseId));

@ -756,7 +781,7 @@ App::post('/v1/databases/:databaseId/collections')
            throw new Exception(Exception::COLLECTION_LIMIT_EXCEEDED);
        }

-        $events
+        $queueForEvents
            ->setContext('database', $database)
            ->setParam('databaseId', $databaseId)
            ->setParam('collectionId', $collection->getId());
@ -977,14 +1002,14 @@ App::put('/v1/databases/:databaseId/collections/:collectionId')
    ->param('databaseId', '', new UID(), 'Database ID.')
    ->param('collectionId', '', new UID(), 'Collection ID.')
    ->param('name', null, new Text(128), 'Collection name. Max length: 128 chars.')
-    ->param('permissions', null, new Permissions(APP_LIMIT_ARRAY_PARAMS_SIZE), 'An array of permission strings. By default, the current permissions are inherited. [Learn more about permissions](/docs/permissions).', true)
-    ->param('documentSecurity', false, new Boolean(true), 'Enables configuring permissions for individual documents. A user needs one of document or collection level permissions to access a document. [Learn more about permissions](/docs/permissions).', true)
+    ->param('permissions', null, new Permissions(APP_LIMIT_ARRAY_PARAMS_SIZE), 'An array of permission strings. By default, the current permissions are inherited. [Learn more about permissions](https://appwrite.io/docs/permissions).', true)
+    ->param('documentSecurity', false, new Boolean(true), 'Enables configuring permissions for individual documents. A user needs one of document or collection level permissions to access a document. [Learn more about permissions](https://appwrite.io/docs/permissions).', true)
    ->param('enabled', true, new Boolean(), 'Is collection enabled? When set to \'disabled\', users cannot access the collection but Server SDKs with and API key can still read and write to the collection. No data is lost when this is toggled.', true)
    ->inject('response')
    ->inject('dbForProject')
    ->inject('mode')
-    ->inject('events')
-    ->action(function (string $databaseId, string $collectionId, string $name, ?array $permissions, bool $documentSecurity, bool $enabled, Response $response, Database $dbForProject, string $mode, Event $events) {
+    ->inject('queueForEvents')
+    ->action(function (string $databaseId, string $collectionId, string $name, ?array $permissions, bool $documentSecurity, bool $enabled, Response $response, Database $dbForProject, string $mode, Event $queueForEvents) {

        $database = Authorization::skip(fn() => $dbForProject->getDocument('databases', $databaseId));

@ -1019,7 +1044,7 @@ App::put('/v1/databases/:databaseId/collections/:collectionId')
            throw new Exception(Exception::DOCUMENT_INVALID_STRUCTURE, 'Bad structure. ' . $exception->getMessage());
        }

-        $events
+        $queueForEvents
            ->setContext('database', $database)
            ->setParam('databaseId', $databaseId)
            ->setParam('collectionId', $collection->getId());
@ -1047,10 +1072,10 @@ App::delete('/v1/databases/:databaseId/collections/:collectionId')
    ->param('collectionId', '', new UID(), 'Collection ID.')
    ->inject('response')
    ->inject('dbForProject')
+    ->inject('queueForDatabase')
+    ->inject('queueForEvents')
    ->inject('mode')
-    ->inject('events')
-    ->inject('deletes')
-    ->action(function (string $databaseId, string $collectionId, Response $response, Database $dbForProject, string $mode, Event $events, Delete $deletes) {
+    ->action(function (string $databaseId, string $collectionId, Response $response, Database $dbForProject, EventDatabase $queueForDatabase, Event $queueForEvents, string $mode) {

        $database = Authorization::skip(fn() => $dbForProject->getDocument('databases', $databaseId));

@ -1070,11 +1095,12 @@ App::delete('/v1/databases/:databaseId/collections/:collectionId')

        $dbForProject->deleteCachedCollection('database_' . $database->getInternalId() . '_collection_' . $collection->getInternalId());

-        $deletes
-            ->setType(DELETE_TYPE_DOCUMENT)
-            ->setDocument($collection);
+        $queueForDatabase
+            ->setType(DATABASE_TYPE_DELETE_COLLECTION)
+            ->setDatabase($database)
+            ->setCollection($collection);

-        $events
+        $queueForEvents
            ->setContext('database', $database)
            ->setParam('databaseId', $databaseId)
            ->setParam('collectionId', $collection->getId())
@ -1110,9 +1136,9 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/string
    ->param('encrypt', false, new Boolean(), 'Toggle encryption for the attribute. Encryption enhances security by not storing any plain text values in the database. However, encrypted attributes cannot be queried.', true)
    ->inject('response')
    ->inject('dbForProject')
-    ->inject('database')
-    ->inject('events')
-    ->action(function (string $databaseId, string $collectionId, string $key, ?int $size, ?bool $required, ?string $default, bool $array, bool $encrypt, Response $response, Database $dbForProject, EventDatabase $database, Event $events) {
+    ->inject('queueForDatabase')
+    ->inject('queueForEvents')
+    ->action(function (string $databaseId, string $collectionId, string $key, ?int $size, ?bool $required, ?string $default, bool $array, bool $encrypt, Response $response, Database $dbForProject, EventDatabase $queueForDatabase, Event $queueForEvents) {

        // Ensure attribute default is within required size
        $validator = new Text($size, 0);
@ -1134,7 +1160,7 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/string
            'default' => $default,
            'array' => $array,
            'filters' => $filters,
-        ]), $response, $dbForProject, $database, $events);
+        ]), $response, $dbForProject, $queueForDatabase, $queueForEvents);

        $response
            ->setStatusCode(Response::STATUS_CODE_ACCEPTED)
@ -1166,9 +1192,9 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/email'
    ->param('array', false, new Boolean(), 'Is attribute an array?', true)
    ->inject('response')
    ->inject('dbForProject')
-    ->inject('database')
-    ->inject('events')
-    ->action(function (string $databaseId, string $collectionId, string $key, ?bool $required, ?string $default, bool $array, Response $response, Database $dbForProject, EventDatabase $database, Event $events) {
+    ->inject('queueForDatabase')
+    ->inject('queueForEvents')
+    ->action(function (string $databaseId, string $collectionId, string $key, ?bool $required, ?string $default, bool $array, Response $response, Database $dbForProject, EventDatabase $queueForDatabase, Event $queueForEvents) {

        $attribute = createAttribute($databaseId, $collectionId, new Document([
            'key' => $key,
@ -1178,7 +1204,7 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/email'
            'default' => $default,
            'array' => $array,
            'format' => APP_DATABASE_ATTRIBUTE_EMAIL,
-        ]), $response, $dbForProject, $database, $events);
+        ]), $response, $dbForProject, $queueForDatabase, $queueForEvents);

        $response
            ->setStatusCode(Response::STATUS_CODE_ACCEPTED)
@ -1211,10 +1237,9 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/enum')
    ->param('array', false, new Boolean(), 'Is attribute an array?', true)
    ->inject('response')
    ->inject('dbForProject')
-    ->inject('database')
-    ->inject('events')
-    ->action(function (string $databaseId, string $collectionId, string $key, array $elements, ?bool $required, ?string $default, bool $array, Response $response, Database $dbForProject, EventDatabase $database, Event $events) {
-
+    ->inject('queueForDatabase')
+    ->inject('queueForEvents')
+    ->action(function (string $databaseId, string $collectionId, string $key, array $elements, ?bool $required, ?string $default, bool $array, Response $response, Database $dbForProject, EventDatabase $queueForDatabase, Event $queueForEvents) {
        // use length of longest string as attribute size
        $size = 0;
        foreach ($elements as $element) {
@ -1238,7 +1263,7 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/enum')
            'array' => $array,
            'format' => APP_DATABASE_ATTRIBUTE_ENUM,
            'formatOptions' => ['elements' => $elements],
-        ]), $response, $dbForProject, $database, $events);
+        ]), $response, $dbForProject, $queueForDatabase, $queueForEvents);

        $response
            ->setStatusCode(Response::STATUS_CODE_ACCEPTED)
@ -1270,9 +1295,9 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/ip')
    ->param('array', false, new Boolean(), 'Is attribute an array?', true)
    ->inject('response')
    ->inject('dbForProject')
-    ->inject('database')
-    ->inject('events')
-    ->action(function (string $databaseId, string $collectionId, string $key, ?bool $required, ?string $default, bool $array, Response $response, Database $dbForProject, EventDatabase $database, Event $events) {
+    ->inject('queueForDatabase')
+    ->inject('queueForEvents')
+    ->action(function (string $databaseId, string $collectionId, string $key, ?bool $required, ?string $default, bool $array, Response $response, Database $dbForProject, EventDatabase $queueForDatabase, Event $queueForEvents) {

        $attribute = createAttribute($databaseId, $collectionId, new Document([
            'key' => $key,
@ -1282,7 +1307,7 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/ip')
            'default' => $default,
            'array' => $array,
            'format' => APP_DATABASE_ATTRIBUTE_IP,
-        ]), $response, $dbForProject, $database, $events);
+        ]), $response, $dbForProject, $queueForDatabase, $queueForEvents);

        $response
            ->setStatusCode(Response::STATUS_CODE_ACCEPTED)
@ -1314,9 +1339,9 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/url')
    ->param('array', false, new Boolean(), 'Is attribute an array?', true)
    ->inject('response')
    ->inject('dbForProject')
-    ->inject('database')
-    ->inject('events')
-    ->action(function (string $databaseId, string $collectionId, string $key, ?bool $required, ?string $default, bool $array, Response $response, Database $dbForProject, EventDatabase $database, Event $events) {
+    ->inject('queueForDatabase')
+    ->inject('queueForEvents')
+    ->action(function (string $databaseId, string $collectionId, string $key, ?bool $required, ?string $default, bool $array, Response $response, Database $dbForProject, EventDatabase $queueForDatabase, Event $queueForEvents) {

        $attribute = createAttribute($databaseId, $collectionId, new Document([
            'key' => $key,
@ -1326,7 +1351,7 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/url')
            'default' => $default,
            'array' => $array,
            'format' => APP_DATABASE_ATTRIBUTE_URL,
-        ]), $response, $dbForProject, $database, $events);
+        ]), $response, $dbForProject, $queueForDatabase, $queueForEvents);

        $response
            ->setStatusCode(Response::STATUS_CODE_ACCEPTED)
@ -1360,9 +1385,9 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/intege
    ->param('array', false, new Boolean(), 'Is attribute an array?', true)
    ->inject('response')
    ->inject('dbForProject')
-    ->inject('database')
-    ->inject('events')
-    ->action(function (string $databaseId, string $collectionId, string $key, ?bool $required, ?int $min, ?int $max, ?int $default, bool $array, Response $response, Database $dbForProject, EventDatabase $database, Event $events) {
+    ->inject('queueForDatabase')
+    ->inject('queueForEvents')
+    ->action(function (string $databaseId, string $collectionId, string $key, ?bool $required, ?int $min, ?int $max, ?int $default, bool $array, Response $response, Database $dbForProject, EventDatabase $queueForDatabase, Event $queueForEvents) {

        // Ensure attribute default is within range
        $min = (is_null($min)) ? PHP_INT_MIN : \intval($min);
@ -1392,7 +1417,7 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/intege
                'min' => $min,
                'max' => $max,
            ],
-        ]), $response, $dbForProject, $database, $events);
+        ]), $response, $dbForProject, $queueForDatabase, $queueForEvents);

        $formatOptions = $attribute->getAttribute('formatOptions', []);

@ -1433,9 +1458,9 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/float'
    ->param('array', false, new Boolean(), 'Is attribute an array?', true)
    ->inject('response')
    ->inject('dbForProject')
-    ->inject('database')
-    ->inject('events')
-    ->action(function (string $databaseId, string $collectionId, string $key, ?bool $required, ?float $min, ?float $max, ?float $default, bool $array, Response $response, Database $dbForProject, EventDatabase $database, Event $events) {
+    ->inject('queueForDatabase')
+    ->inject('queueForEvents')
+    ->action(function (string $databaseId, string $collectionId, string $key, ?bool $required, ?float $min, ?float $max, ?float $default, bool $array, Response $response, Database $dbForProject, EventDatabase $queueForDatabase, Event $queueForEvents) {

        // Ensure attribute default is within range
        $min = (is_null($min)) ? -PHP_FLOAT_MAX : \floatval($min);
@ -1468,7 +1493,7 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/float'
                'min' => $min,
                'max' => $max,
            ],
-        ]), $response, $dbForProject, $database, $events);
+        ]), $response, $dbForProject, $queueForDatabase, $queueForEvents);

        $formatOptions = $attribute->getAttribute('formatOptions', []);

@ -1507,9 +1532,9 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/boolea
    ->param('array', false, new Boolean(), 'Is attribute an array?', true)
    ->inject('response')
    ->inject('dbForProject')
-    ->inject('database')
-    ->inject('events')
-    ->action(function (string $databaseId, string $collectionId, string $key, ?bool $required, ?bool $default, bool $array, Response $response, Database $dbForProject, EventDatabase $database, Event $events) {
+    ->inject('queueForDatabase')
+    ->inject('queueForEvents')
+    ->action(function (string $databaseId, string $collectionId, string $key, ?bool $required, ?bool $default, bool $array, Response $response, Database $dbForProject, EventDatabase $queueForDatabase, Event $queueForEvents) {

        $attribute = createAttribute($databaseId, $collectionId, new Document([
            'key' => $key,
@ -1518,7 +1543,7 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/boolea
            'required' => $required,
            'default' => $default,
            'array' => $array,
-        ]), $response, $dbForProject, $database, $events);
+        ]), $response, $dbForProject, $queueForDatabase, $queueForEvents);

        $response
            ->setStatusCode(Response::STATUS_CODE_ACCEPTED)
@ -1550,9 +1575,9 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/dateti
    ->param('array', false, new Boolean(), 'Is attribute an array?', true)
    ->inject('response')
    ->inject('dbForProject')
-    ->inject('database')
-    ->inject('events')
-    ->action(function (string $databaseId, string $collectionId, string $key, ?bool $required, ?string $default, bool $array, Response $response, Database $dbForProject, EventDatabase $database, Event $events) {
+    ->inject('queueForDatabase')
+    ->inject('queueForEvents')
+    ->action(function (string $databaseId, string $collectionId, string $key, ?bool $required, ?string $default, bool $array, Response $response, Database $dbForProject, EventDatabase $queueForDatabase, Event $queueForEvents) {

        $filters[] = 'datetime';

@ -1564,7 +1589,7 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/dateti
            'default' => $default,
            'array' => $array,
            'filters' => $filters,
-        ]), $response, $dbForProject, $database, $events);
+        ]), $response, $dbForProject, $queueForDatabase, $queueForEvents);

        $response
            ->setStatusCode(Response::STATUS_CODE_ACCEPTED)
@ -1598,8 +1623,8 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/relati
    ->param('onDelete', Database::RELATION_MUTATE_RESTRICT, new WhiteList([Database::RELATION_MUTATE_CASCADE, Database::RELATION_MUTATE_RESTRICT, Database::RELATION_MUTATE_SET_NULL], true), 'Constraints option', true)
    ->inject('response')
    ->inject('dbForProject')
-    ->inject('database')
-    ->inject('events')
+    ->inject('queueForDatabase')
+    ->inject('queueForEvents')
    ->action(function (
        string $databaseId,
        string $collectionId,
@ -1611,8 +1636,8 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/relati
        string $onDelete,
        Response $response,
        Database $dbForProject,
-        EventDatabase $database,
-        Event $events
+        EventDatabase $queueForDatabase,
+        Event $queueForEvents
    ) {
        $key ??= $relatedCollectionId;
        $twoWayKey ??= $collectionId;
@ -1638,8 +1663,8 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/relati
            ]),
            $response,
            $dbForProject,
-            $database,
-            $events
+            $queueForDatabase,
+            $queueForEvents
        );

        $options = $attribute->getAttribute('options', []);
@ -1827,15 +1852,15 @@ App::patch('/v1/databases/:databaseId/collections/:collectionId/attributes/strin
    ->param('default', null, new Nullable(new Text(0, 0)), 'Default value for attribute when not provided. Cannot be set when attribute is required.')
    ->inject('response')
    ->inject('dbForProject')
-    ->inject('events')
-    ->action(function (string $databaseId, string $collectionId, string $key, ?bool $required, ?string $default, Response $response, Database $dbForProject, Event $events) {
+    ->inject('queueForEvents')
+    ->action(function (string $databaseId, string $collectionId, string $key, ?bool $required, ?string $default, Response $response, Database $dbForProject, Event $queueForEvents) {

        $attribute = updateAttribute(
            databaseId: $databaseId,
            collectionId: $collectionId,
            key: $key,
            dbForProject: $dbForProject,
-            events: $events,
+            queueForEvents: $queueForEvents,
            type: Database::VAR_STRING,
            default: $default,
            required: $required
@ -1868,14 +1893,14 @@ App::patch('/v1/databases/:databaseId/collections/:collectionId/attributes/email
    ->param('default', null, new Nullable(new Email()), 'Default value for attribute when not provided. Cannot be set when attribute is required.')
    ->inject('response')
    ->inject('dbForProject')
-    ->inject('events')
-    ->action(function (string $databaseId, string $collectionId, string $key, ?bool $required, ?string $default, Response $response, Database $dbForProject, Event $events) {
+    ->inject('queueForEvents')
+    ->action(function (string $databaseId, string $collectionId, string $key, ?bool $required, ?string $default, Response $response, Database $dbForProject, Event $queueForEvents) {
        $attribute = updateAttribute(
            databaseId: $databaseId,
            collectionId: $collectionId,
            key: $key,
            dbForProject: $dbForProject,
-            events: $events,
+            queueForEvents: $queueForEvents,
            type: Database::VAR_STRING,
            filter: APP_DATABASE_ATTRIBUTE_EMAIL,
            default: $default,
@ -1910,14 +1935,14 @@ App::patch('/v1/databases/:databaseId/collections/:collectionId/attributes/enum/
    ->param('default', null, new Nullable(new Text(0)), 'Default value for attribute when not provided. Cannot be set when attribute is required.')
    ->inject('response')
    ->inject('dbForProject')
-    ->inject('events')
-    ->action(function (string $databaseId, string $collectionId, string $key, ?array $elements, ?bool $required, ?string $default, Response $response, Database $dbForProject, Event $events) {
+    ->inject('queueForEvents')
+    ->action(function (string $databaseId, string $collectionId, string $key, ?array $elements, ?bool $required, ?string $default, Response $response, Database $dbForProject, Event $queueForEvents) {
        $attribute = updateAttribute(
            databaseId: $databaseId,
            collectionId: $collectionId,
            key: $key,
            dbForProject: $dbForProject,
-            events: $events,
+            queueForEvents: $queueForEvents,
            type: Database::VAR_STRING,
            filter: APP_DATABASE_ATTRIBUTE_ENUM,
            default: $default,
@ -1952,14 +1977,14 @@ App::patch('/v1/databases/:databaseId/collections/:collectionId/attributes/ip/:k
    ->param('default', null, new Nullable(new IP()), 'Default value for attribute when not provided. Cannot be set when attribute is required.')
    ->inject('response')
    ->inject('dbForProject')
-    ->inject('events')
-    ->action(function (string $databaseId, string $collectionId, string $key, ?bool $required, ?string $default, Response $response, Database $dbForProject, Event $events) {
+    ->inject('queueForEvents')
+    ->action(function (string $databaseId, string $collectionId, string $key, ?bool $required, ?string $default, Response $response, Database $dbForProject, Event $queueForEvents) {
        $attribute = updateAttribute(
            databaseId: $databaseId,
            collectionId: $collectionId,
            key: $key,
            dbForProject: $dbForProject,
-            events: $events,
+            queueForEvents: $queueForEvents,
            type: Database::VAR_STRING,
            filter: APP_DATABASE_ATTRIBUTE_IP,
            default: $default,
@ -1993,14 +2018,14 @@ App::patch('/v1/databases/:databaseId/collections/:collectionId/attributes/url/:
    ->param('default', null, new Nullable(new URL()), 'Default value for attribute when not provided. Cannot be set when attribute is required.')
    ->inject('response')
    ->inject('dbForProject')
-    ->inject('events')
-    ->action(function (string $databaseId, string $collectionId, string $key, ?bool $required, ?string $default, Response $response, Database $dbForProject, Event $events) {
+    ->inject('queueForEvents')
+    ->action(function (string $databaseId, string $collectionId, string $key, ?bool $required, ?string $default, Response $response, Database $dbForProject, Event $queueForEvents) {
        $attribute = updateAttribute(
            databaseId: $databaseId,
            collectionId: $collectionId,
            key: $key,
            dbForProject: $dbForProject,
-            events: $events,
+            queueForEvents: $queueForEvents,
            type: Database::VAR_STRING,
            filter: APP_DATABASE_ATTRIBUTE_URL,
            default: $default,
@ -2036,14 +2061,14 @@ App::patch('/v1/databases/:databaseId/collections/:collectionId/attributes/integ
    ->param('default', null, new Nullable(new Integer()), 'Default value for attribute when not provided. Cannot be set when attribute is required.')
    ->inject('response')
    ->inject('dbForProject')
-    ->inject('events')
-    ->action(function (string $databaseId, string $collectionId, string $key, ?bool $required, ?int $min, ?int $max, ?int $default, Response $response, Database $dbForProject, Event $events) {
+    ->inject('queueForEvents')
+    ->action(function (string $databaseId, string $collectionId, string $key, ?bool $required, ?int $min, ?int $max, ?int $default, Response $response, Database $dbForProject, Event $queueForEvents) {
        $attribute = updateAttribute(
            databaseId: $databaseId,
            collectionId: $collectionId,
            key: $key,
            dbForProject: $dbForProject,
-            events: $events,
+            queueForEvents: $queueForEvents,
            type: Database::VAR_INTEGER,
            default: $default,
            required: $required,
@ -2087,14 +2112,14 @@ App::patch('/v1/databases/:databaseId/collections/:collectionId/attributes/float
    ->param('default', null, new Nullable(new FloatValidator()), 'Default value for attribute when not provided. Cannot be set when attribute is required.')
    ->inject('response')
    ->inject('dbForProject')
-    ->inject('events')
-    ->action(function (string $databaseId, string $collectionId, string $key, ?bool $required, ?float $min, ?float $max, ?float $default, Response $response, Database $dbForProject, Event $events) {
+    ->inject('queueForEvents')
+    ->action(function (string $databaseId, string $collectionId, string $key, ?bool $required, ?float $min, ?float $max, ?float $default, Response $response, Database $dbForProject, Event $queueForEvents) {
        $attribute = updateAttribute(
            databaseId: $databaseId,
            collectionId: $collectionId,
            key: $key,
            dbForProject: $dbForProject,
-            events: $events,
+            queueForEvents: $queueForEvents,
            type: Database::VAR_FLOAT,
            default: $default,
            required: $required,
@ -2136,14 +2161,14 @@ App::patch('/v1/databases/:databaseId/collections/:collectionId/attributes/boole
    ->param('default', null, new Nullable(new Boolean()), 'Default value for attribute when not provided. Cannot be set when attribute is required.')
    ->inject('response')
    ->inject('dbForProject')
-    ->inject('events')
-    ->action(function (string $databaseId, string $collectionId, string $key, ?bool $required, ?bool $default, Response $response, Database $dbForProject, Event $events) {
+    ->inject('queueForEvents')
+    ->action(function (string $databaseId, string $collectionId, string $key, ?bool $required, ?bool $default, Response $response, Database $dbForProject, Event $queueForEvents) {
        $attribute = updateAttribute(
            databaseId: $databaseId,
            collectionId: $collectionId,
            key: $key,
            dbForProject: $dbForProject,
-            events: $events,
+            queueForEvents: $queueForEvents,
            type: Database::VAR_BOOLEAN,
            default: $default,
            required: $required
@ -2176,14 +2201,14 @@ App::patch('/v1/databases/:databaseId/collections/:collectionId/attributes/datet
    ->param('default', null, new Nullable(new DatetimeValidator()), 'Default value for attribute when not provided. Cannot be set when attribute is required.')
    ->inject('response')
    ->inject('dbForProject')
-    ->inject('events')
-    ->action(function (string $databaseId, string $collectionId, string $key, ?bool $required, ?string $default, Response $response, Database $dbForProject, Event $events) {
+    ->inject('queueForEvents')
+    ->action(function (string $databaseId, string $collectionId, string $key, ?bool $required, ?string $default, Response $response, Database $dbForProject, Event $queueForEvents) {
        $attribute = updateAttribute(
            databaseId: $databaseId,
            collectionId: $collectionId,
            key: $key,
            dbForProject: $dbForProject,
-            events: $events,
+            queueForEvents: $queueForEvents,
            type: Database::VAR_DATETIME,
            default: $default,
            required: $required
@ -2215,7 +2240,7 @@ App::patch('/v1/databases/:databaseId/collections/:collectionId/attributes/:key/
    ->param('onDelete', null, new WhiteList([Database::RELATION_MUTATE_CASCADE, Database::RELATION_MUTATE_RESTRICT, Database::RELATION_MUTATE_SET_NULL], true), 'Constraints option', true)
    ->inject('response')
    ->inject('dbForProject')
-    ->inject('events')
+    ->inject('queueForEvents')
    ->action(function (
        string $databaseId,
        string $collectionId,
@ -2223,14 +2248,14 @@ App::patch('/v1/databases/:databaseId/collections/:collectionId/attributes/:key/
        ?string $onDelete,
        Response $response,
        Database $dbForProject,
-        Event $events
+        Event $queueForEvents
    ) {
        $attribute = updateAttribute(
            $databaseId,
            $collectionId,
            $key,
            $dbForProject,
-            $events,
+            $queueForEvents,
            type: Database::VAR_RELATIONSHIP,
            required: false,
            options: [
@ -2254,7 +2279,7 @@ App::delete('/v1/databases/:databaseId/collections/:collectionId/attributes/:key
    ->desc('Delete attribute')
    ->groups(['api', 'database', 'schema'])
    ->label('scope', 'collections.write')
-    ->label('event', 'databases.[databaseId].collections.[collectionId].attributes.[attributeId].delete')
+    ->label('event', 'databases.[databaseId].collections.[collectionId].attributes.[attributeId].update')
    ->label('audits.event', 'attribute.delete')
    ->label('audits.resource', 'database/{request.databaseId}/collection/{request.collectionId}')
    ->label('usage.metric', 'collections.{scope}.requests.update')
@ -2270,9 +2295,9 @@ App::delete('/v1/databases/:databaseId/collections/:collectionId/attributes/:key
    ->param('key', '', new Key(), 'Attribute Key.')
    ->inject('response')
    ->inject('dbForProject')
-    ->inject('database')
-    ->inject('events')
-    ->action(function (string $databaseId, string $collectionId, string $key, Response $response, Database $dbForProject, EventDatabase $database, Event $events) {
+    ->inject('queueForDatabase')
+    ->inject('queueForEvents')
+    ->action(function (string $databaseId, string $collectionId, string $key, Response $response, Database $dbForProject, EventDatabase $queueForDatabase, Event $queueForEvents) {

        $db = Authorization::skip(fn() => $dbForProject->getDocument('databases', $databaseId));

@ -2323,7 +2348,7 @@ App::delete('/v1/databases/:databaseId/collections/:collectionId/attributes/:key
            }
        }

-        $database
+        $queueForDatabase
            ->setType(DATABASE_TYPE_DELETE_ATTRIBUTE)
            ->setCollection($collection)
            ->setDatabase($db)
@ -2349,7 +2374,7 @@ App::delete('/v1/databases/:databaseId/collections/:collectionId/attributes/:key
            default => Response::MODEL_ATTRIBUTE,
        };

-        $events
+        $queueForEvents
            ->setParam('databaseId', $databaseId)
            ->setParam('collectionId', $collection->getId())
            ->setParam('attributeId', $attribute->getId())
@ -2385,9 +2410,9 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/indexes')
    ->param('orders', [], new ArrayList(new WhiteList(['ASC', 'DESC'], false, Database::VAR_STRING), APP_LIMIT_ARRAY_PARAMS_SIZE), 'Array of index orders. Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' orders are allowed.', true)
    ->inject('response')
    ->inject('dbForProject')
-    ->inject('database')
-    ->inject('events')
-    ->action(function (string $databaseId, string $collectionId, string $key, string $type, array $attributes, array $orders, Response $response, Database $dbForProject, EventDatabase $database, Event $events) {
+    ->inject('queueForDatabase')
+    ->inject('queueForEvents')
+    ->action(function (string $databaseId, string $collectionId, string $key, string $type, array $attributes, array $orders, Response $response, Database $dbForProject, EventDatabase $queueForDatabase, Event $queueForEvents) {

        $db = Authorization::skip(fn() => $dbForProject->getDocument('databases', $databaseId));

@ -2505,13 +2530,13 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/indexes')

        $dbForProject->deleteCachedDocument('database_' . $db->getInternalId(), $collectionId);

-        $database
+        $queueForDatabase
            ->setType(DATABASE_TYPE_CREATE_INDEX)
            ->setDatabase($db)
            ->setCollection($collection)
            ->setDocument($index);

-        $events
+        $queueForEvents
            ->setParam('databaseId', $databaseId)
            ->setParam('collectionId', $collection->getId())
            ->setParam('indexId', $index->getId())
@ -2634,7 +2659,7 @@ App::delete('/v1/databases/:databaseId/collections/:collectionId/indexes/:key')
    ->desc('Delete index')
    ->groups(['api', 'database'])
    ->label('scope', 'collections.write')
-    ->label('event', 'databases.[databaseId].collections.[collectionId].indexes.[indexId].delete')
+    ->label('event', 'databases.[databaseId].collections.[collectionId].indexes.[indexId].update')
    ->label('audits.event', 'index.delete')
    ->label('audits.resource', 'database/{request.databaseId}/collection/{request.collectionId}')
    ->label('usage.metric', 'collections.{scope}.requests.update')
@ -2650,9 +2675,9 @@ App::delete('/v1/databases/:databaseId/collections/:collectionId/indexes/:key')
    ->param('key', '', new Key(), 'Index Key.')
    ->inject('response')
    ->inject('dbForProject')
-    ->inject('database')
-    ->inject('events')
-    ->action(function (string $databaseId, string $collectionId, string $key, Response $response, Database $dbForProject, EventDatabase $database, Event $events) {
+    ->inject('queueForDatabase')
+    ->inject('queueForEvents')
+    ->action(function (string $databaseId, string $collectionId, string $key, Response $response, Database $dbForProject, EventDatabase $queueForDatabase, Event $queueForEvents) {

        $db = Authorization::skip(fn() => $dbForProject->getDocument('databases', $databaseId));

@ -2678,13 +2703,13 @@ App::delete('/v1/databases/:databaseId/collections/:collectionId/indexes/:key')

        $dbForProject->deleteCachedDocument('database_' . $db->getInternalId(), $collectionId);

-        $database
+        $queueForDatabase
            ->setType(DATABASE_TYPE_DELETE_INDEX)
            ->setDatabase($db)
            ->setCollection($collection)
            ->setDocument($index);

-        $events
+        $queueForEvents
            ->setParam('databaseId', $databaseId)
            ->setParam('collectionId', $collection->getId())
            ->setParam('indexId', $index->getId())
@ -2721,13 +2746,13 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/documents')
    ->param('documentId', '', new CustomId(), 'Document 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.')
    ->param('collectionId', '', new UID(), 'Collection ID. You can create a new collection using the Database service [server integration](https://appwrite.io/docs/server/databases#databasesCreateCollection). Make sure to define attributes before creating documents.')
    ->param('data', [], new JSON(), 'Document data as JSON object.')
-    ->param('permissions', null, new Permissions(APP_LIMIT_ARRAY_PARAMS_SIZE, [Database::PERMISSION_READ, Database::PERMISSION_UPDATE, Database::PERMISSION_DELETE, Database::PERMISSION_WRITE]), 'An array of permissions strings. By default, only the current user is granted all permissions. [Learn more about permissions](/docs/permissions).', true)
+    ->param('permissions', null, new Permissions(APP_LIMIT_ARRAY_PARAMS_SIZE, [Database::PERMISSION_READ, Database::PERMISSION_UPDATE, Database::PERMISSION_DELETE, Database::PERMISSION_WRITE]), 'An array of permissions strings. By default, only the current user is granted all permissions. [Learn more about permissions](https://appwrite.io/docs/permissions).', true)
    ->inject('response')
    ->inject('dbForProject')
    ->inject('user')
-    ->inject('events')
+    ->inject('queueForEvents')
    ->inject('mode')
-    ->action(function (string $databaseId, string $documentId, string $collectionId, string|array $data, ?array $permissions, Response $response, Database $dbForProject, Document $user, Event $events, string $mode) {
+    ->action(function (string $databaseId, string $documentId, string $collectionId, string|array $data, ?array $permissions, Response $response, Database $dbForProject, Document $user, Event $queueForEvents, string $mode) {

        $data = (\is_string($data)) ? \json_decode($data, true) : $data; // Cast to JSON array

@ -2923,12 +2948,13 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/documents')

        $processDocument($collection, $document);

-        $events
+        $queueForEvents
            ->setParam('databaseId', $databaseId)
            ->setParam('collectionId', $collection->getId())
            ->setParam('documentId', $document->getId())
            ->setContext('collection', $collection)
-            ->setContext('database', $database);
+            ->setContext('database', $database)
+        ;

        $response
            ->setStatusCode(Response::STATUS_CODE_CREATED)
@ -3284,13 +3310,13 @@ App::patch('/v1/databases/:databaseId/collections/:collectionId/documents/:docum
    ->param('collectionId', '', new UID(), 'Collection ID.')
    ->param('documentId', '', new UID(), 'Document ID.')
    ->param('data', [], new JSON(), 'Document data as JSON object. Include only attribute and value pairs to be updated.', true)
-    ->param('permissions', null, new Permissions(APP_LIMIT_ARRAY_PARAMS_SIZE, [Database::PERMISSION_READ, Database::PERMISSION_UPDATE, Database::PERMISSION_DELETE, Database::PERMISSION_WRITE]), 'An array of permissions strings. By default, the current permissions are inherited. [Learn more about permissions](/docs/permissions).', true)
+    ->param('permissions', null, new Permissions(APP_LIMIT_ARRAY_PARAMS_SIZE, [Database::PERMISSION_READ, Database::PERMISSION_UPDATE, Database::PERMISSION_DELETE, Database::PERMISSION_WRITE]), 'An array of permissions strings. By default, the current permissions are inherited. [Learn more about permissions](https://appwrite.io/docs/permissions).', true)
    ->inject('requestTimestamp')
    ->inject('response')
    ->inject('dbForProject')
-    ->inject('events')
+    ->inject('queueForEvents')
    ->inject('mode')
-    ->action(function (string $databaseId, string $collectionId, string $documentId, string|array $data, ?array $permissions, ?\DateTime $requestTimestamp, Response $response, Database $dbForProject, Event $events, string $mode) {
+    ->action(function (string $databaseId, string $collectionId, string $documentId, string|array $data, ?array $permissions, ?\DateTime $requestTimestamp, Response $response, Database $dbForProject, Event $queueForEvents, string $mode) {

        $data = (\is_string($data)) ? \json_decode($data, true) : $data; // Cast to JSON array

@ -3477,12 +3503,13 @@ App::patch('/v1/databases/:databaseId/collections/:collectionId/documents/:docum

        $processDocument($collection, $document);

-        $events
+        $queueForEvents
            ->setParam('databaseId', $databaseId)
            ->setParam('collectionId', $collection->getId())
            ->setParam('documentId', $document->getId())
            ->setContext('collection', $collection)
-            ->setContext('database', $database);
+            ->setContext('database', $database)
+        ;

        $response->dynamic($document, Response::MODEL_DOCUMENT);
    });
@ -3514,10 +3541,10 @@ App::delete('/v1/databases/:databaseId/collections/:collectionId/documents/:docu
    ->inject('requestTimestamp')
    ->inject('response')
    ->inject('dbForProject')
-    ->inject('events')
-    ->inject('deletes')
+    ->inject('queueForDeletes')
+    ->inject('queueForEvents')
    ->inject('mode')
-    ->action(function (string $databaseId, string $collectionId, string $documentId, ?\DateTime $requestTimestamp, Response $response, Database $dbForProject, Event $events, Delete $deletes, string $mode) {
+    ->action(function (string $databaseId, string $collectionId, string $documentId, ?\DateTime $requestTimestamp, Response $response, Database $dbForProject, Delete $queueForDeletes, Event $queueForEvents, string $mode) {
        $database = Authorization::skip(fn() => $dbForProject->getDocument('databases', $databaseId));

        $isAPIKey = Auth::isAppUser(Authorization::getRoles());
@ -3588,11 +3615,11 @@ App::delete('/v1/databases/:databaseId/collections/:collectionId/documents/:docu

        $processDocument($collection, $document);

-        $deletes
+        $queueForDeletes
            ->setType(DELETE_TYPE_AUDIT)
            ->setDocument($document);

-        $events
+        $queueForEvents
            ->setParam('databaseId', $databaseId)
            ->setParam('collectionId', $collection->getId())
            ->setParam('documentId', $document->getId())
--- a/app/controllers/api/functions.php
+++ b/app/controllers/api/functions.php
@ -6,7 +6,6 @@ use Appwrite\Event\Build;
 use Appwrite\Event\Delete;
 use Appwrite\Event\Event;
 use Appwrite\Event\Func;
-use Appwrite\Event\Usage;
 use Appwrite\Event\Validator\FunctionEvent;
 use Appwrite\Utopia\Response\Model\Rule;
 use Appwrite\Extend\Exception;
@ -50,7 +49,7 @@ use Utopia\VCS\Adapter\Git\GitHub;

 include_once __DIR__ . '/../shared/api.php';

-$redeployVcs = function (Request $request, Document $function, Document $project, Document $installation, Database $dbForProject, Document $template, GitHub $github) {
+$redeployVcs = function (Request $request, Document $function, Document $project, Document $installation, Database $dbForProject, Build $queueForBuilds, Document $template, GitHub $github) {
    $deploymentId = ID::unique();
    $entrypoint = $function->getAttribute('entrypoint', '');
    $providerInstallationId = $installation->getAttribute('providerInstallationId', '');
@ -109,8 +108,7 @@ $redeployVcs = function (Request $request, Document $function, Document $project
        'activate' => true,
    ]));

-    $buildEvent = new Build();
-    $buildEvent
+    $queueForBuilds
        ->setType(BUILD_TYPE_DEPLOYMENT)
        ->setResource($function)
        ->setDeployment($deployment)
@ -158,10 +156,11 @@ App::post('/v1/functions')
    ->inject('dbForProject')
    ->inject('project')
    ->inject('user')
-    ->inject('events')
+    ->inject('queueForEvents')
+    ->inject('queueForBuilds')
    ->inject('dbForConsole')
    ->inject('gitHub')
-    ->action(function (string $functionId, string $name, string $runtime, array $execute, array $events, string $schedule, int $timeout, bool $enabled, bool $logging, string $entrypoint, string $commands, string $installationId, string $providerRepositoryId, string $providerBranch, bool $providerSilentMode, string $providerRootDirectory, string $templateRepository, string $templateOwner, string $templateRootDirectory, string $templateBranch, Request $request, Response $response, Database $dbForProject, Document $project, Document $user, Event $eventsInstance, Database $dbForConsole, GitHub $github) use ($redeployVcs) {
+    ->action(function (string $functionId, string $name, string $runtime, array $execute, array $events, string $schedule, int $timeout, bool $enabled, bool $logging, string $entrypoint, string $commands, string $installationId, string $providerRepositoryId, string $providerBranch, bool $providerSilentMode, string $providerRootDirectory, string $templateRepository, string $templateOwner, string $templateRootDirectory, string $templateBranch, Request $request, Response $response, Database $dbForProject, Document $project, Document $user, Event $queueForEvents, Build $queueForBuilds, Database $dbForConsole, GitHub $github) use ($redeployVcs) {
        $functionId = ($functionId == 'unique()') ? ID::unique() : $functionId;

        // build from template
@ -261,7 +260,7 @@ App::post('/v1/functions')

        // Redeploy vcs logic
        if (!empty($providerRepositoryId)) {
-            $redeployVcs($request, $function, $project, $installation, $dbForProject, $template, $github);
+            $redeployVcs($request, $function, $project, $installation, $dbForProject, $queueForBuilds, $template, $github);
        }

        $functionsDomain = App::getEnv('_APP_DOMAIN_FUNCTIONS', '');
@ -286,7 +285,12 @@ App::post('/v1/functions')

            /** Trigger Webhook */
            $ruleModel = new Rule();
-            $ruleCreate = new Event(Event::WEBHOOK_QUEUE_NAME, Event::WEBHOOK_CLASS_NAME);
+            $ruleCreate =
+                $queueForEvents
+                     ->setClass(Event::WEBHOOK_CLASS_NAME)
+                     ->setQueue(Event::WEBHOOK_QUEUE_NAME)
+                ;
+
            $ruleCreate
                ->setProject($project)
                ->setEvent('rules.[ruleId].create')
@ -326,7 +330,7 @@ App::post('/v1/functions')
            );
        }

-        $eventsInstance->setParam('functionId', $function->getId());
+        $queueForEvents->setParam('functionId', $function->getId());

        $response
            ->setStatusCode(Response::STATUS_CODE_CREATED)
@ -530,7 +534,7 @@ App::get('/v1/functions/:functionId/usage')
                'range' => $range,
                'executionsTotal' => $stats["executions.$functionId.compute.total"] ?? [],
                'executionsFailure' => $stats["executions.$functionId.compute.failure"] ?? [],
-                'executionsSuccesse' => $stats["executions.$functionId.compute.success"] ?? [],
+                'executionsSuccess' => $stats["executions.$functionId.compute.success"] ?? [],
                'executionsTime' => $stats["executions.$functionId.compute.time"] ?? [],
                'buildsTotal' => $stats["builds.$functionId.compute.total"] ?? [],
                'buildsFailure' => $stats["builds.$functionId.compute.failure"] ?? [],
@ -679,10 +683,11 @@ App::put('/v1/functions/:functionId')
    ->inject('response')
    ->inject('dbForProject')
    ->inject('project')
-    ->inject('events')
+    ->inject('queueForEvents')
+    ->inject('queueForBuilds')
    ->inject('dbForConsole')
    ->inject('gitHub')
-    ->action(function (string $functionId, string $name, string $runtime, array $execute, array $events, string $schedule, int $timeout, bool $enabled, bool $logging, string $entrypoint, string $commands, string $installationId, string $providerRepositoryId, string $providerBranch, bool $providerSilentMode, string $providerRootDirectory, Request $request, Response $response, Database $dbForProject, Document $project, Event $eventsInstance, Database $dbForConsole, GitHub $github) use ($redeployVcs) {
+    ->action(function (string $functionId, string $name, string $runtime, array $execute, array $events, string $schedule, int $timeout, bool $enabled, bool $logging, string $entrypoint, string $commands, string $installationId, string $providerRepositoryId, string $providerBranch, bool $providerSilentMode, string $providerRootDirectory, Request $request, Response $response, Database $dbForProject, Document $project, Event $queueForEvents, Build $queueForBuilds, Database $dbForConsole, GitHub $github) use ($redeployVcs) {
        // TODO: If only branch changes, re-deploy

        $function = $dbForProject->getDocument('functions', $functionId);
@ -807,7 +812,7 @@ App::put('/v1/functions/:functionId')

        // Redeploy logic
        if (!$isConnected && !empty($providerRepositoryId)) {
-            $redeployVcs($request, $function, $project, $installation, $dbForProject, new Document(), $github);
+            $redeployVcs($request, $function, $project, $installation, $dbForProject, $queueForBuilds, new Document(), $github);
        }

        // Inform scheduler if function is still active
@ -818,7 +823,7 @@ App::put('/v1/functions/:functionId')
            ->setAttribute('active', !empty($function->getAttribute('schedule')) && !empty($function->getAttribute('deployment')));
        Authorization::skip(fn () => $dbForConsole->updateDocument('schedules', $schedule->getId(), $schedule));

-        $eventsInstance->setParam('functionId', $function->getId());
+        $queueForEvents->setParam('functionId', $function->getId());

        $response->dynamic($function, Response::MODEL_FUNCTION);
    });
@ -928,9 +933,9 @@ App::patch('/v1/functions/:functionId/deployments/:deploymentId')
    ->param('deploymentId', '', new UID(), 'Deployment ID.')
    ->inject('response')
    ->inject('dbForProject')
-    ->inject('events')
+    ->inject('queueForEvents')
    ->inject('dbForConsole')
-    ->action(function (string $functionId, string $deploymentId, Response $response, Database $dbForProject, Event $events, Database $dbForConsole) {
+    ->action(function (string $functionId, string $deploymentId, Response $response, Database $dbForProject, Event $queueForEvents, Database $dbForConsole) {

        $function = $dbForProject->getDocument('functions', $functionId);
        $deployment = $dbForProject->getDocument('deployments', $deploymentId);
@ -965,7 +970,7 @@ App::patch('/v1/functions/:functionId/deployments/:deploymentId')
            ->setAttribute('active', !empty($function->getAttribute('schedule')) && !empty($function->getAttribute('deployment')));
        Authorization::skip(fn () => $dbForConsole->updateDocument('schedules', $schedule->getId(), $schedule));

-        $events
+        $queueForEvents
            ->setParam('functionId', $function->getId())
            ->setParam('deploymentId', $deployment->getId());

@ -988,10 +993,10 @@ App::delete('/v1/functions/:functionId')
    ->param('functionId', '', new UID(), 'Function ID.')
    ->inject('response')
    ->inject('dbForProject')
-    ->inject('deletes')
-    ->inject('events')
+    ->inject('queueForDeletes')
+    ->inject('queueForEvents')
    ->inject('dbForConsole')
-    ->action(function (string $functionId, Response $response, Database $dbForProject, Delete $deletes, Event $events, Database $dbForConsole) {
+    ->action(function (string $functionId, Response $response, Database $dbForProject, Delete $queueForDeletes, Event $queueForEvents, Database $dbForConsole) {

        $function = $dbForProject->getDocument('functions', $functionId);

@ -1010,11 +1015,11 @@ App::delete('/v1/functions/:functionId')
            ->setAttribute('active', false);
        Authorization::skip(fn () => $dbForConsole->updateDocument('schedules', $schedule->getId(), $schedule));

-        $deletes
+        $queueForDeletes
            ->setType(DELETE_TYPE_DOCUMENT)
            ->setDocument($function);

-        $events->setParam('functionId', $function->getId());
+        $queueForEvents->setParam('functionId', $function->getId());

        $response->noContent();
    });
@ -1043,11 +1048,13 @@ App::post('/v1/functions/:functionId/deployments')
    ->inject('request')
    ->inject('response')
    ->inject('dbForProject')
-    ->inject('events')
+    ->inject('queueForEvents')
    ->inject('project')
    ->inject('deviceFunctions')
    ->inject('deviceLocal')
-    ->action(function (string $functionId, ?string $entrypoint, ?string $commands, mixed $code, mixed $activate, Request $request, Response $response, Database $dbForProject, Event $events, Document $project, Device $deviceFunctions, Device $deviceLocal) {
+    ->inject('queueForBuilds')
+    ->action(function (string $functionId, ?string $entrypoint, ?string $commands, mixed $code, bool $activate, Request $request, Response $response, Database $dbForProject, Event $queueForEvents, Document $project, Device $deviceFunctions, Device $deviceLocal, Build $queueForBuilds) {
+
        $activate = filter_var($activate, FILTER_VALIDATE_BOOLEAN);

        $function = $dbForProject->getDocument('functions', $functionId);
@ -1191,8 +1198,7 @@ App::post('/v1/functions/:functionId/deployments')
            }

            // Start the build
-            $buildEvent = new Build();
-            $buildEvent
+            $queueForBuilds
                ->setType(BUILD_TYPE_DEPLOYMENT)
                ->setResource($function)
                ->setDeployment($deployment)
@ -1229,7 +1235,7 @@ App::post('/v1/functions/:functionId/deployments')

        $metadata = null;

-        $events
+        $queueForEvents
            ->setParam('functionId', $function->getId())
            ->setParam('deploymentId', $deployment->getId());

@ -1367,10 +1373,10 @@ App::delete('/v1/functions/:functionId/deployments/:deploymentId')
    ->param('deploymentId', '', new UID(), 'Deployment ID.')
    ->inject('response')
    ->inject('dbForProject')
-    ->inject('deletes')
-    ->inject('events')
+    ->inject('queueForDeletes')
+    ->inject('queueForEvents')
    ->inject('deviceFunctions')
-    ->action(function (string $functionId, string $deploymentId, Response $response, Database $dbForProject, Delete $deletes, Event $events, Device $deviceFunctions) {
+    ->action(function (string $functionId, string $deploymentId, Response $response, Database $dbForProject, Delete $queueForDeletes, Event $queueForEvents, Device $deviceFunctions) {

        $function = $dbForProject->getDocument('functions', $functionId);
        if ($function->isEmpty()) {
@ -1403,11 +1409,11 @@ App::delete('/v1/functions/:functionId/deployments/:deploymentId')
            ])));
        }

-        $events
+        $queueForEvents
            ->setParam('functionId', $function->getId())
            ->setParam('deploymentId', $deployment->getId());

-        $deletes
+        $queueForDeletes
            ->setType(DELETE_TYPE_DOCUMENT)
            ->setDocument($deployment);

@ -1434,8 +1440,9 @@ App::post('/v1/functions/:functionId/deployments/:deploymentId/builds/:buildId')
    ->inject('response')
    ->inject('dbForProject')
    ->inject('project')
-    ->inject('events')
-    ->action(function (string $functionId, string $deploymentId, string $buildId, Request $request, Response $response, Database $dbForProject, Document $project, Event $events) use ($redeployVcs) {
+    ->inject('queueForEvents')
+    ->inject('queueForBuilds')
+    ->action(function (string $functionId, string $deploymentId, string $buildId, Request $request, Response $response, Database $dbForProject, Document $project, Event $queueForEvents, Build $queueForBuilds) {

        $function = $dbForProject->getDocument('functions', $functionId);

@ -1467,16 +1474,14 @@ App::post('/v1/functions/:functionId/deployments/:deploymentId/builds/:buildId')
            'search' => implode(' ', [$deploymentId, $function->getAttribute('entrypoint')]),
        ]));

-        $buildEvent = new Build();
-
-        $buildEvent
+        $queueForBuilds
            ->setType(BUILD_TYPE_DEPLOYMENT)
            ->setResource($function)
            ->setDeployment($deployment)
            ->setProject($project)
            ->trigger();

-        $events
+        $queueForEvents
            ->setParam('functionId', $function->getId())
            ->setParam('deploymentId', $deployment->getId());

@ -1505,12 +1510,12 @@ App::post('/v1/functions/:functionId/executions')
    ->inject('project')
    ->inject('dbForProject')
    ->inject('user')
-    ->inject('events')
+    ->inject('queueForEvents')
    ->inject('usage')
    ->inject('mode')
    ->inject('queueForFunctions')
    ->inject('geodb')
-    ->action(function (string $functionId, string $body, bool $async, string $path, string $method, array $headers, Response $response, Document $project, Database $dbForProject, Document $user, Event $events, Stats $usage, string $mode, Func $queueForFunctions, Reader $geodb) {
+    ->action(function (string $functionId, string $body, bool $async, string $path, string $method, array $headers, Response $response, Document $project, Database $dbForProject, Document $user, Event $queueForEvents, Stats $usage, string $mode, Func $queueForFunctions, Reader $geodb) {

        $function = Authorization::skip(fn () => $dbForProject->getDocument('functions', $functionId));

@ -1626,7 +1631,7 @@ App::post('/v1/functions/:functionId/executions')
            'search' => implode(' ', [$functionId, $executionId]),
        ]);

-        $events
+        $queueForEvents
            ->setParam('functionId', $function->getId())
            ->setParam('executionId', $execution->getId())
            ->setContext('function', $function);
--- a/app/controllers/api/health.php
+++ b/app/controllers/api/health.php
@ -14,6 +14,7 @@ use Utopia\Registry\Registry;
 use Utopia\Storage\Device;
 use Utopia\Storage\Device\Local;
 use Utopia\Storage\Storage;
+use Utopia\Validator\Text;

 App::get('/v1/health')
    ->desc('Get HTTP')
@ -347,10 +348,11 @@ App::get('/v1/health/queue/webhooks')
    ->label('sdk.response.code', Response::STATUS_CODE_OK)
    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
    ->label('sdk.response.model', Response::MODEL_HEALTH_QUEUE)
+    ->inject('queue')
    ->inject('response')
-    ->action(function (Response $response) {
-
-        $response->dynamic(new Document([ 'size' => Resque::size(Event::WEBHOOK_QUEUE_NAME) ]), Response::MODEL_HEALTH_QUEUE);
+    ->action(function (Connection $queue, Response $response) {
+        $client = new Client(Event::WEBHOOK_QUEUE_NAME, $queue);
+        $response->dynamic(new Document([ 'size' => $client->sumProcessingJobs() ]), Response::MODEL_HEALTH_QUEUE);
    }, ['response']);

 App::get('/v1/health/queue/logs')
@ -364,10 +366,11 @@ App::get('/v1/health/queue/logs')
    ->label('sdk.response.code', Response::STATUS_CODE_OK)
    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
    ->label('sdk.response.model', Response::MODEL_HEALTH_QUEUE)
+    ->inject('queue')
    ->inject('response')
-    ->action(function (Response $response) {
-
-        $response->dynamic(new Document([ 'size' => Resque::size(Event::AUDITS_QUEUE_NAME) ]), Response::MODEL_HEALTH_QUEUE);
+    ->action(function (Connection $queue, Response $response) {
+        $client = new Client(Event::AUDITS_QUEUE_NAME, $queue);
+        $response->dynamic(new Document([ 'size' => $client->sumProcessingJobs() ]), Response::MODEL_HEALTH_QUEUE);
    }, ['response']);

 App::get('/v1/health/queue/certificates')
@ -381,10 +384,11 @@ App::get('/v1/health/queue/certificates')
    ->label('sdk.response.code', Response::STATUS_CODE_OK)
    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
    ->label('sdk.response.model', Response::MODEL_HEALTH_QUEUE)
+    ->inject('queue')
    ->inject('response')
-    ->action(function (Response $response) {
-
-        $response->dynamic(new Document([ 'size' => Resque::size(Event::CERTIFICATES_QUEUE_NAME) ]), Response::MODEL_HEALTH_QUEUE);
+    ->action(function (Connection $queue, Response $response) {
+        $client = new Client(Event::CERTIFICATES_QUEUE_NAME, $queue);
+        $response->dynamic(new Document([ 'size' => $client->sumProcessingJobs() ]), Response::MODEL_HEALTH_QUEUE);
    }, ['response']);

 App::get('/v1/health/queue/builds')
@ -398,10 +402,11 @@ App::get('/v1/health/queue/builds')
    ->label('sdk.response.code', Response::STATUS_CODE_OK)
    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
    ->label('sdk.response.model', Response::MODEL_HEALTH_QUEUE)
+    ->inject('queue')
    ->inject('response')
-    ->action(function (Response $response) {
-
-        $response->dynamic(new Document([ 'size' => Resque::size(Event::BUILDS_QUEUE_NAME) ]), Response::MODEL_HEALTH_QUEUE);
+    ->action(function (Connection $queue, Response $response) {
+        $client = new Client(Event::BUILDS_QUEUE_NAME, $queue);
+        $response->dynamic(new Document([ 'size' => $client->sumProcessingJobs() ]), Response::MODEL_HEALTH_QUEUE);
    }, ['response']);

 App::get('/v1/health/queue/databases')
@ -415,10 +420,12 @@ App::get('/v1/health/queue/databases')
    ->label('sdk.response.code', Response::STATUS_CODE_OK)
    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
    ->label('sdk.response.model', Response::MODEL_HEALTH_QUEUE)
+    ->param('name', 'database_db_main', new Text(256), 'Queue name for which to check the queue size', true)
+    ->inject('queue')
    ->inject('response')
-    ->action(function (Response $response) {
-
-        $response->dynamic(new Document([ 'size' => Resque::size(Event::DATABASE_QUEUE_NAME) ]), Response::MODEL_HEALTH_QUEUE);
+    ->action(function (string $name, Connection $queue, Response $response) {
+        $client = new Client($name, $queue);
+        $response->dynamic(new Document([ 'size' => $client->sumProcessingJobs() ]), Response::MODEL_HEALTH_QUEUE);
    }, ['response']);

 App::get('/v1/health/queue/deletes')
@ -432,10 +439,11 @@ App::get('/v1/health/queue/deletes')
    ->label('sdk.response.code', Response::STATUS_CODE_OK)
    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
    ->label('sdk.response.model', Response::MODEL_HEALTH_QUEUE)
+    ->inject('queue')
    ->inject('response')
-    ->action(function (Response $response) {
-
-        $response->dynamic(new Document([ 'size' => Resque::size(Event::DELETE_QUEUE_NAME) ]), Response::MODEL_HEALTH_QUEUE);
+    ->action(function (Connection $queue, Response $response) {
+        $client = new Client(Event::DELETE_QUEUE_NAME, $queue);
+        $response->dynamic(new Document([ 'size' => $client->sumProcessingJobs() ]), Response::MODEL_HEALTH_QUEUE);
    }, ['response']);

 App::get('/v1/health/queue/mails')
@ -449,10 +457,11 @@ App::get('/v1/health/queue/mails')
    ->label('sdk.response.code', Response::STATUS_CODE_OK)
    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
    ->label('sdk.response.model', Response::MODEL_HEALTH_QUEUE)
+    ->inject('queue')
    ->inject('response')
-    ->action(function (Response $response) {
-
-        $response->dynamic(new Document([ 'size' => Resque::size(Event::MAILS_QUEUE_NAME) ]), Response::MODEL_HEALTH_QUEUE);
+    ->action(function (Connection $queue, Response $response) {
+        $client = new Client(Event::MAILS_QUEUE_NAME, $queue);
+        $response->dynamic(new Document([ 'size' => $client->sumProcessingJobs() ]), Response::MODEL_HEALTH_QUEUE);
    }, ['response']);

 App::get('/v1/health/queue/messaging')
@ -466,10 +475,11 @@ App::get('/v1/health/queue/messaging')
    ->label('sdk.response.code', Response::STATUS_CODE_OK)
    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
    ->label('sdk.response.model', Response::MODEL_HEALTH_QUEUE)
+    ->inject('queue')
    ->inject('response')
-    ->action(function (Response $response) {
-
-        $response->dynamic(new Document([ 'size' => Resque::size(Event::MESSAGING_QUEUE_NAME) ]), Response::MODEL_HEALTH_QUEUE);
+    ->action(function (Connection $queue, Response $response) {
+        $client = new Client(Event::MESSAGING_QUEUE_NAME, $queue);
+        $response->dynamic(new Document([ 'size' => $client->sumProcessingJobs() ]), Response::MODEL_HEALTH_QUEUE);
    }, ['response']);

 App::get('/v1/health/queue/migrations')
@ -483,10 +493,11 @@ App::get('/v1/health/queue/migrations')
    ->label('sdk.response.code', Response::STATUS_CODE_OK)
    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
    ->label('sdk.response.model', Response::MODEL_HEALTH_QUEUE)
+    ->inject('queue')
    ->inject('response')
-    ->action(function (Response $response) {
-
-        $response->dynamic(new Document([ 'size' => Resque::size(Event::MIGRATIONS_QUEUE_NAME) ]), Response::MODEL_HEALTH_QUEUE);
+    ->action(function (Connection $queue, Response $response) {
+        $client = new Client(Event::MIGRATIONS_QUEUE_NAME, $queue);
+        $response->dynamic(new Document([ 'size' => $client->sumProcessingJobs() ]), Response::MODEL_HEALTH_QUEUE);
    }, ['response']);

 App::get('/v1/health/queue/functions')
--- a/app/controllers/api/messaging.php
+++ b/app/controllers/api/messaging.php
@ -1586,9 +1586,9 @@ App::post('/v1/messaging/messages/email')
    ->param('deliveryTime', null, new DatetimeValidator(requireDateInFuture: true), 'Delivery time for message in ISO 8601 format. DateTime value must be in future.', true)
    ->inject('dbForProject')
    ->inject('project')
-    ->inject('messaging')
+    ->inject('queueForMessaging')
    ->inject('response')
-    ->action(function (string $messageId, string $providerId, array $to, string $subject, string $description, string $content, string $status, bool $html, ?string $deliveryTime, Database $dbForProject, Document $project, Messaging $messaging, Response $response) {
+    ->action(function (string $messageId, string $providerId, array $to, string $subject, string $description, string $content, string $status, bool $html, ?string $deliveryTime, Database $dbForProject, Document $project, Messaging $queueForMessaging, Response $response) {
        $messageId = $messageId == 'unique()' ? ID::unique() : $messageId;

        $provider = $dbForProject->getDocument('providers', $providerId);
@ -1613,17 +1613,10 @@ App::post('/v1/messaging/messages/email')
        ]));

        if ($status === 'processing') {
-            $messaging
+            $queueForMessaging
                ->setMessageId($message->getId())
-                ->setProject($project);
-
-            if (!empty($deliveryTime)) {
-                $messaging
-                    ->setDeliveryTime($deliveryTime)
-                    ->schedule();
-            } else {
-                $messaging->trigger();
-            }
+                ->setProject($project)
+                ->trigger();
        }

        $response
@ -1717,9 +1710,9 @@ App::patch('/v1/messaging/messages/email/:messageId')
    ->param('deliveryTime', null, new DatetimeValidator(requireDateInFuture: true), 'Delivery time for message in ISO 8601 format. DateTime value must be in future.', true)
    ->inject('dbForProject')
    ->inject('project')
-    ->inject('messaging')
+    ->inject('queueForMessaging')
    ->inject('response')
-    ->action(function (string $messageId, array $to, string $subject, string $description, string $content, string $status, bool $html, ?string $deliveryTime, Database $dbForProject, Document $project, Messaging $messaging, Response $response) {
+    ->action(function (string $messageId, array $to, string $subject, string $description, string $content, string $status, bool $html, ?string $deliveryTime, Database $dbForProject, Document $project, Messaging $queueForMessaging, Response $response) {
        $message = $dbForProject->getDocument('messages', $messageId);

        if ($message->isEmpty()) {
@ -1762,17 +1755,10 @@ App::patch('/v1/messaging/messages/email/:messageId')
        $message = $dbForProject->updateDocument('messages', $message->getId(), $message);

        if ($status === 'processing') {
-            $messaging
+            $queueForMessaging
                ->setMessageId($message->getId())
-                ->setProject($project);
-
-            if (!empty($deliveryTime)) {
-                $messaging
-                ->setDeliveryTime($deliveryTime)
-                ->schedule();
-            } else {
-                $messaging->trigger();
-            }
+                ->setProject($project)
+                ->trigger();
        }

        $response
--- a/app/controllers/api/migrations.php
+++ b/app/controllers/api/migrations.php
@ -51,8 +51,9 @@ App::post('/v1/migrations/appwrite')
    ->inject('dbForProject')
    ->inject('project')
    ->inject('user')
-    ->inject('events')
-    ->action(function (array $resources, string $endpoint, string $projectId, string $apiKey, Response $response, Database $dbForProject, Document $project, Document $user, Event $events) {
+    ->inject('queueForEvents')
+    ->inject('queueForMigrations')
+    ->action(function (array $resources, string $endpoint, string $projectId, string $apiKey, Response $response, Database $dbForProject, Document $project, Document $user, Event $queueForEvents, Migration $queueForMigrations) {
        $migration = $dbForProject->createDocument('migrations', new Document([
            '$id' => ID::unique(),
            'status' => 'pending',
@ -69,11 +70,10 @@ App::post('/v1/migrations/appwrite')
            'errors' => [],
        ]));

-        $events->setParam('migrationId', $migration->getId());
+        $queueForEvents->setParam('migrationId', $migration->getId());

        // Trigger Transfer
-        $event = new Migration();
-        $event
+        $queueForMigrations
            ->setMigration($migration)
            ->setProject($project)
            ->setUser($user)
@ -104,9 +104,10 @@ App::post('/v1/migrations/firebase/oauth')
    ->inject('dbForConsole')
    ->inject('project')
    ->inject('user')
-    ->inject('events')
+    ->inject('queueForEvents')
+    ->inject('queueForMigrations')
    ->inject('request')
-    ->action(function (array $resources, string $projectId, Response $response, Database $dbForProject, Database $dbForConsole, Document $project, Document $user, Event $events, Request $request) {
+    ->action(function (array $resources, string $projectId, Response $response, Database $dbForProject, Database $dbForConsole, Document $project, Document $user, Event $queueForEvents, Migration $queueForMigrations, Request $request) {
        $firebase = new OAuth2Firebase(
            App::getEnv('_APP_MIGRATIONS_FIREBASE_CLIENT_ID', ''),
            App::getEnv('_APP_MIGRATIONS_FIREBASE_CLIENT_SECRET', ''),
@ -171,11 +172,10 @@ App::post('/v1/migrations/firebase/oauth')
            'errors' => []
        ]));

-        $events->setParam('migrationId', $migration->getId());
+        $queueForEvents->setParam('migrationId', $migration->getId());

        // Trigger Transfer
-        $event = new Migration();
-        $event
+        $queueForMigrations
            ->setMigration($migration)
            ->setProject($project)
            ->setUser($user)
@ -205,8 +205,9 @@ App::post('/v1/migrations/firebase')
    ->inject('dbForProject')
    ->inject('project')
    ->inject('user')
-    ->inject('events')
-    ->action(function (array $resources, string $serviceAccount, Response $response, Database $dbForProject, Document $project, Document $user, Event $events) {
+    ->inject('queueForEvents')
+    ->inject('queueForMigrations')
+    ->action(function (array $resources, string $serviceAccount, Response $response, Database $dbForProject, Document $project, Document $user, Event $queueForEvents, Migration $queueForMigrations) {
        $migration = $dbForProject->createDocument('migrations', new Document([
            '$id' => ID::unique(),
            'status' => 'pending',
@ -221,11 +222,10 @@ App::post('/v1/migrations/firebase')
            'errors' => [],
        ]));

-        $events->setParam('migrationId', $migration->getId());
+        $queueForEvents->setParam('migrationId', $migration->getId());

        // Trigger Transfer
-        $event = new Migration();
-        $event
+        $queueForMigrations
            ->setMigration($migration)
            ->setProject($project)
            ->setUser($user)
@ -260,8 +260,9 @@ App::post('/v1/migrations/supabase')
    ->inject('dbForProject')
    ->inject('project')
    ->inject('user')
-    ->inject('events')
-    ->action(function (array $resources, string $endpoint, string $apiKey, string $databaseHost, string $username, string $password, int $port, Response $response, Database $dbForProject, Document $project, Document $user, Event $events) {
+    ->inject('queueForEvents')
+    ->inject('queueForMigrations')
+    ->action(function (array $resources, string $endpoint, string $apiKey, string $databaseHost, string $username, string $password, int $port, Response $response, Database $dbForProject, Document $project, Document $user, Event $queueForEvents, Migration $queueForMigrations) {
        $migration = $dbForProject->createDocument('migrations', new Document([
            '$id' => ID::unique(),
            'status' => 'pending',
@ -281,11 +282,10 @@ App::post('/v1/migrations/supabase')
            'errors' => [],
        ]));

-        $events->setParam('migrationId', $migration->getId());
+        $queueForEvents->setParam('migrationId', $migration->getId());

        // Trigger Transfer
-        $event = new Migration();
-        $event
+        $queueForMigrations
            ->setMigration($migration)
            ->setProject($project)
            ->setUser($user)
@ -321,8 +321,9 @@ App::post('/v1/migrations/nhost')
    ->inject('dbForProject')
    ->inject('project')
    ->inject('user')
-    ->inject('events')
-    ->action(function (array $resources, string $subdomain, string $region, string $adminSecret, string $database, string $username, string $password, int $port, Response $response, Database $dbForProject, Document $project, Document $user, Event $events) {
+    ->inject('queueForEvents')
+    ->inject('queueForMigrations')
+    ->action(function (array $resources, string $subdomain, string $region, string $adminSecret, string $database, string $username, string $password, int $port, Response $response, Database $dbForProject, Document $project, Document $user, Event $queueForEvents, Migration $queueForMigrations) {
        $migration = $dbForProject->createDocument('migrations', new Document([
            '$id' => ID::unique(),
            'status' => 'pending',
@ -343,11 +344,10 @@ App::post('/v1/migrations/nhost')
            'errors' => [],
        ]));

-        $events->setParam('migrationId', $migration->getId());
+        $queueForEvents->setParam('migrationId', $migration->getId());

        // Trigger Transfer
-        $event = new Migration();
-        $event
+        $queueForMigrations
            ->setMigration($migration)
            ->setProject($project)
            ->setUser($user)
@ -931,8 +931,8 @@ App::patch('/v1/migrations/:migrationId')
    ->inject('dbForProject')
    ->inject('project')
    ->inject('user')
-    ->inject('events')
-    ->action(function (string $migrationId, Response $response, Database $dbForProject, Document $project, Document $user, Event $eventInstance) {
+    ->inject('queueForMigrations')
+    ->action(function (string $migrationId, Response $response, Database $dbForProject, Document $project, Document $user, Migration $queueForMigrations) {
        $migration = $dbForProject->getDocument('migrations', $migrationId);

        if ($migration->isEmpty()) {
@ -948,8 +948,7 @@ App::patch('/v1/migrations/:migrationId')
            ->setAttribute('dateUpdated', \time());

        // Trigger Migration
-        $event = new Migration();
-        $event
+        $queueForMigrations
            ->setMigration($migration)
            ->setProject($project)
            ->setUser($user)
@ -974,8 +973,8 @@ App::delete('/v1/migrations/:migrationId')
    ->param('migrationId', '', new UID(), 'Migration ID.')
    ->inject('response')
    ->inject('dbForProject')
-    ->inject('events')
-    ->action(function (string $migrationId, Response $response, Database $dbForProject, Event $events) {
+    ->inject('queueForEvents')
+    ->action(function (string $migrationId, Response $response, Database $dbForProject, Event $queueForEvents) {
        $migration = $dbForProject->getDocument('migrations', $migrationId);

        if ($migration->isEmpty()) {
@ -986,7 +985,7 @@ App::delete('/v1/migrations/:migrationId')
            throw new Exception(Exception::GENERAL_SERVER_ERROR, 'Failed to remove migration from DB');
        }

-        $events->setParam('migrationId', $migration->getId());
+        $queueForEvents->setParam('migrationId', $migration->getId());

        $response->noContent();
    });
--- a/app/controllers/api/projects.php
+++ b/app/controllers/api/projects.php
@ -92,12 +92,12 @@ App::post('/v1/projects')

        $projectId = ($projectId == 'unique()') ? ID::unique() : $projectId;

-        $backups['database_db_fra1_v14x_02'] = ['from' => '7:30', 'to' => '8:15'];
-        $backups['database_db_fra1_v14x_03'] = ['from' => '10:30', 'to' => '11:15'];
-        $backups['database_db_fra1_v14x_04'] = ['from' => '13:30', 'to' => '14:15'];
-        $backups['database_db_fra1_v14x_05'] = ['from' => '4:30', 'to' => '5:15'];
-        $backups['database_db_fra1_v14x_06'] = ['from' => '16:30', 'to' => '17:15'];
-        $backups['database_db_fra1_v14x_07'] = ['from' => '19:30', 'to' => '20:15'];
+        $backups['database_db_fra1_v14x_02'] = ['from' => '03:00', 'to' => '04:00'];
+        $backups['database_db_fra1_v14x_03'] = ['from' => '00:00', 'to' => '01:00'];
+        $backups['database_db_fra1_v14x_04'] = ['from' => '00:00', 'to' => '01:00'];
+        $backups['database_db_fra1_v14x_05'] = ['from' => '00:00', 'to' => '01:00'];
+        $backups['database_db_fra1_v14x_06'] = ['from' => '00:00', 'to' => '01:00'];
+        $backups['database_db_fra1_v14x_07'] = ['from' => '00:00', 'to' => '01:00'];

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

@ -481,15 +481,43 @@ App::patch('/v1/projects/:projectId/team')
            throw new Exception(Exception::TEAM_NOT_FOUND);
        }

-        $project = $dbForConsole->updateDocument('projects', $project->getId(), $project
+        $permissions = [
+            Permission::read(Role::team(ID::custom($teamId))),
+            Permission::update(Role::team(ID::custom($teamId), 'owner')),
+            Permission::update(Role::team(ID::custom($teamId), 'developer')),
+            Permission::delete(Role::team(ID::custom($teamId), 'owner')),
+            Permission::delete(Role::team(ID::custom($teamId), 'developer')),
+        ];
+
+        $project
            ->setAttribute('teamId', $teamId)
-            ->setAttribute('$permissions', [
-                Permission::read(Role::team(ID::custom($teamId))),
-                Permission::update(Role::team(ID::custom($teamId), 'owner')),
-                Permission::update(Role::team(ID::custom($teamId), 'developer')),
-                Permission::delete(Role::team(ID::custom($teamId), 'owner')),
-                Permission::delete(Role::team(ID::custom($teamId), 'developer')),
-            ]));
+            ->setAttribute('teamInternalId', $team->getInternalId())
+            ->setAttribute('$permissions', $permissions);
+        $project = $dbForConsole->updateDocument('projects', $project->getId(), $project);
+
+        $installations = $dbForConsole->find('installations', [
+            Query::equal('projectInternalId', [$project->getInternalId()]),
+        ]);
+        foreach ($installations as $installation) {
+            $installation->getAttribute('$permissions', $permissions);
+            $dbForConsole->updateDocument('installations', $installation->getId(), $installation);
+        }
+
+        $repositories = $dbForConsole->find('repositories', [
+            Query::equal('projectInternalId', [$project->getInternalId()]),
+        ]);
+        foreach ($repositories as $repository) {
+            $repository->getAttribute('$permissions', $permissions);
+            $dbForConsole->updateDocument('repositories', $repository->getId(), $repository);
+        }
+
+        $vcsComments = $dbForConsole->find('vcsComments', [
+            Query::equal('projectInternalId', [$project->getInternalId()]),
+        ]);
+        foreach ($vcsComments as $vcsComment) {
+            $vcsComment->getAttribute('$permissions', $permissions);
+            $dbForConsole->updateDocument('vcsComments', $vcsComment->getId(), $vcsComment);
+        }

        $response->dynamic($project, Response::MODEL_PROJECT);
    });
@ -836,15 +864,15 @@ App::delete('/v1/projects/:projectId')
    ->inject('response')
    ->inject('user')
    ->inject('dbForConsole')
-    ->inject('deletes')
-    ->action(function (string $projectId, Response $response, Document $user, Database $dbForConsole, Delete $deletes) {
+    ->inject('queueForDeletes')
+    ->action(function (string $projectId, Response $response, Document $user, Database $dbForConsole, Delete $queueForDeletes) {
        $project = $dbForConsole->getDocument('projects', $projectId);

        if ($project->isEmpty()) {
            throw new Exception(Exception::PROJECT_NOT_FOUND);
        }

-        $deletes
+        $queueForDeletes
            ->setType(DELETE_TYPE_DOCUMENT)
            ->setDocument($project);

--- a/app/controllers/api/proxy.php
+++ b/app/controllers/api/proxy.php
@ -37,10 +37,11 @@ App::post('/v1/proxy/rules')
    ->param('resourceId', '', new UID(), 'ID of resource for the action type. If resourceType is "api", leave empty. If resourceType is "function", provide ID of the function.', true)
    ->inject('response')
    ->inject('project')
-    ->inject('events')
+    ->inject('queueForCertificates')
+    ->inject('queueForEvents')
    ->inject('dbForConsole')
    ->inject('dbForProject')
-    ->action(function (string $domain, string $resourceType, string $resourceId, Response $response, Document $project, Event $events, Database $dbForConsole, Database $dbForProject) {
+    ->action(function (string $domain, string $resourceType, string $resourceId, Response $response, Document $project, Certificate $queueForCertificates, Event $queueForEvents, Database $dbForConsole, Database $dbForProject) {
        $mainDomain = App::getEnv('_APP_DOMAIN', '');
        if ($domain === $mainDomain) {
            throw new Exception(Exception::GENERAL_ARGUMENT_INVALID, 'You cannot assign your main domain to specific resource. Please use subdomain or a different domain.');
@ -113,8 +114,7 @@ App::post('/v1/proxy/rules')
            if ($validator->isValid($domain->get())) {
                $status = 'verifying';

-                $event = new Certificate();
-                $event
+                $queueForCertificates
                    ->setDomain(new Document([
                        'domain' => $rule->getAttribute('domain')
                    ]))
@ -125,7 +125,7 @@ App::post('/v1/proxy/rules')
        $rule->setAttribute('status', $status);
        $rule = $dbForConsole->createDocument('rules', $rule);

-        $events->setParam('ruleId', $rule->getId());
+        $queueForEvents->setParam('ruleId', $rule->getId());

        $rule->setAttribute('logs', '');

@ -235,9 +235,9 @@ App::delete('/v1/proxy/rules/:ruleId')
    ->inject('response')
    ->inject('project')
    ->inject('dbForConsole')
-    ->inject('deletes')
-    ->inject('events')
-    ->action(function (string $ruleId, Response $response, Document $project, Database $dbForConsole, Delete $deletes, Event $events) {
+    ->inject('queueForDeletes')
+    ->inject('queueForEvents')
+    ->action(function (string $ruleId, Response $response, Document $project, Database $dbForConsole, Delete $queueForDeletes, Event $queueForEvents) {
        $rule = $dbForConsole->getDocument('rules', $ruleId);

        if ($rule->isEmpty() || $rule->getAttribute('projectInternalId') !== $project->getInternalId()) {
@ -246,11 +246,11 @@ App::delete('/v1/proxy/rules/:ruleId')

        $dbForConsole->deleteDocument('rules', $rule->getId());

-        $deletes
+        $queueForDeletes
            ->setType(DELETE_TYPE_DOCUMENT)
            ->setDocument($rule);

-        $events->setParam('ruleId', $rule->getId());
+        $queueForEvents->setParam('ruleId', $rule->getId());

        $response->noContent();
    });
@ -270,10 +270,11 @@ App::patch('/v1/proxy/rules/:ruleId/verification')
    ->label('sdk.response.model', Response::MODEL_PROXY_RULE)
    ->param('ruleId', '', new UID(), 'Rule ID.')
    ->inject('response')
-    ->inject('events')
+    ->inject('queueForCertificates')
+    ->inject('queueForEvents')
    ->inject('project')
    ->inject('dbForConsole')
-    ->action(function (string $ruleId, Response $response, Event $events, Document $project, Database $dbForConsole) {
+    ->action(function (string $ruleId, Response $response, Certificate $queueForCertificates, Event $queueForEvents, Document $project, Database $dbForConsole) {
        $rule = $dbForConsole->getDocument('rules', $ruleId);

        if ($rule->isEmpty() || $rule->getAttribute('projectInternalId') !== $project->getInternalId()) {
@ -300,14 +301,13 @@ App::patch('/v1/proxy/rules/:ruleId/verification')
        $dbForConsole->updateDocument('rules', $rule->getId(), $rule->setAttribute('status', 'verifying'));

        // Issue a TLS certificate when domain is verified
-        $event = new Certificate();
-        $event
+        $queueForCertificates
            ->setDomain(new Document([
                'domain' => $rule->getAttribute('domain')
            ]))
            ->trigger();

-        $events->setParam('ruleId', $rule->getId());
+        $queueForEvents->setParam('ruleId', $rule->getId());

        $certificate = $dbForConsole->getDocument('certificates', $rule->getAttribute('certificateId', ''));
        $rule->setAttribute('logs', $certificate->getAttribute('logs', ''));
--- a/app/controllers/api/storage.php
+++ b/app/controllers/api/storage.php
@ -62,8 +62,8 @@ App::post('/v1/storage/buckets')
    ->label('sdk.response.model', Response::MODEL_BUCKET)
    ->param('bucketId', '', new CustomId(), 'Unique 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.')
    ->param('name', '', new Text(128), 'Bucket name')
-    ->param('permissions', null, new Permissions(APP_LIMIT_ARRAY_PARAMS_SIZE), 'An array of permission strings. By default, no user is granted with any permissions. [Learn more about permissions](/docs/permissions).', true)
-    ->param('fileSecurity', false, new Boolean(true), 'Enables configuring permissions for individual file. A user needs one of file or bucket level permissions to access a file. [Learn more about permissions](/docs/permissions).', true)
+    ->param('permissions', null, new Permissions(APP_LIMIT_ARRAY_PARAMS_SIZE), 'An array of permission strings. By default, no user is granted with any permissions. [Learn more about permissions](https://appwrite.io/docs/permissions).', true)
+    ->param('fileSecurity', false, new Boolean(true), 'Enables configuring permissions for individual file. A user needs one of file or bucket level permissions to access a file. [Learn more about permissions](https://appwrite.io/docs/permissions).', true)
    ->param('enabled', true, new Boolean(true), 'Is bucket enabled? When set to \'disabled\', users cannot access the files in this bucket but Server SDKs with and API key can still access the bucket. No files are lost when this is toggled.', true)
    ->param('maximumFileSize', (int) App::getEnv('_APP_STORAGE_LIMIT', 0), new Range(1, (int) App::getEnv('_APP_STORAGE_LIMIT', 0)), 'Maximum file size allowed in bytes. Maximum allowed value is ' . Storage::human(App::getEnv('_APP_STORAGE_LIMIT', 0), 0) . '.', true)
    ->param('allowedFileExtensions', [], new ArrayList(new Text(64), APP_LIMIT_ARRAY_PARAMS_SIZE), 'Allowed file extensions. Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' extensions are allowed, each 64 characters long.', true)
@ -72,8 +72,8 @@ App::post('/v1/storage/buckets')
    ->param('antivirus', true, new Boolean(true), 'Is virus scanning enabled? For file size above ' . Storage::human(APP_LIMIT_ANTIVIRUS, 0) . ' AntiVirus scanning is skipped even if it\'s enabled', true)
    ->inject('response')
    ->inject('dbForProject')
-    ->inject('events')
-    ->action(function (string $bucketId, string $name, ?array $permissions, bool $fileSecurity, bool $enabled, int $maximumFileSize, array $allowedFileExtensions, string $compression, bool $encryption, bool $antivirus, Response $response, Database $dbForProject, Event $events) {
+    ->inject('queueForEvents')
+    ->action(function (string $bucketId, string $name, ?array $permissions, bool $fileSecurity, bool $enabled, int $maximumFileSize, array $allowedFileExtensions, string $compression, bool $encryption, bool $antivirus, Response $response, Database $dbForProject, Event $queueForEvents) {

        $bucketId = $bucketId === 'unique()' ? ID::unique() : $bucketId;

@ -135,7 +135,7 @@ App::post('/v1/storage/buckets')
            throw new Exception(Exception::STORAGE_BUCKET_ALREADY_EXISTS);
        }

-        $events
+        $queueForEvents
            ->setParam('bucketId', $bucket->getId())
        ;

@ -236,8 +236,8 @@ App::put('/v1/storage/buckets/:bucketId')
    ->label('sdk.response.model', Response::MODEL_BUCKET)
    ->param('bucketId', '', new UID(), 'Bucket unique ID.')
    ->param('name', null, new Text(128), 'Bucket name', false)
-    ->param('permissions', null, new Permissions(APP_LIMIT_ARRAY_PARAMS_SIZE), 'An array of permission strings. By default, the current permissions are inherited. [Learn more about permissions](/docs/permissions).', true)
-    ->param('fileSecurity', false, new Boolean(true), 'Enables configuring permissions for individual file. A user needs one of file or bucket level permissions to access a file. [Learn more about permissions](/docs/permissions).', true)
+    ->param('permissions', null, new Permissions(APP_LIMIT_ARRAY_PARAMS_SIZE), 'An array of permission strings. By default, the current permissions are inherited. [Learn more about permissions](https://appwrite.io/docs/permissions).', true)
+    ->param('fileSecurity', false, new Boolean(true), 'Enables configuring permissions for individual file. A user needs one of file or bucket level permissions to access a file. [Learn more about permissions](https://appwrite.io/docs/permissions).', true)
    ->param('enabled', true, new Boolean(true), 'Is bucket enabled? When set to \'disabled\', users cannot access the files in this bucket but Server SDKs with and API key can still access the bucket. No files are lost when this is toggled.', true)
    ->param('maximumFileSize', null, new Range(1, (int) App::getEnv('_APP_STORAGE_LIMIT', 0)), 'Maximum file size allowed in bytes. Maximum allowed value is ' . Storage::human((int)App::getEnv('_APP_STORAGE_LIMIT', 0), 0) . '.', true)
    ->param('allowedFileExtensions', [], new ArrayList(new Text(64), APP_LIMIT_ARRAY_PARAMS_SIZE), 'Allowed file extensions. Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' extensions are allowed, each 64 characters long.', true)
@ -246,8 +246,8 @@ App::put('/v1/storage/buckets/:bucketId')
    ->param('antivirus', true, new Boolean(true), 'Is virus scanning enabled? For file size above ' . Storage::human(APP_LIMIT_ANTIVIRUS, 0) . ' AntiVirus scanning is skipped even if it\'s enabled', true)
    ->inject('response')
    ->inject('dbForProject')
-    ->inject('events')
-    ->action(function (string $bucketId, string $name, ?array $permissions, bool $fileSecurity, bool $enabled, ?int $maximumFileSize, array $allowedFileExtensions, string $compression, bool $encryption, bool $antivirus, Response $response, Database $dbForProject, Event $events) {
+    ->inject('queueForEvents')
+    ->action(function (string $bucketId, string $name, ?array $permissions, bool $fileSecurity, bool $enabled, ?int $maximumFileSize, array $allowedFileExtensions, string $compression, bool $encryption, bool $antivirus, Response $response, Database $dbForProject, Event $queueForEvents) {
        $bucket = $dbForProject->getDocument('buckets', $bucketId);

        if ($bucket->isEmpty()) {
@ -280,7 +280,7 @@ App::put('/v1/storage/buckets/:bucketId')
                ->setAttribute('antivirus', $antivirus));
        $dbForProject->updateCollection('bucket_' . $bucket->getInternalId(), $permissions, $fileSecurity);

-        $events
+        $queueForEvents
            ->setParam('bucketId', $bucket->getId())
        ;

@ -304,9 +304,9 @@ App::delete('/v1/storage/buckets/:bucketId')
    ->param('bucketId', '', new UID(), 'Bucket unique ID.')
    ->inject('response')
    ->inject('dbForProject')
-    ->inject('deletes')
-    ->inject('events')
-    ->action(function (string $bucketId, Response $response, Database $dbForProject, Delete $deletes, Event $events) {
+    ->inject('queueForDeletes')
+    ->inject('queueForEvents')
+    ->action(function (string $bucketId, Response $response, Database $dbForProject, Delete $queueForDeletes, Event $queueForEvents) {
        $bucket = $dbForProject->getDocument('buckets', $bucketId);

        if ($bucket->isEmpty()) {
@ -317,11 +317,11 @@ App::delete('/v1/storage/buckets/:bucketId')
            throw new Exception(Exception::GENERAL_SERVER_ERROR, 'Failed to remove bucket from DB');
        }

-        $deletes
+        $queueForDeletes
            ->setType(DELETE_TYPE_DOCUMENT)
            ->setDocument($bucket);

-        $events
+        $queueForEvents
            ->setParam('bucketId', $bucket->getId())
            ->setPayload($response->output($bucket, Response::MODEL_BUCKET))
        ;
@ -351,19 +351,20 @@ App::post('/v1/storage/buckets/:bucketId/files')
    ->label('sdk.response.code', Response::STATUS_CODE_CREATED)
    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
    ->label('sdk.response.model', Response::MODEL_FILE)
-    ->param('bucketId', '', new UID(), 'Storage bucket unique ID. You can create a new storage bucket using the Storage service [server integration](/docs/server/storage#createBucket).')
+    ->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.')
-    ->param('file', [], new File(), 'Binary file. Appwrite SDKs provide helpers to handle file input. [Learn about file input](/docs/storage#file-input).', skipValidation: true)
-    ->param('permissions', null, new Permissions(APP_LIMIT_ARRAY_PARAMS_SIZE, [Database::PERMISSION_READ, Database::PERMISSION_UPDATE, Database::PERMISSION_DELETE, Database::PERMISSION_WRITE]), 'An array of permission strings. By default, only the current user is granted all permissions. [Learn more about permissions](/docs/permissions).', true)
+    ->param('file', [], new File(), 'Binary file. Appwrite SDKs provide helpers to handle file input. [Learn about file input](https://appwrite.io/docs/storage#file-input).', skipValidation: true)
+    ->param('permissions', null, new Permissions(APP_LIMIT_ARRAY_PARAMS_SIZE, [Database::PERMISSION_READ, Database::PERMISSION_UPDATE, Database::PERMISSION_DELETE, Database::PERMISSION_WRITE]), 'An array of permission strings. By default, only the current user is granted all permissions. [Learn more about permissions](https://appwrite.io/docs/permissions).', true)
    ->inject('request')
    ->inject('response')
    ->inject('dbForProject')
    ->inject('user')
-    ->inject('events')
+    ->inject('queueForEvents')
    ->inject('mode')
    ->inject('deviceFiles')
    ->inject('deviceLocal')
-    ->action(function (string $bucketId, string $fileId, mixed $file, ?array $permissions, Request $request, Response $response, Database $dbForProject, Document $user, Event $events, string $mode, Device $deviceFiles, Device $deviceLocal) {
+    ->action(function (string $bucketId, string $fileId, mixed $file, ?array $permissions, Request $request, Response $response, Database $dbForProject, Document $user, Event $queueForEvents, string $mode, Device $deviceFiles, Device $deviceLocal) {
+
        $bucket = Authorization::skip(fn () => $dbForProject->getDocument('buckets', $bucketId));

        $isAPIKey = Auth::isAppUser(Authorization::getRoles());
@ -669,7 +670,7 @@ App::post('/v1/storage/buckets/:bucketId/files')
            }
        }

-        $events
+        $queueForEvents
            ->setParam('bucketId', $bucket->getId())
            ->setParam('fileId', $file->getId())
            ->setContext('bucket', $bucket)
@ -696,7 +697,7 @@ App::get('/v1/storage/buckets/:bucketId/files')
    ->label('sdk.response.code', Response::STATUS_CODE_OK)
    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
    ->label('sdk.response.model', Response::MODEL_FILE_LIST)
-    ->param('bucketId', '', new UID(), 'Storage bucket unique ID. You can create a new storage bucket using the Storage service [server integration](/docs/server/storage#createBucket).')
+    ->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('queries', [], new Files(), 'Array of query strings generated using the Query class provided by the SDK. [Learn more about queries](https://appwrite.io/docs/queries). Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' queries are allowed, each ' . APP_LIMIT_ARRAY_ELEMENT_SIZE . ' characters long. You may filter on the following attributes: ' . implode(', ', Files::ALLOWED_ATTRIBUTES), true)
    ->param('search', '', new Text(256), 'Search term to filter your list results. Max length: 256 chars.', true)
    ->inject('response')
@ -777,7 +778,7 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId')
    ->label('sdk.response.code', Response::STATUS_CODE_OK)
    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
    ->label('sdk.response.model', Response::MODEL_FILE)
-    ->param('bucketId', '', new UID(), 'Storage bucket unique ID. You can create a new storage bucket using the Storage service [server integration](/docs/server/storage#createBucket).')
+    ->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.')
    ->inject('response')
    ->inject('dbForProject')
@ -829,7 +830,7 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/preview')
    ->label('sdk.response.code', Response::STATUS_CODE_OK)
    ->label('sdk.response.type', Response::CONTENT_TYPE_IMAGE)
    ->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](/docs/server/storage#createBucket).')
+    ->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('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)
@ -995,7 +996,7 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/download')
    ->label('sdk.response.code', Response::STATUS_CODE_OK)
    ->label('sdk.response.type', '*/*')
    ->label('sdk.methodType', 'location')
-    ->param('bucketId', '', new UID(), 'Storage bucket ID. You can create a new storage bucket using the Storage service [server integration](/docs/server/storage#createBucket).')
+    ->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.')
    ->inject('request')
    ->inject('response')
@ -1138,7 +1139,7 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/view')
    ->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](/docs/server/storage#createBucket).')
+    ->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.')
    ->inject('response')
    ->inject('request')
@ -1297,16 +1298,17 @@ App::put('/v1/storage/buckets/:bucketId/files/:fileId')
    ->label('sdk.response.code', Response::STATUS_CODE_OK)
    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
    ->label('sdk.response.model', Response::MODEL_FILE)
-    ->param('bucketId', '', new UID(), 'Storage bucket unique ID. You can create a new storage bucket using the Storage service [server integration](/docs/server/storage#createBucket).')
+    ->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 unique ID.')
    ->param('name', null, new Text(255), 'Name of the file', true)
-    ->param('permissions', null, new Permissions(APP_LIMIT_ARRAY_PARAMS_SIZE, [Database::PERMISSION_READ, Database::PERMISSION_UPDATE, Database::PERMISSION_DELETE, Database::PERMISSION_WRITE]), 'An array of permission string. By default, the current permissions are inherited. [Learn more about permissions](/docs/permissions).', true)
+    ->param('permissions', null, new Permissions(APP_LIMIT_ARRAY_PARAMS_SIZE, [Database::PERMISSION_READ, Database::PERMISSION_UPDATE, Database::PERMISSION_DELETE, Database::PERMISSION_WRITE]), 'An array of permission string. By default, the current permissions are inherited. [Learn more about permissions](https://appwrite.io/docs/permissions).', true)
    ->inject('response')
    ->inject('dbForProject')
    ->inject('user')
    ->inject('mode')
-    ->inject('events')
-    ->action(function (string $bucketId, string $fileId, ?string $name, ?array $permissions, Response $response, Database $dbForProject, Document $user, string $mode, Event $events) {
+    ->inject('queueForEvents')
+    ->action(function (string $bucketId, string $fileId, ?string $name, ?array $permissions, Response $response, Database $dbForProject, Document $user, string $mode, Event $queueForEvents) {
+
        $bucket = Authorization::skip(fn () => $dbForProject->getDocument('buckets', $bucketId));

        $isAPIKey = Auth::isAppUser(Authorization::getRoles());
@ -1378,7 +1380,7 @@ App::put('/v1/storage/buckets/:bucketId/files/:fileId')
            $file = Authorization::skip(fn() => $dbForProject->updateDocument('bucket_' . $bucket->getInternalId(), $fileId, $file));
        }

-        $events
+        $queueForEvents
            ->setParam('bucketId', $bucket->getId())
            ->setParam('fileId', $file->getId())
            ->setContext('bucket', $bucket)
@ -1405,15 +1407,15 @@ App::delete('/v1/storage/buckets/:bucketId/files/:fileId')
    ->label('sdk.description', '/docs/references/storage/delete-file.md')
    ->label('sdk.response.code', Response::STATUS_CODE_NOCONTENT)
    ->label('sdk.response.model', Response::MODEL_NONE)
-    ->param('bucketId', '', new UID(), 'Storage bucket unique ID. You can create a new storage bucket using the Storage service [server integration](/docs/server/storage#createBucket).')
+    ->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.')
    ->inject('response')
    ->inject('dbForProject')
-    ->inject('events')
+    ->inject('queueForEvents')
    ->inject('mode')
    ->inject('deviceFiles')
-    ->inject('deletes')
-    ->action(function (string $bucketId, string $fileId, Response $response, Database $dbForProject, Event $events, string $mode, Device $deviceFiles, Delete $deletes) {
+    ->inject('queueForDeletes')
+    ->action(function (string $bucketId, string $fileId, Response $response, Database $dbForProject, Event $queueForEvents, string $mode, Device $deviceFiles, Delete $queueForDeletes) {
        $bucket = Authorization::skip(fn () => $dbForProject->getDocument('buckets', $bucketId));

        $isAPIKey = Auth::isAppUser(Authorization::getRoles());
@ -1453,7 +1455,7 @@ App::delete('/v1/storage/buckets/:bucketId/files/:fileId')
        }

        if ($deviceDeleted) {
-            $deletes
+            $queueForDeletes
                ->setType(DELETE_TYPE_CACHE_BY_RESOURCE)
                ->setResource('file/' . $fileId)
            ;
@ -1475,7 +1477,7 @@ App::delete('/v1/storage/buckets/:bucketId/files/:fileId')
            throw new Exception(Exception::GENERAL_SERVER_ERROR, 'Failed to delete file from device');
        }

-        $events
+        $queueForEvents
            ->setParam('bucketId', $bucket->getId())
            ->setParam('fileId', $file->getId())
            ->setContext('bucket', $bucket)
--- a/app/controllers/api/teams.php
+++ b/app/controllers/api/teams.php
@ -56,12 +56,12 @@ App::post('/v1/teams')
    ->label('sdk.response.model', Response::MODEL_TEAM)
    ->param('teamId', '', new CustomId(), 'Team 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.')
    ->param('name', null, new Text(128), 'Team name. Max length: 128 chars.')
-    ->param('roles', ['owner'], new ArrayList(new Key(), APP_LIMIT_ARRAY_PARAMS_SIZE), 'Array of strings. Use this param to set the roles in the team for the user who created it. The default role is **owner**. A role can be any string. Learn more about [roles and permissions](/docs/permissions). Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' roles are allowed, each 32 characters long.', true)
+    ->param('roles', ['owner'], new ArrayList(new Key(), APP_LIMIT_ARRAY_PARAMS_SIZE), 'Array of strings. Use this param to set the roles in the team for the user who created it. The default role is **owner**. A role can be any string. Learn more about [roles and permissions](https://appwrite.io/docs/permissions). Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' roles are allowed, each 32 characters long.', true)
    ->inject('response')
    ->inject('user')
    ->inject('dbForProject')
-    ->inject('events')
-    ->action(function (string $teamId, string $name, array $roles, Response $response, Document $user, Database $dbForProject, Event $events) {
+    ->inject('queueForEvents')
+    ->action(function (string $teamId, string $name, array $roles, Response $response, Document $user, Database $dbForProject, Event $queueForEvents) {

        $isPrivilegedUser = Auth::isPrivilegedUser(Authorization::getRoles());
        $isAppUser = Auth::isAppUser(Authorization::getRoles());
@ -117,10 +117,10 @@ App::post('/v1/teams')
            $dbForProject->deleteCachedDocument('users', $user->getId());
        }

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

        if (!empty($user->getId())) {
-            $events->setParam('userId', $user->getId());
+            $queueForEvents->setParam('userId', $user->getId());
        }

        $response
@ -256,8 +256,8 @@ App::put('/v1/teams/:teamId')
    ->inject('requestTimestamp')
    ->inject('response')
    ->inject('dbForProject')
-    ->inject('events')
-    ->action(function (string $teamId, string $name, ?\DateTime $requestTimestamp, Response $response, Database $dbForProject, Event $events) {
+    ->inject('queueForEvents')
+    ->action(function (string $teamId, string $name, ?\DateTime $requestTimestamp, Response $response, Database $dbForProject, Event $queueForEvents) {

        $team = $dbForProject->getDocument('teams', $teamId);

@ -273,7 +273,7 @@ App::put('/v1/teams/:teamId')
            return $dbForProject->updateDocument('teams', $team->getId(), $team);
        });

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

        $response->dynamic($team, Response::MODEL_TEAM);
    });
@ -298,8 +298,8 @@ App::put('/v1/teams/:teamId/prefs')
    ->param('prefs', '', new Assoc(), 'Prefs key-value JSON object.')
    ->inject('response')
    ->inject('dbForProject')
-    ->inject('events')
-    ->action(function (string $teamId, array $prefs, Response $response, Database $dbForProject, Event $events) {
+    ->inject('queueForEvents')
+    ->action(function (string $teamId, array $prefs, Response $response, Database $dbForProject, Event $queueForEvents) {

        $team = $dbForProject->getDocument('teams', $teamId);

@ -309,7 +309,7 @@ App::put('/v1/teams/:teamId/prefs')

        $team = $dbForProject->updateDocument('teams', $team->getId(), $team->setAttribute('prefs', $prefs));

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

        $response->dynamic(new Document($prefs), Response::MODEL_PREFERENCES);
    });
@ -330,9 +330,9 @@ App::delete('/v1/teams/:teamId')
    ->param('teamId', '', new UID(), 'Team ID.')
    ->inject('response')
    ->inject('dbForProject')
-    ->inject('events')
-    ->inject('deletes')
-    ->action(function (string $teamId, Response $response, Database $dbForProject, Event $events, Delete $deletes) {
+    ->inject('queueForEvents')
+    ->inject('queueForDeletes')
+    ->action(function (string $teamId, Response $response, Database $dbForProject, Event $queueForEvents, Delete $queueForDeletes) {

        $team = $dbForProject->getDocument('teams', $teamId);

@ -344,11 +344,11 @@ App::delete('/v1/teams/:teamId')
            throw new Exception(Exception::GENERAL_SERVER_ERROR, 'Failed to remove team from DB');
        }

-        $deletes
+        $queueForDeletes
            ->setType(DELETE_TYPE_DOCUMENT)
            ->setDocument($team);

-        $events
+        $queueForEvents
            ->setParam('teamId', $team->getId())
            ->setPayload($response->output($team, Response::MODEL_TEAM))
        ;
@ -377,7 +377,7 @@ App::post('/v1/teams/:teamId/memberships')
    ->param('email', '', new Email(), 'Email of the new team member.', true)
    ->param('userId', '', new UID(), 'ID of the user to be added to a team.', true)
    ->param('phone', '', new Phone(), 'Phone number. Format this number with a leading \'+\' and a country code, e.g., +16175551212.', true)
-    ->param('roles', [], new ArrayList(new Key(), APP_LIMIT_ARRAY_PARAMS_SIZE), 'Array of strings. Use this param to set the user roles in the team. A role can be any string. Learn more about [roles and permissions](/docs/permissions). Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' roles are allowed, each 32 characters long.')
+    ->param('roles', [], new ArrayList(new Key(), APP_LIMIT_ARRAY_PARAMS_SIZE), 'Array of strings. Use this param to set the user roles in the team. A role can be any string. Learn more about [roles and permissions](https://appwrite.io/docs/permissions). Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' roles are allowed, each 32 characters long.')
    ->param('url', '', fn($clients) => new Host($clients), 'URL to redirect the user back to your app from the invitation email.  Only URLs from hostnames in your project platform list are allowed. This requirement helps to prevent an [open redirect](https://cheatsheetseries.owasp.org/cheatsheets/Unvalidated_Redirects_and_Forwards_Cheat_Sheet.html) attack against your project API.', true, ['clients']) // TODO add our own built-in confirm page
    ->param('name', '', new Text(128), 'Name of the new team member. Max length: 128 chars.', true)
    ->param('from', '', new Text(128), 'Sender of the message. It can be alphanumeric (Ex: MyCompany20). Restrictions may apply depending of the destination.', true)
@ -386,10 +386,10 @@ App::post('/v1/teams/:teamId/memberships')
    ->inject('user')
    ->inject('dbForProject')
    ->inject('locale')
-    ->inject('mails')
-    ->inject('messaging')
-    ->inject('events')
-    ->action(function (string $teamId, string $email, string $userId, string $phone, array $roles, string $url, string $name, string $from, Response $response, Document $project, Document $user, Database $dbForProject, Locale $locale, Mail $mails, Messaging $messaging, Event $events) {
+    ->inject('queueForMails')
+    ->inject('queueForMessaging')
+    ->inject('queueForEvents')
+    ->action(function (string $teamId, string $email, string $userId, string $phone, array $roles, string $url, string $name, string $from, Response $response, Document $project, Document $user, Database $dbForProject, Locale $locale, Mail $queueForMails, Messaging $queueForMessaging, Event $queueForEvents) {
        $isAPIKey = Auth::isAppUser(Authorization::getRoles());
        $isPrivilegedUser = Auth::isPrivilegedUser(Authorization::getRoles());

@ -577,7 +577,7 @@ App::post('/v1/teams/:teamId/memberships')
                        $replyTo = $smtp['replyTo'];
                    }

-                    $mails
+                    $queueForMails
                        ->setSmtpHost($smtp['host'] ?? '')
                        ->setSmtpPort($smtp['port'] ?? '')
                        ->setSmtpUsername($smtp['username'] ?? '')
@ -599,7 +599,7 @@ App::post('/v1/teams/:teamId/memberships')
                        $subject = $customTemplate['subject'] ?? $subject;
                    }

-                    $mails
+                    $queueForMails
                        ->setSmtpReplyTo($replyTo)
                        ->setSmtpSenderEmail($senderEmail)
                        ->setSmtpSenderName($senderName);
@ -624,7 +624,7 @@ App::post('/v1/teams/:teamId/memberships')
                    'redirect' => $url
                ];

-                $mails
+                $queueForMails
                    ->setSubject($subject)
                    ->setBody($body)
                    ->setRecipient($invitee->getAttribute('email'))
@ -672,14 +672,14 @@ App::post('/v1/teams/:teamId/memberships')
                    'deliveryTime' => Datetime::now(),
                ]));

-                $messaging
+                $queueForMessaging
                    ->setMessageId($messageDoc->getId())
                    ->setProject($project)
                    ->trigger();
            }
        }

-        $events
+        $queueForEvents
            ->setParam('teamId', $team->getId())
            ->setParam('membershipId', $membership->getId())
        ;
@ -842,8 +842,8 @@ App::patch('/v1/teams/:teamId/memberships/:membershipId')
    ->inject('response')
    ->inject('user')
    ->inject('dbForProject')
-    ->inject('events')
-    ->action(function (string $teamId, string $membershipId, array $roles, Request $request, Response $response, Document $user, Database $dbForProject, Event $events) {
+    ->inject('queueForEvents')
+    ->action(function (string $teamId, string $membershipId, array $roles, Request $request, Response $response, Document $user, Database $dbForProject, Event $queueForEvents) {

        $team = $dbForProject->getDocument('teams', $teamId);
        if ($team->isEmpty()) {
@ -879,7 +879,7 @@ App::patch('/v1/teams/:teamId/memberships/:membershipId')
         */
        $dbForProject->deleteCachedDocument('users', $profile->getId());

-        $events
+        $queueForEvents
            ->setParam('teamId', $team->getId())
            ->setParam('membershipId', $membership->getId());

@ -917,8 +917,8 @@ App::patch('/v1/teams/:teamId/memberships/:membershipId/status')
    ->inject('dbForProject')
    ->inject('project')
    ->inject('geodb')
-    ->inject('events')
-    ->action(function (string $teamId, string $membershipId, string $userId, string $secret, Request $request, Response $response, Document $user, Database $dbForProject, Document $project, Reader $geodb, Event $events) {
+    ->inject('queueForEvents')
+    ->action(function (string $teamId, string $membershipId, string $userId, string $secret, Request $request, Response $response, Document $user, Database $dbForProject, Document $project, Reader $geodb, Event $queueForEvents) {
        $protocol = $request->getProtocol();

        $membership = $dbForProject->getDocument('memberships', $membershipId);
@ -1002,7 +1002,7 @@ App::patch('/v1/teams/:teamId/memberships/:membershipId/status')

        $team = Authorization::skip(fn() => $dbForProject->updateDocument('teams', $team->getId(), $team->setAttribute('total', $team->getAttribute('total', 0) + 1)));

-        $events
+        $queueForEvents
            ->setParam('teamId', $team->getId())
            ->setParam('membershipId', $membership->getId())
        ;
@ -1044,8 +1044,8 @@ App::delete('/v1/teams/:teamId/memberships/:membershipId')
    ->param('membershipId', '', new UID(), 'Membership ID.')
    ->inject('response')
    ->inject('dbForProject')
-    ->inject('events')
-    ->action(function (string $teamId, string $membershipId, Response $response, Database $dbForProject, Event $events) {
+    ->inject('queueForEvents')
+    ->action(function (string $teamId, string $membershipId, Response $response, Database $dbForProject, Event $queueForEvents) {

        $membership = $dbForProject->getDocument('memberships', $membershipId);

@ -1084,7 +1084,7 @@ App::delete('/v1/teams/:teamId/memberships/:membershipId')
            Authorization::skip(fn() => $dbForProject->updateDocument('teams', $team->getId(), $team));
        }

-        $events
+        $queueForEvents
            ->setParam('teamId', $team->getId())
            ->setParam('membershipId', $membership->getId())
            ->setPayload($response->output($membership, Response::MODEL_MEMBERSHIP))
--- a/app/controllers/api/users.php
+++ b/app/controllers/api/users.php
@ -41,7 +41,7 @@ use Appwrite\Auth\Validator\PasswordDictionary;
 use Appwrite\Auth\Validator\PersonalData;

 /** TODO: Remove function when we move to using utopia/platform */
-function createUser(string $hash, mixed $hashOptions, string $userId, ?string $email, ?string $password, ?string $phone, string $name, Document $project, Database $dbForProject, Event $events): Document
+function createUser(string $hash, mixed $hashOptions, string $userId, ?string $email, ?string $password, ?string $phone, string $name, Document $project, Database $dbForProject, Event $queueForEvents): Document
 {
    $hashOptionsObject = (\is_string($hashOptions)) ? \json_decode($hashOptions, true) : $hashOptions; // Cast to JSON array
    $passwordHistory = $project->getAttribute('auths', [])['passwordHistory'] ?? 0;
@ -102,7 +102,7 @@ function createUser(string $hash, mixed $hashOptions, string $userId, ?string $e
        throw new Exception(Exception::USER_ALREADY_EXISTS);
    }

-    $events->setParam('userId', $user->getId());
+    $queueForEvents->setParam('userId', $user->getId());

    return $user;
 }
@ -130,10 +130,9 @@ App::post('/v1/users')
    ->inject('response')
    ->inject('project')
    ->inject('dbForProject')
-    ->inject('events')
-    ->action(function (string $userId, ?string $email, ?string $phone, ?string $password, string $name, Response $response, Document $project, Database $dbForProject, Event $events) {
-
-        $user = createUser('plaintext', '{}', $userId, $email, $password, $phone, $name, $project, $dbForProject, $events);
+    ->inject('queueForEvents')
+    ->action(function (string $userId, ?string $email, ?string $phone, ?string $password, string $name, Response $response, Document $project, Database $dbForProject, Event $queueForEvents) {
+        $user = createUser('plaintext', '{}', $userId, $email, $password, $phone, $name, $project, $dbForProject, $queueForEvents);

        $response
            ->setStatusCode(Response::STATUS_CODE_CREATED)
@ -162,9 +161,9 @@ App::post('/v1/users/bcrypt')
    ->inject('response')
    ->inject('project')
    ->inject('dbForProject')
-    ->inject('events')
-    ->action(function (string $userId, string $email, string $password, string $name, Response $response, Document $project, Database $dbForProject, Event $events) {
-        $user = createUser('bcrypt', '{}', $userId, $email, $password, null, $name, $project, $dbForProject, $events);
+    ->inject('queueForEvents')
+    ->action(function (string $userId, string $email, string $password, string $name, Response $response, Document $project, Database $dbForProject, Event $queueForEvents) {
+        $user = createUser('bcrypt', '{}', $userId, $email, $password, null, $name, $project, $dbForProject, $queueForEvents);

        $response
            ->setStatusCode(Response::STATUS_CODE_CREATED)
@ -193,9 +192,9 @@ App::post('/v1/users/md5')
    ->inject('response')
    ->inject('project')
    ->inject('dbForProject')
-    ->inject('events')
-    ->action(function (string $userId, string $email, string $password, string $name, Response $response, Document $project, Database $dbForProject, Event $events) {
-        $user = createUser('md5', '{}', $userId, $email, $password, null, $name, $project, $dbForProject, $events);
+    ->inject('queueForEvents')
+    ->action(function (string $userId, string $email, string $password, string $name, Response $response, Document $project, Database $dbForProject, Event $queueForEvents) {
+        $user = createUser('md5', '{}', $userId, $email, $password, null, $name, $project, $dbForProject, $queueForEvents);

        $response
            ->setStatusCode(Response::STATUS_CODE_CREATED)
@ -224,9 +223,9 @@ App::post('/v1/users/argon2')
    ->inject('response')
    ->inject('project')
    ->inject('dbForProject')
-    ->inject('events')
-    ->action(function (string $userId, string $email, string $password, string $name, Response $response, Document $project, Database $dbForProject, Event $events) {
-        $user = createUser('argon2', '{}', $userId, $email, $password, null, $name, $project, $dbForProject, $events);
+    ->inject('queueForEvents')
+    ->action(function (string $userId, string $email, string $password, string $name, Response $response, Document $project, Database $dbForProject, Event $queueForEvents) {
+        $user = createUser('argon2', '{}', $userId, $email, $password, null, $name, $project, $dbForProject, $queueForEvents);

        $response
            ->setStatusCode(Response::STATUS_CODE_CREATED)
@ -256,15 +255,15 @@ App::post('/v1/users/sha')
    ->inject('response')
    ->inject('project')
    ->inject('dbForProject')
-    ->inject('events')
-    ->action(function (string $userId, string $email, string $password, string $passwordVersion, string $name, Response $response, Document $project, Database $dbForProject, Event $events) {
+    ->inject('queueForEvents')
+    ->action(function (string $userId, string $email, string $password, string $passwordVersion, string $name, Response $response, Document $project, Database $dbForProject, Event $queueForEvents) {
        $options = '{}';

        if (!empty($passwordVersion)) {
            $options = '{"version":"' . $passwordVersion . '"}';
        }

-        $user = createUser('sha', $options, $userId, $email, $password, null, $name, $project, $dbForProject, $events);
+        $user = createUser('sha', $options, $userId, $email, $password, null, $name, $project, $dbForProject, $queueForEvents);

        $response
            ->setStatusCode(Response::STATUS_CODE_CREATED)
@ -293,9 +292,9 @@ App::post('/v1/users/phpass')
    ->inject('response')
    ->inject('project')
    ->inject('dbForProject')
-    ->inject('events')
-    ->action(function (string $userId, string $email, string $password, string $name, Response $response, Document $project, Database $dbForProject, Event $events) {
-        $user = createUser('phpass', '{}', $userId, $email, $password, null, $name, $project, $dbForProject, $events);
+    ->inject('queueForEvents')
+    ->action(function (string $userId, string $email, string $password, string $name, Response $response, Document $project, Database $dbForProject, Event $queueForEvents) {
+        $user = createUser('phpass', '{}', $userId, $email, $password, null, $name, $project, $dbForProject, $queueForEvents);

        $response
            ->setStatusCode(Response::STATUS_CODE_CREATED)
@ -329,8 +328,8 @@ App::post('/v1/users/scrypt')
    ->inject('response')
    ->inject('project')
    ->inject('dbForProject')
-    ->inject('events')
-    ->action(function (string $userId, string $email, string $password, string $passwordSalt, int $passwordCpu, int $passwordMemory, int $passwordParallel, int $passwordLength, string $name, Response $response, Document $project, Database $dbForProject, Event $events) {
+    ->inject('queueForEvents')
+    ->action(function (string $userId, string $email, string $password, string $passwordSalt, int $passwordCpu, int $passwordMemory, int $passwordParallel, int $passwordLength, string $name, Response $response, Document $project, Database $dbForProject, Event $queueForEvents) {
        $options = [
            'salt' => $passwordSalt,
            'costCpu' => $passwordCpu,
@ -339,7 +338,7 @@ App::post('/v1/users/scrypt')
            'length' => $passwordLength
        ];

-        $user = createUser('scrypt', \json_encode($options), $userId, $email, $password, null, $name, $project, $dbForProject, $events);
+        $user = createUser('scrypt', \json_encode($options), $userId, $email, $password, null, $name, $project, $dbForProject, $queueForEvents);

        $response
            ->setStatusCode(Response::STATUS_CODE_CREATED)
@ -371,9 +370,9 @@ App::post('/v1/users/scrypt-modified')
    ->inject('response')
    ->inject('project')
    ->inject('dbForProject')
-    ->inject('events')
-    ->action(function (string $userId, string $email, string $password, string $passwordSalt, string $passwordSaltSeparator, string $passwordSignerKey, string $name, Response $response, Document $project, Database $dbForProject, Event $events) {
-        $user = createUser('scryptMod', '{"signerKey":"' . $passwordSignerKey . '","saltSeparator":"' . $passwordSaltSeparator . '","salt":"' . $passwordSalt . '"}', $userId, $email, $password, null, $name, $project, $dbForProject, $events);
+    ->inject('queueForEvents')
+    ->action(function (string $userId, string $email, string $password, string $passwordSalt, string $passwordSaltSeparator, string $passwordSignerKey, string $name, Response $response, Document $project, Database $dbForProject, Event $queueForEvents) {
+        $user = createUser('scryptMod', '{"signerKey":"' . $passwordSignerKey . '","saltSeparator":"' . $passwordSaltSeparator . '","salt":"' . $passwordSalt . '"}', $userId, $email, $password, null, $name, $project, $dbForProject, $queueForEvents);

        $response
            ->setStatusCode(Response::STATUS_CODE_CREATED)
@ -835,8 +834,8 @@ App::patch('/v1/users/:userId/status')
    ->param('status', null, new Boolean(true), 'User Status. To activate the user pass `true` and to block the user pass `false`.')
    ->inject('response')
    ->inject('dbForProject')
-    ->inject('events')
-    ->action(function (string $userId, bool $status, Response $response, Database $dbForProject, Event $events) {
+    ->inject('queueForEvents')
+    ->action(function (string $userId, bool $status, Response $response, Database $dbForProject, Event $queueForEvents) {

        $user = $dbForProject->getDocument('users', $userId);

@ -846,7 +845,7 @@ App::patch('/v1/users/:userId/status')

        $user = $dbForProject->updateDocument('users', $user->getId(), $user->setAttribute('status', (bool) $status));

-        $events
+        $queueForEvents
            ->setParam('userId', $user->getId());

        $response->dynamic($user, Response::MODEL_USER);
@ -871,8 +870,8 @@ App::put('/v1/users/:userId/labels')
    ->param('labels', [], new ArrayList(new Text(36, allowList: [...Text::NUMBERS, ...Text::ALPHABET_UPPER, ...Text::ALPHABET_LOWER]), APP_LIMIT_ARRAY_PARAMS_SIZE), 'Array of user labels. Replaces the previous labels. Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' labels are allowed, each up to 36 alphanumeric characters long.')
    ->inject('response')
    ->inject('dbForProject')
-    ->inject('events')
-    ->action(function (string $userId, array $labels, Response $response, Database $dbForProject, Event $events) {
+    ->inject('queueForEvents')
+    ->action(function (string $userId, array $labels, Response $response, Database $dbForProject, Event $queueForEvents) {

        $user = $dbForProject->getDocument('users', $userId);

@ -884,7 +883,7 @@ App::put('/v1/users/:userId/labels')

        $user = $dbForProject->updateDocument('users', $user->getId(), $user);

-        $events
+        $queueForEvents
            ->setParam('userId', $user->getId());

        $response->dynamic($user, Response::MODEL_USER);
@ -909,8 +908,8 @@ App::patch('/v1/users/:userId/verification/phone')
    ->param('phoneVerification', false, new Boolean(), 'User phone verification status.')
    ->inject('response')
    ->inject('dbForProject')
-    ->inject('events')
-    ->action(function (string $userId, bool $phoneVerification, Response $response, Database $dbForProject, Event $events) {
+    ->inject('queueForEvents')
+    ->action(function (string $userId, bool $phoneVerification, Response $response, Database $dbForProject, Event $queueForEvents) {

        $user = $dbForProject->getDocument('users', $userId);

@ -920,7 +919,7 @@ App::patch('/v1/users/:userId/verification/phone')

        $user = $dbForProject->updateDocument('users', $user->getId(), $user->setAttribute('phoneVerification', $phoneVerification));

-        $events
+        $queueForEvents
            ->setParam('userId', $user->getId());

        $response->dynamic($user, Response::MODEL_USER);
@ -946,8 +945,8 @@ App::patch('/v1/users/:userId/name')
    ->param('name', '', new Text(128), 'User name. Max length: 128 chars.')
    ->inject('response')
    ->inject('dbForProject')
-    ->inject('events')
-    ->action(function (string $userId, string $name, Response $response, Database $dbForProject, Event $events) {
+    ->inject('queueForEvents')
+    ->action(function (string $userId, string $name, Response $response, Database $dbForProject, Event $queueForEvents) {

        $user = $dbForProject->getDocument('users', $userId);

@ -959,7 +958,7 @@ App::patch('/v1/users/:userId/name')

        $user = $dbForProject->updateDocument('users', $user->getId(), $user);

-        $events->setParam('userId', $user->getId());
+        $queueForEvents->setParam('userId', $user->getId());

        $response->dynamic($user, Response::MODEL_USER);
    });
@ -985,8 +984,8 @@ App::patch('/v1/users/:userId/password')
    ->inject('response')
    ->inject('project')
    ->inject('dbForProject')
-    ->inject('events')
-    ->action(function (string $userId, string $password, Response $response, Document $project, Database $dbForProject, Event $events) {
+    ->inject('queueForEvents')
+    ->action(function (string $userId, string $password, Response $response, Document $project, Database $dbForProject, Event $queueForEvents) {

        $user = $dbForProject->getDocument('users', $userId);

@ -1024,7 +1023,7 @@ App::patch('/v1/users/:userId/password')

        $user = $dbForProject->updateDocument('users', $user->getId(), $user);

-        $events->setParam('userId', $user->getId());
+        $queueForEvents->setParam('userId', $user->getId());

        $response->dynamic($user, Response::MODEL_USER);
    });
@ -1049,8 +1048,8 @@ App::patch('/v1/users/:userId/email')
    ->param('email', '', new Email(), 'User email.')
    ->inject('response')
    ->inject('dbForProject')
-    ->inject('events')
-    ->action(function (string $userId, string $email, Response $response, Database $dbForProject, Event $events) {
+    ->inject('queueForEvents')
+    ->action(function (string $userId, string $email, Response $response, Database $dbForProject, Event $queueForEvents) {

        $user = $dbForProject->getDocument('users', $userId);

@ -1081,7 +1080,7 @@ App::patch('/v1/users/:userId/email')
            throw new Exception(Exception::USER_EMAIL_ALREADY_EXISTS);
        }

-        $events->setParam('userId', $user->getId());
+        $queueForEvents->setParam('userId', $user->getId());

        $response->dynamic($user, Response::MODEL_USER);
    });
@ -1105,8 +1104,8 @@ App::patch('/v1/users/:userId/phone')
    ->param('number', '', new Phone(), 'User phone number.')
    ->inject('response')
    ->inject('dbForProject')
-    ->inject('events')
-    ->action(function (string $userId, string $number, Response $response, Database $dbForProject, Event $events) {
+    ->inject('queueForEvents')
+    ->action(function (string $userId, string $number, Response $response, Database $dbForProject, Event $queueForEvents) {

        $user = $dbForProject->getDocument('users', $userId);

@ -1125,7 +1124,7 @@ App::patch('/v1/users/:userId/phone')
            throw new Exception(Exception::USER_PHONE_ALREADY_EXISTS);
        }

-        $events->setParam('userId', $user->getId());
+        $queueForEvents->setParam('userId', $user->getId());

        $response->dynamic($user, Response::MODEL_USER);
    });
@ -1150,8 +1149,8 @@ App::patch('/v1/users/:userId/verification')
    ->param('emailVerification', false, new Boolean(), 'User email verification status.')
    ->inject('response')
    ->inject('dbForProject')
-    ->inject('events')
-    ->action(function (string $userId, bool $emailVerification, Response $response, Database $dbForProject, Event $events) {
+    ->inject('queueForEvents')
+    ->action(function (string $userId, bool $emailVerification, Response $response, Database $dbForProject, Event $queueForEvents) {

        $user = $dbForProject->getDocument('users', $userId);

@ -1161,7 +1160,7 @@ App::patch('/v1/users/:userId/verification')

        $user = $dbForProject->updateDocument('users', $user->getId(), $user->setAttribute('emailVerification', $emailVerification));

-        $events->setParam('userId', $user->getId());
+        $queueForEvents->setParam('userId', $user->getId());

        $response->dynamic($user, Response::MODEL_USER);
    });
@ -1183,8 +1182,8 @@ App::patch('/v1/users/:userId/prefs')
    ->param('prefs', '', new Assoc(), 'Prefs key-value JSON object.')
    ->inject('response')
    ->inject('dbForProject')
-    ->inject('events')
-    ->action(function (string $userId, array $prefs, Response $response, Database $dbForProject, Event $events) {
+    ->inject('queueForEvents')
+    ->action(function (string $userId, array $prefs, Response $response, Database $dbForProject, Event $queueForEvents) {

        $user = $dbForProject->getDocument('users', $userId);

@ -1194,7 +1193,7 @@ App::patch('/v1/users/:userId/prefs')

        $user = $dbForProject->updateDocument('users', $user->getId(), $user->setAttribute('prefs', $prefs));

-        $events
+        $queueForEvents
            ->setParam('userId', $user->getId());

        $response->dynamic(new Document($prefs), Response::MODEL_PREFERENCES);
@ -1268,8 +1267,8 @@ App::delete('/v1/users/:userId/sessions/:sessionId')
    ->param('sessionId', '', new UID(), 'Session ID.')
    ->inject('response')
    ->inject('dbForProject')
-    ->inject('events')
-    ->action(function (string $userId, string $sessionId, Response $response, Database $dbForProject, Event $events) {
+    ->inject('queueForEvents')
+    ->action(function (string $userId, string $sessionId, Response $response, Database $dbForProject, Event $queueForEvents) {

        $user = $dbForProject->getDocument('users', $userId);

@ -1286,7 +1285,7 @@ App::delete('/v1/users/:userId/sessions/:sessionId')
        $dbForProject->deleteDocument('sessions', $session->getId());
        $dbForProject->deleteCachedDocument('users', $user->getId());

-        $events
+        $queueForEvents
            ->setParam('userId', $user->getId())
            ->setParam('sessionId', $sessionId)
            ->setPayload($response->output($session, Response::MODEL_SESSION));
@ -1311,8 +1310,8 @@ App::delete('/v1/users/:userId/sessions')
    ->param('userId', '', new UID(), 'User ID.')
    ->inject('response')
    ->inject('dbForProject')
-    ->inject('events')
-    ->action(function (string $userId, Response $response, Database $dbForProject, Event $events) {
+    ->inject('queueForEvents')
+    ->action(function (string $userId, Response $response, Database $dbForProject, Event $queueForEvents) {

        $user = $dbForProject->getDocument('users', $userId);

@ -1330,7 +1329,7 @@ App::delete('/v1/users/:userId/sessions')

        $dbForProject->deleteCachedDocument('users', $user->getId());

-        $events
+        $queueForEvents
            ->setParam('userId', $user->getId())
            ->setPayload($response->output($user, Response::MODEL_USER));

@ -1354,9 +1353,9 @@ App::delete('/v1/users/:userId')
    ->param('userId', '', new UID(), 'User ID.')
    ->inject('response')
    ->inject('dbForProject')
-    ->inject('events')
-    ->inject('deletes')
-    ->action(function (string $userId, Response $response, Database $dbForProject, Event $events, Delete $deletes) {
+    ->inject('queueForEvents')
+    ->inject('queueForDeletes')
+    ->action(function (string $userId, Response $response, Database $dbForProject, Event $queueForEvents, Delete $queueForDeletes) {

        $user = $dbForProject->getDocument('users', $userId);

@ -1369,11 +1368,11 @@ App::delete('/v1/users/:userId')

        $dbForProject->deleteDocument('users', $userId);

-        $deletes
+        $queueForDeletes
            ->setType(DELETE_TYPE_DOCUMENT)
            ->setDocument($clone);

-        $events
+        $queueForEvents
            ->setParam('userId', $user->getId())
            ->setPayload($response->output($clone, Response::MODEL_USER));

@ -1439,9 +1438,7 @@ App::delete('/v1/users/identities/:identityId')
    ->param('identityId', '', new UID(), 'Identity ID.')
    ->inject('response')
    ->inject('dbForProject')
-    ->inject('events')
-    ->inject('deletes')
-    ->action(function (string $identityId, Response $response, Database $dbForProject, Event $events, Delete $deletes) {
+    ->action(function (string $identityId, Response $response, Database $dbForProject) {

        $identity = $dbForProject->getDocument('identities', $identityId);

--- a/Show more
+++ b/Show more