diff --git a/app/http.php b/app/http.php
index 63896015ab..6f72f81d47 100644
--- a/app/http.php
+++ b/app/http.php
@@ -27,6 +27,7 @@ global $global, $container;
 
 $payloadSize = 12 * (1024 * 1024); // 12MB - adding slight buffer for headers and other data that might be sent with the payload - update later with valid testing
 $workerNumber = swoole_cpu_num() * intval(System::getEnv('_APP_WORKER_PER_CORE', 2));
+Response\Models::init();
 
 $server = new Server('0.0.0.0', '80', [
     'open_http2_protocol' => true,
diff --git a/src/Appwrite/GraphQL/Schema.php b/src/Appwrite/GraphQL/Schema.php
index 01b9711dec..1ffd6edf91 100644
--- a/src/Appwrite/GraphQL/Schema.php
+++ b/src/Appwrite/GraphQL/Schema.php
@@ -98,7 +98,7 @@ class Schema
      */
     protected function api(Http $http, Request $request, UtopiaHttpResponse $response, Container $container, callable $complexity): array
     {
-        Mapper::init((new Response($response))->getModels());
+        Mapper::init(Response\Models::getModels());
 
         $mapper = new Mapper();
 
diff --git a/src/Appwrite/Platform/Tasks/Specs.php b/src/Appwrite/Platform/Tasks/Specs.php
index c7c0fc5760..e57587d637 100644
--- a/src/Appwrite/Platform/Tasks/Specs.php
+++ b/src/Appwrite/Platform/Tasks/Specs.php
@@ -256,7 +256,7 @@ class Specs extends Action
                 ];
             }
 
-            $models = $response->getModels();
+            $models = Response\Models::getModels();
 
             foreach ($models as $key => $value) {
                 if ($platform !== APP_PLATFORM_CONSOLE && !$value->isPublic()) {
diff --git a/src/Appwrite/Utopia/Response.php b/src/Appwrite/Utopia/Response.php
index 0f23874fc7..0bc281a8e3 100644
--- a/src/Appwrite/Utopia/Response.php
+++ b/src/Appwrite/Utopia/Response.php
@@ -3,109 +3,12 @@
 namespace Appwrite\Utopia;
 
 use Appwrite\Utopia\Response\Filter;
-use Appwrite\Utopia\Response\Model;
-use Appwrite\Utopia\Response\Model\Account;
-use Appwrite\Utopia\Response\Model\AlgoArgon2;
-use Appwrite\Utopia\Response\Model\AlgoBcrypt;
-use Appwrite\Utopia\Response\Model\AlgoMd5;
-use Appwrite\Utopia\Response\Model\AlgoPhpass;
-use Appwrite\Utopia\Response\Model\AlgoScrypt;
-use Appwrite\Utopia\Response\Model\AlgoScryptModified;
-use Appwrite\Utopia\Response\Model\AlgoSha;
-use Appwrite\Utopia\Response\Model\Any;
-use Appwrite\Utopia\Response\Model\Attribute;
-use Appwrite\Utopia\Response\Model\AttributeBoolean;
-use Appwrite\Utopia\Response\Model\AttributeDatetime;
-use Appwrite\Utopia\Response\Model\AttributeEmail;
-use Appwrite\Utopia\Response\Model\AttributeEnum;
-use Appwrite\Utopia\Response\Model\AttributeFloat;
-use Appwrite\Utopia\Response\Model\AttributeInteger;
-use Appwrite\Utopia\Response\Model\AttributeIP;
-use Appwrite\Utopia\Response\Model\AttributeList;
-use Appwrite\Utopia\Response\Model\AttributeRelationship;
-use Appwrite\Utopia\Response\Model\AttributeString;
-use Appwrite\Utopia\Response\Model\AttributeURL;
-use Appwrite\Utopia\Response\Model\AuthProvider;
-use Appwrite\Utopia\Response\Model\BaseList;
-use Appwrite\Utopia\Response\Model\Branch;
-use Appwrite\Utopia\Response\Model\Bucket;
-use Appwrite\Utopia\Response\Model\Build;
-use Appwrite\Utopia\Response\Model\Collection;
-use Appwrite\Utopia\Response\Model\ConsoleVariables;
-use Appwrite\Utopia\Response\Model\Continent;
-use Appwrite\Utopia\Response\Model\Country;
-use Appwrite\Utopia\Response\Model\Currency;
-use Appwrite\Utopia\Response\Model\Database;
-use Appwrite\Utopia\Response\Model\Deployment;
-use Appwrite\Utopia\Response\Model\Detection;
-use Appwrite\Utopia\Response\Model\Document as ModelDocument;
-use Appwrite\Utopia\Response\Model\Error;
-use Appwrite\Utopia\Response\Model\ErrorDev;
-use Appwrite\Utopia\Response\Model\Execution;
-use Appwrite\Utopia\Response\Model\File;
-use Appwrite\Utopia\Response\Model\Func;
-use Appwrite\Utopia\Response\Model\Headers;
-use Appwrite\Utopia\Response\Model\HealthAntivirus;
-use Appwrite\Utopia\Response\Model\HealthCertificate;
-use Appwrite\Utopia\Response\Model\HealthQueue;
-use Appwrite\Utopia\Response\Model\HealthStatus;
-use Appwrite\Utopia\Response\Model\HealthTime;
-use Appwrite\Utopia\Response\Model\HealthVersion;
-use Appwrite\Utopia\Response\Model\Identity;
-use Appwrite\Utopia\Response\Model\Index;
-use Appwrite\Utopia\Response\Model\Installation;
-use Appwrite\Utopia\Response\Model\JWT;
-use Appwrite\Utopia\Response\Model\Key;
-use Appwrite\Utopia\Response\Model\Language;
-use Appwrite\Utopia\Response\Model\Locale;
-use Appwrite\Utopia\Response\Model\LocaleCode;
-use Appwrite\Utopia\Response\Model\Log;
-use Appwrite\Utopia\Response\Model\Membership;
-use Appwrite\Utopia\Response\Model\Message;
-use Appwrite\Utopia\Response\Model\Metric;
-use Appwrite\Utopia\Response\Model\MetricBreakdown;
-use Appwrite\Utopia\Response\Model\MFAChallenge;
-use Appwrite\Utopia\Response\Model\MFAFactors;
-use Appwrite\Utopia\Response\Model\MFARecoveryCodes;
-use Appwrite\Utopia\Response\Model\MFAType;
-use Appwrite\Utopia\Response\Model\Migration;
-use Appwrite\Utopia\Response\Model\MigrationFirebaseProject;
-use Appwrite\Utopia\Response\Model\MigrationReport;
-use Appwrite\Utopia\Response\Model\Mock;
-use Appwrite\Utopia\Response\Model\None;
-use Appwrite\Utopia\Response\Model\Phone;
-use Appwrite\Utopia\Response\Model\Platform;
-use Appwrite\Utopia\Response\Model\Preferences;
-use Appwrite\Utopia\Response\Model\Project;
-use Appwrite\Utopia\Response\Model\Provider;
-use Appwrite\Utopia\Response\Model\ProviderRepository;
-use Appwrite\Utopia\Response\Model\Rule;
-use Appwrite\Utopia\Response\Model\Runtime;
-use Appwrite\Utopia\Response\Model\Session;
-use Appwrite\Utopia\Response\Model\Subscriber;
-use Appwrite\Utopia\Response\Model\Target;
-use Appwrite\Utopia\Response\Model\Team;
-use Appwrite\Utopia\Response\Model\TemplateEmail;
-use Appwrite\Utopia\Response\Model\TemplateSMS;
-use Appwrite\Utopia\Response\Model\Token;
-use Appwrite\Utopia\Response\Model\Topic;
-use Appwrite\Utopia\Response\Model\UsageBuckets;
-use Appwrite\Utopia\Response\Model\UsageCollection;
-use Appwrite\Utopia\Response\Model\UsageDatabase;
-use Appwrite\Utopia\Response\Model\UsageDatabases;
-use Appwrite\Utopia\Response\Model\UsageFunction;
-use Appwrite\Utopia\Response\Model\UsageFunctions;
-use Appwrite\Utopia\Response\Model\UsageProject;
-use Appwrite\Utopia\Response\Model\UsageStorage;
-use Appwrite\Utopia\Response\Model\UsageUsers;
-use Appwrite\Utopia\Response\Model\User;
-use Appwrite\Utopia\Response\Model\Variable;
-use Appwrite\Utopia\Response\Model\Webhook;
 use Exception;
-// Keep last
 use Utopia\Database\Document;
 use Utopia\Http\Adapter\Swoole\Response as HttpResponse;
 
+// Keep last
+
 /**
  * @method int getStatusCode()
  * @method Response setStatusCode(int $code = 200)
@@ -314,150 +217,6 @@ class Response extends HttpResponse
      */
     public function __construct(HttpResponse $response)
     {
-        $this
-            // General
-            ->setModel(new None())
-            ->setModel(new Any())
-            ->setModel(new Error())
-            ->setModel(new ErrorDev())
-            // Lists
-            ->setModel(new BaseList('Documents List', self::MODEL_DOCUMENT_LIST, 'documents', self::MODEL_DOCUMENT))
-            ->setModel(new BaseList('Collections List', self::MODEL_COLLECTION_LIST, 'collections', self::MODEL_COLLECTION))
-            ->setModel(new BaseList('Databases List', self::MODEL_DATABASE_LIST, 'databases', self::MODEL_DATABASE))
-            ->setModel(new BaseList('Indexes List', self::MODEL_INDEX_LIST, 'indexes', self::MODEL_INDEX))
-            ->setModel(new BaseList('Users List', self::MODEL_USER_LIST, 'users', self::MODEL_USER))
-            ->setModel(new BaseList('Sessions List', self::MODEL_SESSION_LIST, 'sessions', self::MODEL_SESSION))
-            ->setModel(new BaseList('Identities List', self::MODEL_IDENTITY_LIST, 'identities', self::MODEL_IDENTITY))
-            ->setModel(new BaseList('Logs List', self::MODEL_LOG_LIST, 'logs', self::MODEL_LOG))
-            ->setModel(new BaseList('Files List', self::MODEL_FILE_LIST, 'files', self::MODEL_FILE))
-            ->setModel(new BaseList('Buckets List', self::MODEL_BUCKET_LIST, 'buckets', self::MODEL_BUCKET))
-            ->setModel(new BaseList('Teams List', self::MODEL_TEAM_LIST, 'teams', self::MODEL_TEAM))
-            ->setModel(new BaseList('Memberships List', self::MODEL_MEMBERSHIP_LIST, 'memberships', self::MODEL_MEMBERSHIP))
-            ->setModel(new BaseList('Functions List', self::MODEL_FUNCTION_LIST, 'functions', self::MODEL_FUNCTION))
-            ->setModel(new BaseList('Installations List', self::MODEL_INSTALLATION_LIST, 'installations', self::MODEL_INSTALLATION))
-            ->setModel(new BaseList('Provider Repositories List', self::MODEL_PROVIDER_REPOSITORY_LIST, 'providerRepositories', self::MODEL_PROVIDER_REPOSITORY))
-            ->setModel(new BaseList('Branches List', self::MODEL_BRANCH_LIST, 'branches', self::MODEL_BRANCH))
-            ->setModel(new BaseList('Runtimes List', self::MODEL_RUNTIME_LIST, 'runtimes', self::MODEL_RUNTIME))
-            ->setModel(new BaseList('Deployments List', self::MODEL_DEPLOYMENT_LIST, 'deployments', self::MODEL_DEPLOYMENT))
-            ->setModel(new BaseList('Executions List', self::MODEL_EXECUTION_LIST, 'executions', self::MODEL_EXECUTION))
-            ->setModel(new BaseList('Builds List', self::MODEL_BUILD_LIST, 'builds', self::MODEL_BUILD)) // Not used anywhere yet
-            ->setModel(new BaseList('Projects List', self::MODEL_PROJECT_LIST, 'projects', self::MODEL_PROJECT, true, false))
-            ->setModel(new BaseList('Webhooks List', self::MODEL_WEBHOOK_LIST, 'webhooks', self::MODEL_WEBHOOK, true, false))
-            ->setModel(new BaseList('API Keys List', self::MODEL_KEY_LIST, 'keys', self::MODEL_KEY, true, false))
-            ->setModel(new BaseList('Auth Providers List', self::MODEL_AUTH_PROVIDER_LIST, 'platforms', self::MODEL_AUTH_PROVIDER, true, false))
-            ->setModel(new BaseList('Platforms List', self::MODEL_PLATFORM_LIST, 'platforms', self::MODEL_PLATFORM, true, false))
-            ->setModel(new BaseList('Countries List', self::MODEL_COUNTRY_LIST, 'countries', self::MODEL_COUNTRY))
-            ->setModel(new BaseList('Continents List', self::MODEL_CONTINENT_LIST, 'continents', self::MODEL_CONTINENT))
-            ->setModel(new BaseList('Languages List', self::MODEL_LANGUAGE_LIST, 'languages', self::MODEL_LANGUAGE))
-            ->setModel(new BaseList('Currencies List', self::MODEL_CURRENCY_LIST, 'currencies', self::MODEL_CURRENCY))
-            ->setModel(new BaseList('Phones List', self::MODEL_PHONE_LIST, 'phones', self::MODEL_PHONE))
-            ->setModel(new BaseList('Metric List', self::MODEL_METRIC_LIST, 'metrics', self::MODEL_METRIC, true, false))
-            ->setModel(new BaseList('Variables List', self::MODEL_VARIABLE_LIST, 'variables', self::MODEL_VARIABLE))
-            ->setModel(new BaseList('Status List', self::MODEL_HEALTH_STATUS_LIST, 'statuses', self::MODEL_HEALTH_STATUS))
-            ->setModel(new BaseList('Rule List', self::MODEL_PROXY_RULE_LIST, 'rules', self::MODEL_PROXY_RULE))
-            ->setModel(new BaseList('Locale codes list', self::MODEL_LOCALE_CODE_LIST, 'localeCodes', self::MODEL_LOCALE_CODE))
-            ->setModel(new BaseList('Provider list', self::MODEL_PROVIDER_LIST, 'providers', self::MODEL_PROVIDER))
-            ->setModel(new BaseList('Message list', self::MODEL_MESSAGE_LIST, 'messages', self::MODEL_MESSAGE))
-            ->setModel(new BaseList('Topic list', self::MODEL_TOPIC_LIST, 'topics', self::MODEL_TOPIC))
-            ->setModel(new BaseList('Subscriber list', self::MODEL_SUBSCRIBER_LIST, 'subscribers', self::MODEL_SUBSCRIBER))
-            ->setModel(new BaseList('Target list', self::MODEL_TARGET_LIST, 'targets', self::MODEL_TARGET))
-            ->setModel(new BaseList('Migrations List', self::MODEL_MIGRATION_LIST, 'migrations', self::MODEL_MIGRATION))
-            ->setModel(new BaseList('Migrations Firebase Projects List', self::MODEL_MIGRATION_FIREBASE_PROJECT_LIST, 'projects', self::MODEL_MIGRATION_FIREBASE_PROJECT))
-            // Entities
-            ->setModel(new Database())
-            ->setModel(new Collection())
-            ->setModel(new Attribute())
-            ->setModel(new AttributeList())
-            ->setModel(new AttributeString())
-            ->setModel(new AttributeInteger())
-            ->setModel(new AttributeFloat())
-            ->setModel(new AttributeBoolean())
-            ->setModel(new AttributeEmail())
-            ->setModel(new AttributeEnum())
-            ->setModel(new AttributeIP())
-            ->setModel(new AttributeURL())
-            ->setModel(new AttributeDatetime())
-            ->setModel(new AttributeRelationship())
-            ->setModel(new Index())
-            ->setModel(new ModelDocument())
-            ->setModel(new Log())
-            ->setModel(new User())
-            ->setModel(new AlgoMd5())
-            ->setModel(new AlgoSha())
-            ->setModel(new AlgoPhpass())
-            ->setModel(new AlgoBcrypt())
-            ->setModel(new AlgoScrypt())
-            ->setModel(new AlgoScryptModified())
-            ->setModel(new AlgoArgon2())
-            ->setModel(new Account())
-            ->setModel(new Preferences())
-            ->setModel(new Session())
-            ->setModel(new Identity())
-            ->setModel(new Token())
-            ->setModel(new JWT())
-            ->setModel(new Locale())
-            ->setModel(new LocaleCode())
-            ->setModel(new File())
-            ->setModel(new Bucket())
-            ->setModel(new Team())
-            ->setModel(new Membership())
-            ->setModel(new Func())
-            ->setModel(new Installation())
-            ->setModel(new ProviderRepository())
-            ->setModel(new Detection())
-            ->setModel(new Branch())
-            ->setModel(new Runtime())
-            ->setModel(new Deployment())
-            ->setModel(new Execution())
-            ->setModel(new Build())
-            ->setModel(new Project())
-            ->setModel(new Webhook())
-            ->setModel(new Key())
-            ->setModel(new AuthProvider())
-            ->setModel(new Platform())
-            ->setModel(new Variable())
-            ->setModel(new Country())
-            ->setModel(new Continent())
-            ->setModel(new Language())
-            ->setModel(new Currency())
-            ->setModel(new Phone())
-            ->setModel(new HealthAntivirus())
-            ->setModel(new HealthQueue())
-            ->setModel(new HealthStatus())
-            ->setModel(new HealthCertificate())
-            ->setModel(new HealthTime())
-            ->setModel(new HealthVersion())
-            ->setModel(new Metric())
-            ->setModel(new MetricBreakdown())
-            ->setModel(new UsageDatabases())
-            ->setModel(new UsageDatabase())
-            ->setModel(new UsageCollection())
-            ->setModel(new UsageUsers())
-            ->setModel(new UsageStorage())
-            ->setModel(new UsageBuckets())
-            ->setModel(new UsageFunctions())
-            ->setModel(new UsageFunction())
-            ->setModel(new UsageProject())
-            ->setModel(new Headers())
-            ->setModel(new Rule())
-            ->setModel(new TemplateSMS())
-            ->setModel(new TemplateEmail())
-            ->setModel(new ConsoleVariables())
-            ->setModel(new MFAChallenge())
-            ->setModel(new MFARecoveryCodes())
-            ->setModel(new MFAType())
-            ->setModel(new MFAFactors())
-            ->setModel(new Provider())
-            ->setModel(new Message())
-            ->setModel(new Topic())
-            ->setModel(new Subscriber())
-            ->setModel(new Target())
-            ->setModel(new Migration())
-            ->setModel(new MigrationReport())
-            ->setModel(new MigrationFirebaseProject())
-            // Tests (keep last)
-            ->setModel(new Mock());
-
         parent::__construct($response->swoole);
     }
 
@@ -467,49 +226,6 @@ class Response extends HttpResponse
     public const CONTENT_TYPE_YAML = 'application/x-yaml';
     public const CONTENT_TYPE_NULL = 'null';
 
-    /**
-     * List of defined output objects
-     */
-    protected $models = [];
-
-    /**
-     * Set Model Object
-     *
-     * @return self
-     */
-    public function setModel(Model $instance)
-    {
-        $this->models[$instance->getType()] = $instance;
-
-        return $this;
-    }
-
-    /**
-     * Get Model Object
-     *
-     * @param string $key
-     * @return Model
-     * @throws Exception
-     */
-    public function getModel(string $key): Model
-    {
-        if (!isset($this->models[$key])) {
-            throw new Exception('Undefined model: ' . $key);
-        }
-
-        return $this->models[$key];
-    }
-
-    /**
-     * Get Models List
-     *
-     * @return Model[]
-     */
-    public function getModels(): array
-    {
-        return $this->models;
-    }
-
     public function applyFilters(array $data, string $model): array
     {
         foreach ($this->filters as $filter) {
@@ -569,7 +285,7 @@ class Response extends HttpResponse
     public function output(Document $document, string $model): array
     {
         $data       = clone $document;
-        $model      = $this->getModel($model);
+        $model      = Response\Models::getModel($model);
         $output     = [];
 
         $data = $model->filter($data);
@@ -599,7 +315,7 @@ class Response extends HttpResponse
                         if (\is_array($rule['type'])) {
                             foreach ($rule['type'] as $type) {
                                 $condition = false;
-                                foreach ($this->getModel($type)->conditions as $attribute => $val) {
+                                foreach (Response\Models::getModel($type)->conditions as $attribute => $val) {
                                     $condition = $item->getAttribute($attribute) === $val;
                                     if (!$condition) {
                                         break;
@@ -614,7 +330,7 @@ class Response extends HttpResponse
                             $ruleType = $rule['type'];
                         }
 
-                        if (!array_key_exists($ruleType, $this->models)) {
+                        if (!array_key_exists($ruleType, Response\Models::getModels())) {
                             throw new Exception('Missing model for rule: ' . $ruleType);
                         }
 
diff --git a/src/Appwrite/Utopia/Response/Models.php b/src/Appwrite/Utopia/Response/Models.php
new file mode 100644
index 0000000000..5970265005
--- /dev/null
+++ b/src/Appwrite/Utopia/Response/Models.php
@@ -0,0 +1,287 @@
+<?php
+
+namespace Appwrite\Utopia\Response;
+
+use Appwrite\Utopia\Response;
+use Appwrite\Utopia\Response\Model\Account;
+use Appwrite\Utopia\Response\Model\AlgoArgon2;
+use Appwrite\Utopia\Response\Model\AlgoBcrypt;
+use Appwrite\Utopia\Response\Model\AlgoMd5;
+use Appwrite\Utopia\Response\Model\AlgoPhpass;
+use Appwrite\Utopia\Response\Model\AlgoScrypt;
+use Appwrite\Utopia\Response\Model\AlgoScryptModified;
+use Appwrite\Utopia\Response\Model\AlgoSha;
+use Appwrite\Utopia\Response\Model\Any;
+use Appwrite\Utopia\Response\Model\Attribute;
+use Appwrite\Utopia\Response\Model\AttributeBoolean;
+use Appwrite\Utopia\Response\Model\AttributeDatetime;
+use Appwrite\Utopia\Response\Model\AttributeEmail;
+use Appwrite\Utopia\Response\Model\AttributeEnum;
+use Appwrite\Utopia\Response\Model\AttributeFloat;
+use Appwrite\Utopia\Response\Model\AttributeInteger;
+use Appwrite\Utopia\Response\Model\AttributeIP;
+use Appwrite\Utopia\Response\Model\AttributeList;
+use Appwrite\Utopia\Response\Model\AttributeRelationship;
+use Appwrite\Utopia\Response\Model\AttributeString;
+use Appwrite\Utopia\Response\Model\AttributeURL;
+use Appwrite\Utopia\Response\Model\AuthProvider;
+use Appwrite\Utopia\Response\Model\BaseList;
+use Appwrite\Utopia\Response\Model\Branch;
+use Appwrite\Utopia\Response\Model\Bucket;
+use Appwrite\Utopia\Response\Model\Build;
+use Appwrite\Utopia\Response\Model\Collection;
+use Appwrite\Utopia\Response\Model\ConsoleVariables;
+use Appwrite\Utopia\Response\Model\Continent;
+use Appwrite\Utopia\Response\Model\Country;
+use Appwrite\Utopia\Response\Model\Currency;
+use Appwrite\Utopia\Response\Model\Database;
+use Appwrite\Utopia\Response\Model\Deployment;
+use Appwrite\Utopia\Response\Model\Detection;
+use Appwrite\Utopia\Response\Model\Document as ModelDocument;
+use Appwrite\Utopia\Response\Model\Error;
+use Appwrite\Utopia\Response\Model\ErrorDev;
+use Appwrite\Utopia\Response\Model\Execution;
+use Appwrite\Utopia\Response\Model\File;
+use Appwrite\Utopia\Response\Model\Func;
+use Appwrite\Utopia\Response\Model\Headers;
+use Appwrite\Utopia\Response\Model\HealthAntivirus;
+use Appwrite\Utopia\Response\Model\HealthCertificate;
+use Appwrite\Utopia\Response\Model\HealthQueue;
+use Appwrite\Utopia\Response\Model\HealthStatus;
+use Appwrite\Utopia\Response\Model\HealthTime;
+use Appwrite\Utopia\Response\Model\HealthVersion;
+use Appwrite\Utopia\Response\Model\Identity;
+use Appwrite\Utopia\Response\Model\Index;
+use Appwrite\Utopia\Response\Model\Installation;
+use Appwrite\Utopia\Response\Model\JWT;
+use Appwrite\Utopia\Response\Model\Key;
+use Appwrite\Utopia\Response\Model\Language;
+use Appwrite\Utopia\Response\Model\Locale;
+use Appwrite\Utopia\Response\Model\LocaleCode;
+use Appwrite\Utopia\Response\Model\Log;
+use Appwrite\Utopia\Response\Model\Membership;
+use Appwrite\Utopia\Response\Model\Message;
+use Appwrite\Utopia\Response\Model\Metric;
+use Appwrite\Utopia\Response\Model\MetricBreakdown;
+use Appwrite\Utopia\Response\Model\MFAChallenge;
+use Appwrite\Utopia\Response\Model\MFAFactors;
+use Appwrite\Utopia\Response\Model\MFARecoveryCodes;
+use Appwrite\Utopia\Response\Model\MFAType;
+use Appwrite\Utopia\Response\Model\Migration;
+use Appwrite\Utopia\Response\Model\MigrationFirebaseProject;
+use Appwrite\Utopia\Response\Model\MigrationReport;
+use Appwrite\Utopia\Response\Model\Mock;
+use Appwrite\Utopia\Response\Model\None;
+use Appwrite\Utopia\Response\Model\Phone;
+use Appwrite\Utopia\Response\Model\Platform;
+use Appwrite\Utopia\Response\Model\Preferences;
+use Appwrite\Utopia\Response\Model\Project;
+use Appwrite\Utopia\Response\Model\Provider;
+use Appwrite\Utopia\Response\Model\ProviderRepository;
+use Appwrite\Utopia\Response\Model\Rule;
+use Appwrite\Utopia\Response\Model\Runtime;
+use Appwrite\Utopia\Response\Model\Session;
+use Appwrite\Utopia\Response\Model\Subscriber;
+use Appwrite\Utopia\Response\Model\Target;
+use Appwrite\Utopia\Response\Model\Team;
+use Appwrite\Utopia\Response\Model\TemplateEmail;
+use Appwrite\Utopia\Response\Model\TemplateSMS;
+use Appwrite\Utopia\Response\Model\Token;
+use Appwrite\Utopia\Response\Model\Topic;
+use Appwrite\Utopia\Response\Model\UsageBuckets;
+use Appwrite\Utopia\Response\Model\UsageCollection;
+use Appwrite\Utopia\Response\Model\UsageDatabase;
+use Appwrite\Utopia\Response\Model\UsageDatabases;
+use Appwrite\Utopia\Response\Model\UsageFunction;
+use Appwrite\Utopia\Response\Model\UsageFunctions;
+use Appwrite\Utopia\Response\Model\UsageProject;
+use Appwrite\Utopia\Response\Model\UsageStorage;
+use Appwrite\Utopia\Response\Model\UsageUsers;
+use Appwrite\Utopia\Response\Model\User;
+use Appwrite\Utopia\Response\Model\Variable;
+use Appwrite\Utopia\Response\Model\Webhook;
+use Exception;
+
+class Models
+{
+    public static function init()
+    {
+        // General
+        self::setModel(new None());
+        self::setModel(new Any());
+        self::setModel(new Error());
+        self::setModel(new ErrorDev());
+        // Lists
+        self::setModel(new BaseList('Documents List', Response::MODEL_DOCUMENT_LIST, 'documents', Response::MODEL_DOCUMENT));
+        self::setModel(new BaseList('Collections List', Response::MODEL_COLLECTION_LIST, 'collections', Response::MODEL_COLLECTION));
+        self::setModel(new BaseList('Databases List', Response::MODEL_DATABASE_LIST, 'databases', Response::MODEL_DATABASE));
+        self::setModel(new BaseList('Indexes List', Response::MODEL_INDEX_LIST, 'indexes', Response::MODEL_INDEX));
+        self::setModel(new BaseList('Users List', Response::MODEL_USER_LIST, 'users', Response::MODEL_USER));
+        self::setModel(new BaseList('Sessions List', Response::MODEL_SESSION_LIST, 'sessions', Response::MODEL_SESSION));
+        self::setModel(new BaseList('Identities List', Response::MODEL_IDENTITY_LIST, 'identities', Response::MODEL_IDENTITY));
+        self::setModel(new BaseList('Logs List', Response::MODEL_LOG_LIST, 'logs', Response::MODEL_LOG));
+        self::setModel(new BaseList('Files List', Response::MODEL_FILE_LIST, 'files', Response::MODEL_FILE));
+        self::setModel(new BaseList('Buckets List', Response::MODEL_BUCKET_LIST, 'buckets', Response::MODEL_BUCKET));
+        self::setModel(new BaseList('Teams List', Response::MODEL_TEAM_LIST, 'teams', Response::MODEL_TEAM));
+        self::setModel(new BaseList('Memberships List', Response::MODEL_MEMBERSHIP_LIST, 'memberships', Response::MODEL_MEMBERSHIP));
+        self::setModel(new BaseList('Functions List', Response::MODEL_FUNCTION_LIST, 'functions', Response::MODEL_FUNCTION));
+        self::setModel(new BaseList('Installations List', Response::MODEL_INSTALLATION_LIST, 'installations', Response::MODEL_INSTALLATION));
+        self::setModel(new BaseList('Provider Repositories List', Response::MODEL_PROVIDER_REPOSITORY_LIST, 'providerRepositories', Response::MODEL_PROVIDER_REPOSITORY));
+        self::setModel(new BaseList('Branches List', Response::MODEL_BRANCH_LIST, 'branches', Response::MODEL_BRANCH));
+        self::setModel(new BaseList('Runtimes List', Response::MODEL_RUNTIME_LIST, 'runtimes', Response::MODEL_RUNTIME));
+        self::setModel(new BaseList('Deployments List', Response::MODEL_DEPLOYMENT_LIST, 'deployments', Response::MODEL_DEPLOYMENT));
+        self::setModel(new BaseList('Executions List', Response::MODEL_EXECUTION_LIST, 'executions', Response::MODEL_EXECUTION));
+        self::setModel(new BaseList('Builds List', Response::MODEL_BUILD_LIST, 'builds', Response::MODEL_BUILD)); // Not used anywhere yet;
+        self::setModel(new BaseList('Projects List', Response::MODEL_PROJECT_LIST, 'projects', Response::MODEL_PROJECT, true, false));
+        self::setModel(new BaseList('Webhooks List', Response::MODEL_WEBHOOK_LIST, 'webhooks', Response::MODEL_WEBHOOK, true, false));
+        self::setModel(new BaseList('API Keys List', Response::MODEL_KEY_LIST, 'keys', Response::MODEL_KEY, true, false));
+        self::setModel(new BaseList('Auth Providers List', Response::MODEL_AUTH_PROVIDER_LIST, 'platforms', Response::MODEL_AUTH_PROVIDER, true, false));
+        self::setModel(new BaseList('Platforms List', Response::MODEL_PLATFORM_LIST, 'platforms', Response::MODEL_PLATFORM, true, false));
+        self::setModel(new BaseList('Countries List', Response::MODEL_COUNTRY_LIST, 'countries', Response::MODEL_COUNTRY));
+        self::setModel(new BaseList('Continents List', Response::MODEL_CONTINENT_LIST, 'continents', Response::MODEL_CONTINENT));
+        self::setModel(new BaseList('Languages List', Response::MODEL_LANGUAGE_LIST, 'languages', Response::MODEL_LANGUAGE));
+        self::setModel(new BaseList('Currencies List', Response::MODEL_CURRENCY_LIST, 'currencies', Response::MODEL_CURRENCY));
+        self::setModel(new BaseList('Phones List', Response::MODEL_PHONE_LIST, 'phones', Response::MODEL_PHONE));
+        self::setModel(new BaseList('Metric List', Response::MODEL_METRIC_LIST, 'metrics', Response::MODEL_METRIC, true, false));
+        self::setModel(new BaseList('Variables List', Response::MODEL_VARIABLE_LIST, 'variables', Response::MODEL_VARIABLE));
+        self::setModel(new BaseList('Status List', Response::MODEL_HEALTH_STATUS_LIST, 'statuses', Response::MODEL_HEALTH_STATUS));
+        self::setModel(new BaseList('Rule List', Response::MODEL_PROXY_RULE_LIST, 'rules', Response::MODEL_PROXY_RULE));
+        self::setModel(new BaseList('Locale codes list', Response::MODEL_LOCALE_CODE_LIST, 'localeCodes', Response::MODEL_LOCALE_CODE));
+        self::setModel(new BaseList('Provider list', Response::MODEL_PROVIDER_LIST, 'providers', Response::MODEL_PROVIDER));
+        self::setModel(new BaseList('Message list', Response::MODEL_MESSAGE_LIST, 'messages', Response::MODEL_MESSAGE));
+        self::setModel(new BaseList('Topic list', Response::MODEL_TOPIC_LIST, 'topics', Response::MODEL_TOPIC));
+        self::setModel(new BaseList('Subscriber list', Response::MODEL_SUBSCRIBER_LIST, 'subscribers', Response::MODEL_SUBSCRIBER));
+        self::setModel(new BaseList('Target list', Response::MODEL_TARGET_LIST, 'targets', Response::MODEL_TARGET));
+        self::setModel(new BaseList('Migrations List', Response::MODEL_MIGRATION_LIST, 'migrations', Response::MODEL_MIGRATION));
+        self::setModel(new BaseList('Migrations Firebase Projects List', Response::MODEL_MIGRATION_FIREBASE_PROJECT_LIST, 'projects', Response::MODEL_MIGRATION_FIREBASE_PROJECT));
+        // Entities
+        self::setModel(new Database());
+        self::setModel(new Collection());
+        self::setModel(new Attribute());
+        self::setModel(new AttributeList());
+        self::setModel(new AttributeString());
+        self::setModel(new AttributeInteger());
+        self::setModel(new AttributeFloat());
+        self::setModel(new AttributeBoolean());
+        self::setModel(new AttributeEmail());
+        self::setModel(new AttributeEnum());
+        self::setModel(new AttributeIP());
+        self::setModel(new AttributeURL());
+        self::setModel(new AttributeDatetime());
+        self::setModel(new AttributeRelationship());
+        self::setModel(new Index());
+        self::setModel(new ModelDocument());
+        self::setModel(new Log());
+        self::setModel(new User());
+        self::setModel(new AlgoMd5());
+        self::setModel(new AlgoSha());
+        self::setModel(new AlgoPhpass());
+        self::setModel(new AlgoBcrypt());
+        self::setModel(new AlgoScrypt());
+        self::setModel(new AlgoScryptModified());
+        self::setModel(new AlgoArgon2());
+        self::setModel(new Account());
+        self::setModel(new Preferences());
+        self::setModel(new Session());
+        self::setModel(new Identity());
+        self::setModel(new Token());
+        self::setModel(new JWT());
+        self::setModel(new Locale());
+        self::setModel(new LocaleCode());
+        self::setModel(new File());
+        self::setModel(new Bucket());
+        self::setModel(new Team());
+        self::setModel(new Membership());
+        self::setModel(new Func());
+        self::setModel(new Installation());
+        self::setModel(new ProviderRepository());
+        self::setModel(new Detection());
+        self::setModel(new Branch());
+        self::setModel(new Runtime());
+        self::setModel(new Deployment());
+        self::setModel(new Execution());
+        self::setModel(new Build());
+        self::setModel(new Project());
+        self::setModel(new Webhook());
+        self::setModel(new Key());
+        self::setModel(new AuthProvider());
+        self::setModel(new Platform());
+        self::setModel(new Variable());
+        self::setModel(new Country());
+        self::setModel(new Continent());
+        self::setModel(new Language());
+        self::setModel(new Currency());
+        self::setModel(new Phone());
+        self::setModel(new HealthAntivirus());
+        self::setModel(new HealthQueue());
+        self::setModel(new HealthStatus());
+        self::setModel(new HealthCertificate());
+        self::setModel(new HealthTime());
+        self::setModel(new HealthVersion());
+        self::setModel(new Metric());
+        self::setModel(new MetricBreakdown());
+        self::setModel(new UsageDatabases());
+        self::setModel(new UsageDatabase());
+        self::setModel(new UsageCollection());
+        self::setModel(new UsageUsers());
+        self::setModel(new UsageStorage());
+        self::setModel(new UsageBuckets());
+        self::setModel(new UsageFunctions());
+        self::setModel(new UsageFunction());
+        self::setModel(new UsageProject());
+        self::setModel(new Headers());
+        self::setModel(new Rule());
+        self::setModel(new TemplateSMS());
+        self::setModel(new TemplateEmail());
+        self::setModel(new ConsoleVariables());
+        self::setModel(new MFAChallenge());
+        self::setModel(new MFARecoveryCodes());
+        self::setModel(new MFAType());
+        self::setModel(new MFAFactors());
+        self::setModel(new Provider());
+        self::setModel(new Message());
+        self::setModel(new Topic());
+        self::setModel(new Subscriber());
+        self::setModel(new Target());
+        self::setModel(new Migration());
+        self::setModel(new MigrationReport());
+        self::setModel(new MigrationFirebaseProject());
+        // Tests (keep last)
+        self::setModel(new Mock());
+        ;
+    }
+    /**
+     *  List of defined output objects
+     * @var Model[]
+     */
+    protected static array $models = [];
+
+    /**
+     * Set Model Object
+     */
+    public static function setModel(Model $instance): void
+    {
+        self::$models[$instance->getType()] = $instance;
+    }
+
+    /**
+     * Get Model Object
+     *
+     * @param string $key
+     * @return Model
+     * @throws Exception
+     */
+    public static function getModel(string $key): Model
+    {
+        if (!isset(self::$models[$key])) {
+            throw new Exception('Undefined model: ' . $key);
+        }
+
+        return self::$models[$key];
+    }
+
+    public static function getModels(): array
+    {
+        return self::$models;
+    }
+}
diff --git a/tests/unit/GraphQL/BuilderTest.php b/tests/unit/GraphQL/BuilderTest.php
index 22350c150b..87dfaae12e 100644
--- a/tests/unit/GraphQL/BuilderTest.php
+++ b/tests/unit/GraphQL/BuilderTest.php
@@ -15,7 +15,7 @@ class BuilderTest extends TestCase
     public function setUp(): void
     {
         $this->response = new Response(new UtopiaSwooleResponse(new SwooleResponse()));
-        Mapper::init($this->response->getModels());
+        Mapper::init(Response\Models::getModels());
     }
 
     /**
@@ -23,7 +23,7 @@ class BuilderTest extends TestCase
      */
     public function testCreateTypeMapping()
     {
-        $model = $this->response->getModel(Response::MODEL_COLLECTION);
+        $model = Response\Models::getModel(Response::MODEL_COLLECTION);
         $type = Mapper::model(\ucfirst($model->getType()));
         $this->assertEquals('Collection', $type->name);
     }
diff --git a/tests/unit/Utopia/ResponseTest.php b/tests/unit/Utopia/ResponseTest.php
index b1d9f97752..9ab61cb4f0 100644
--- a/tests/unit/Utopia/ResponseTest.php
+++ b/tests/unit/Utopia/ResponseTest.php
@@ -18,9 +18,9 @@ class ResponseTest extends TestCase
     public function setUp(): void
     {
         $this->response = new Response(new UtopiaSwooleResponse(new SwooleResponse()));
-        $this->response->setModel(new Single());
-        $this->response->setModel(new Lists());
-        $this->response->setModel(new Nested());
+        Response\Models::setModel(new Single());
+        Response\Models::setModel(new Lists());
+        Response\Models::setModel(new Nested());
     }
 
     public function testFilters(): void