diff --git a/app/controllers/api/account.php b/app/controllers/api/account.php
index 044664d655..27d9f82006 100644
--- a/app/controllers/api/account.php
+++ b/app/controllers/api/account.php
@@ -53,7 +53,7 @@ App::post('/v1/account')
     ->action(function ($email, $password, $name, $request, $response, $project, $dbForInternal, $audits) {
         /** @var Utopia\Swoole\Request $request */
         /** @var Appwrite\Utopia\Response $response */
-        /** @var Appwrite\Database\Document $project */
+        /** @var Utopia\Database\Document $project */
         /** @var Utopia\Database\Database $dbForInternal */
         /** @var Appwrite\Event\Event $audits */
 
@@ -119,7 +119,7 @@ App::post('/v1/account')
         ;
 
         $response->setStatusCode(Response::STATUS_CODE_CREATED);
-        $response->dynamic2($user, Response::MODEL_USER);
+        $response->dynamic($user, Response::MODEL_USER);
     });
 
 App::post('/v1/account/sessions')
@@ -229,7 +229,7 @@ App::post('/v1/account/sessions')
             ->setAttribute('countryName', $countryName)
         ;
         
-        $response->dynamic2($session, Response::MODEL_SESSION);
+        $response->dynamic($session, Response::MODEL_SESSION);
     });
 
 App::get('/v1/account/sessions/oauth2/:provider')
@@ -256,7 +256,7 @@ App::get('/v1/account/sessions/oauth2/:provider')
     ->action(function ($provider, $success, $failure, $scopes, $request, $response, $project) {
         /** @var Utopia\Swoole\Request $request */
         /** @var Appwrite\Utopia\Response $response */
-        /** @var Appwrite\Database\Document $project */
+        /** @var Utopia\Database\Document $project */
 
         $protocol = $request->getProtocol();
         $callback = $protocol.'://'.$request->getHostname().'/v1/account/sessions/oauth2/callback/'.$provider.'/'.$project->getId();
@@ -362,7 +362,7 @@ App::get('/v1/account/sessions/oauth2/:provider/redirect')
     ->action(function ($provider, $code, $state, $request, $response, $project, $user, $dbForInternal, $geodb, $audits, $events) use ($oauthDefaultSuccess) {
         /** @var Utopia\Swoole\Request $request */
         /** @var Appwrite\Utopia\Response $response */
-        /** @var Appwrite\Database\Document $project */
+        /** @var Utopia\Database\Document $project */
         /** @var Utopia\Database\Document $user */
         /** @var Utopia\Database\Database $dbForInternal */
         /** @var MaxMind\Db\Reader $geodb */
@@ -546,7 +546,7 @@ App::get('/v1/account/sessions/oauth2/:provider/redirect')
             ->setParam('data', ['provider' => $provider])
         ;
 
-        $events->setParam('eventData', $response->output2($session, Response::MODEL_SESSION));
+        $events->setParam('eventData', $response->output($session, Response::MODEL_SESSION));
 
         if (!Config::getParam('domainVerification')) {
             $response
@@ -603,7 +603,7 @@ App::post('/v1/account/sessions/anonymous')
         /** @var Appwrite\Utopia\Response $response */
         /** @var Utopia\Locale\Locale $locale */
         /** @var Utopia\Database\Document $user */
-        /** @var Appwrite\Database\Document $project */
+        /** @var Utopia\Database\Document $project */
         /** @var Utopia\Database\Database $dbForInternal */
         /** @var MaxMind\Db\Reader $geodb */
         /** @var Appwrite\Event\Event $audits */
@@ -710,7 +710,7 @@ App::post('/v1/account/sessions/anonymous')
             ->setAttribute('countryName', $countryName)
         ;
 
-        $response->dynamic2($session, Response::MODEL_SESSION);
+        $response->dynamic($session, Response::MODEL_SESSION);
     });
 
 App::post('/v1/account/jwt')
@@ -737,7 +737,7 @@ App::post('/v1/account/jwt')
         $current = new Document();
 
         foreach ($sessions as $session) { 
-            /** @var Appwrite\Database\Document $session */
+            /** @var Utopia\Database\Document $session */
 
             if ($session->getAttribute('secret') == Auth::hash(Auth::$secret)) { // If current session delete the cookies too
                 $current = $session;
@@ -751,7 +751,7 @@ App::post('/v1/account/jwt')
         $jwt = new JWT(App::getEnv('_APP_OPENSSL_KEY_V1'), 'HS256', 900, 10); // Instantiate with key, algo, maxAge and leeway.
 
         $response->setStatusCode(Response::STATUS_CODE_CREATED);
-        $response->dynamic2(new Document(['jwt' => $jwt->encode([
+        $response->dynamic(new Document(['jwt' => $jwt->encode([
             // 'uid'    => 1,
             // 'aud'    => 'http://site.com',
             // 'scopes' => ['user'],
@@ -778,7 +778,7 @@ App::get('/v1/account')
         /** @var Appwrite\Utopia\Response $response */
         /** @var Utopia\Database\Document $user */
 
-        $response->dynamic2($user, Response::MODEL_USER);
+        $response->dynamic($user, Response::MODEL_USER);
     });
 
 App::get('/v1/account/prefs')
@@ -800,7 +800,7 @@ App::get('/v1/account/prefs')
 
         $prefs = $user->getAttribute('prefs', new \stdClass());
 
-        $response->dynamic2(new Document($prefs), Response::MODEL_PREFERENCES);
+        $response->dynamic(new Document($prefs), Response::MODEL_PREFERENCES);
     });
 
 App::get('/v1/account/sessions')
@@ -837,7 +837,7 @@ App::get('/v1/account/sessions')
             $sessions[$key] = $session;
         }
 
-        $response->dynamic2(new Document([
+        $response->dynamic(new Document([
             'sessions' => $sessions,
             'sum' => count($sessions),
         ]), Response::MODEL_SESSION_LIST);
@@ -861,7 +861,7 @@ App::get('/v1/account/logs')
     ->inject('dbForInternal')
     ->action(function ($response, $user, $locale, $geodb, $dbForInternal) {
         /** @var Appwrite\Utopia\Response $response */
-        /** @var Appwrite\Database\Document $project */
+        /** @var Utopia\Database\Document $project */
         /** @var Utopia\Database\Document $user */
         /** @var Utopia\Locale\Locale $locale */
         /** @var MaxMind\Db\Reader $geodb */
@@ -914,7 +914,7 @@ App::get('/v1/account/logs')
 
         }
 
-        $response->dynamic2(new Document(['logs' => $output]), Response::MODEL_LOG_LIST);
+        $response->dynamic(new Document(['logs' => $output]), Response::MODEL_LOG_LIST);
     });
 
 App::get('/v1/account/sessions/:sessionId')
@@ -935,7 +935,7 @@ App::get('/v1/account/sessions/:sessionId')
     ->inject('dbForInternal')
     ->action(function ($sessionId, $response, $user, $locale, $dbForInternal) {
         /** @var Appwrite\Utopia\Response $response */
-        /** @var Appwrite\Database\Document $user */
+        /** @var Utopia\Database\Document $user */
         /** @var Utopia\Locale\Locale $locale */
         /** @var Utopia\Database\Database $dbForInternal */
 
@@ -956,7 +956,7 @@ App::get('/v1/account/sessions/:sessionId')
                     ->setAttribute('countryName', $countryName)
                 ;
                     
-                return $response->dynamic2($session, Response::MODEL_SESSION);
+                return $response->dynamic($session, Response::MODEL_SESSION);
             }
         }
 
@@ -994,7 +994,7 @@ App::patch('/v1/account/name')
             ->setParam('resource', 'users/'.$user->getId())
         ;
 
-        $response->dynamic2($user, Response::MODEL_USER);
+        $response->dynamic($user, Response::MODEL_USER);
     });
 
 App::patch('/v1/account/password')
@@ -1037,7 +1037,7 @@ App::patch('/v1/account/password')
             ->setParam('resource', 'users/'.$user->getId())
         ;
 
-        $response->dynamic2($user, Response::MODEL_USER);
+        $response->dynamic($user, Response::MODEL_USER);
     });
 
 App::patch('/v1/account/email')
@@ -1092,7 +1092,7 @@ App::patch('/v1/account/email')
             ->setParam('resource', 'users/'.$user->getId())
         ;
 
-        $response->dynamic2($user, Response::MODEL_USER);
+        $response->dynamic($user, Response::MODEL_USER);
     });
 
 App::patch('/v1/account/prefs')
@@ -1125,7 +1125,7 @@ App::patch('/v1/account/prefs')
             ->setParam('resource', 'users/'.$user->getId())
         ;
 
-        $response->dynamic2($user, Response::MODEL_USER);
+        $response->dynamic($user, Response::MODEL_USER);
     });
 
 App::delete('/v1/account')
@@ -1172,7 +1172,7 @@ App::delete('/v1/account')
         ;
 
         $events
-            ->setParam('eventData', $response->output2($user, Response::MODEL_USER))
+            ->setParam('eventData', $response->output($user, Response::MODEL_USER))
         ;
 
         if (!Config::getParam('domainVerification')) {
@@ -1259,7 +1259,7 @@ App::delete('/v1/account/sessions/:sessionId')
                 $dbForInternal->updateDocument('users', $user->getId(), $user->setAttribute('sessions', $sessions));
 
                 $events
-                    ->setParam('eventData', $response->output2($session, Response::MODEL_SESSION))
+                    ->setParam('eventData', $response->output($session, Response::MODEL_SESSION))
                 ;
 
                 return $response->noContent();
@@ -1332,7 +1332,7 @@ App::delete('/v1/account/sessions')
         $dbForInternal->updateDocument('users', $user->getId(), $user->setAttribute('sessions', []));
                     
         $events
-            ->setParam('eventData', $response->output2(new Document([
+            ->setParam('eventData', $response->output(new Document([
                 'sessions' => $sessions,
                 'sum' => count($sessions),
             ]), Response::MODEL_SESSION_LIST))
@@ -1369,7 +1369,7 @@ App::post('/v1/account/recovery')
         /** @var Utopia\Swoole\Request $request */
         /** @var Appwrite\Utopia\Response $response */
         /** @var Utopia\Database\Database $dbForInternal */
-        /** @var Appwrite\Database\Document $project */
+        /** @var Utopia\Database\Document $project */
         /** @var Utopia\Locale\Locale $locale */
         /** @var Appwrite\Event\Event $mails */
         /** @var Appwrite\Event\Event $audits */
@@ -1443,7 +1443,7 @@ App::post('/v1/account/recovery')
 
         $events
             ->setParam('eventData',
-                $response->output2($recovery->setAttribute('secret', $secret),
+                $response->output($recovery->setAttribute('secret', $secret),
                 Response::MODEL_TOKEN
             ))
         ;
@@ -1459,7 +1459,7 @@ App::post('/v1/account/recovery')
         ;
 
         $response->setStatusCode(Response::STATUS_CODE_CREATED);
-        $response->dynamic2($recovery, Response::MODEL_TOKEN);
+        $response->dynamic($recovery, Response::MODEL_TOKEN);
     });
 
 App::put('/v1/account/recovery')
@@ -1533,7 +1533,7 @@ App::put('/v1/account/recovery')
             ->setParam('resource', 'users/'.$profile->getId())
         ;
 
-        $response->dynamic2($recovery, Response::MODEL_TOKEN);
+        $response->dynamic($recovery, Response::MODEL_TOKEN);
     });
 
 App::post('/v1/account/verification')
@@ -1563,7 +1563,7 @@ App::post('/v1/account/verification')
     ->action(function ($url, $request, $response, $project, $user, $dbForInternal, $locale, $audits, $events, $mails) {
         /** @var Utopia\Swoole\Request $request */
         /** @var Appwrite\Utopia\Response $response */
-        /** @var Appwrite\Database\Document $project */
+        /** @var Utopia\Database\Document $project */
         /** @var Utopia\Database\Document $user */
         /** @var Utopia\Database\Database $dbForInternal */
         /** @var Utopia\Locale\Locale $locale */
@@ -1629,7 +1629,7 @@ App::post('/v1/account/verification')
 
         $events
             ->setParam('eventData',
-                $response->output2($verification->setAttribute('secret', $verificationSecret),
+                $response->output($verification->setAttribute('secret', $verificationSecret),
                 Response::MODEL_TOKEN
             ))
         ;
@@ -1645,7 +1645,7 @@ App::post('/v1/account/verification')
         ;
 
         $response->setStatusCode(Response::STATUS_CODE_CREATED);
-        $response->dynamic2($verification, Response::MODEL_TOKEN);
+        $response->dynamic($verification, Response::MODEL_TOKEN);
     });
 
 App::put('/v1/account/verification')
@@ -1710,5 +1710,5 @@ App::put('/v1/account/verification')
             ->setParam('resource', 'users/'.$user->getId())
         ;
 
-        $response->dynamic2($verification, Response::MODEL_TOKEN);
+        $response->dynamic($verification, Response::MODEL_TOKEN);
     });
diff --git a/app/controllers/api/avatars.php b/app/controllers/api/avatars.php
index 2b6951295e..13f335f4f4 100644
--- a/app/controllers/api/avatars.php
+++ b/app/controllers/api/avatars.php
@@ -424,7 +424,7 @@ App::get('/v1/avatars/initials')
     ->inject('user')
     ->action(function ($name, $width, $height, $color, $background, $response, $user) {
         /** @var Appwrite\Utopia\Response $response */
-        /** @var Appwrite\Database\Document $user */
+        /** @var Utopia\Database\Document $user */
 
         $themes = [
             ['color' => '#27005e', 'background' => '#e1d2f6'], // VIOLET
diff --git a/app/controllers/api/database.php b/app/controllers/api/database.php
index 92a4f802f7..4fcf64ee1f 100644
--- a/app/controllers/api/database.php
+++ b/app/controllers/api/database.php
@@ -67,7 +67,7 @@ App::post('/v1/database/collections')
         ;
 
         $response->setStatusCode(Response::STATUS_CODE_CREATED);
-        $response->dynamic2($collection, Response::MODEL_COLLECTION);
+        $response->dynamic($collection, Response::MODEL_COLLECTION);
     });
 
 App::get('/v1/database/collections')
@@ -93,7 +93,7 @@ App::get('/v1/database/collections')
 
         $queries = ($search) ? [new Query('name', Query::TYPE_SEARCH, [$search])] : [];
 
-        $response->dynamic2(new Document([
+        $response->dynamic(new Document([
             'collections' => $dbForExternal->find(Database::COLLECTIONS, $queries, $limit, $offset, ['_id'], [$orderType]),
             'sum' => $dbForExternal->count(Database::COLLECTIONS, $queries, APP_LIMIT_COUNT),
         ]), Response::MODEL_COLLECTION_LIST);
@@ -123,7 +123,7 @@ App::get('/v1/database/collections/:collectionId')
             throw new Exception('Collection not found', 404);
         }
 
-        $response->dynamic2($collection, Response::MODEL_COLLECTION);
+        $response->dynamic($collection, Response::MODEL_COLLECTION);
     });
 
 App::put('/v1/database/collections/:collectionId')
@@ -177,7 +177,7 @@ App::put('/v1/database/collections/:collectionId')
             ->setParam('data', $collection->getArrayCopy())
         ;
 
-        $response->dynamic2($collection, Response::MODEL_COLLECTION);
+        $response->dynamic($collection, Response::MODEL_COLLECTION);
     });
 
 App::delete('/v1/database/collections/:collectionId')
@@ -212,7 +212,7 @@ App::delete('/v1/database/collections/:collectionId')
         $dbForExternal->deleteCollection($collectionId);
 
         $events
-            ->setParam('eventData', $response->output2($collection, Response::MODEL_COLLECTION))
+            ->setParam('eventData', $response->output($collection, Response::MODEL_COLLECTION))
         ;
 
         $audits
@@ -296,7 +296,7 @@ App::post('/v1/database/collections/:collectionId/attributes')
         ;
 
         $response->setStatusCode(Response::STATUS_CODE_CREATED);
-        $response->dynamic2($attribute, Response::MODEL_ATTRIBUTE);
+        $response->dynamic($attribute, Response::MODEL_ATTRIBUTE);
     });
 
 App::get('/v1/database/collections/:collectionId/attributes')
@@ -331,7 +331,7 @@ App::get('/v1/database/collections/:collectionId/attributes')
             ])]);
         }, $attributes);
 
-        $response->dynamic2(new Document([
+        $response->dynamic(new Document([
             'sum' => \count($attributes),
             'attributes' => $attributes
         ]), Response::MODEL_ATTRIBUTE_LIST);
@@ -375,7 +375,7 @@ App::get('/v1/database/collections/:collectionId/attributes/:attributeId')
             'collectionId' => $collectionId,
         ])]);
         
-        $response->dynamic2($attribute, Response::MODEL_ATTRIBUTE);
+        $response->dynamic($attribute, Response::MODEL_ATTRIBUTE);
     });
 
 App::delete('/v1/database/collections/:collectionId/attributes/:attributeId')
@@ -428,7 +428,7 @@ App::delete('/v1/database/collections/:collectionId/attributes/:attributeId')
         ;
 
         $events
-            ->setParam('payload', $response->output2($attribute, Response::MODEL_ATTRIBUTE))
+            ->setParam('payload', $response->output($attribute, Response::MODEL_ATTRIBUTE))
         ;
 
         $audits
@@ -526,7 +526,7 @@ App::post('/v1/database/collections/:collectionId/indexes')
         ;
 
         $response->setStatusCode(Response::STATUS_CODE_CREATED);
-        $response->dynamic2($index, Response::MODEL_INDEX);
+        $response->dynamic($index, Response::MODEL_INDEX);
        
     });
 
@@ -562,7 +562,7 @@ App::get('/v1/database/collections/:collectionId/indexes')
             ])]);
         }, $indexes);
 
-        $response->dynamic2(new Document([
+        $response->dynamic(new Document([
             'sum' => \count($indexes),
             'attributes' => $indexes,
         ]), Response::MODEL_INDEX_LIST);
@@ -606,7 +606,7 @@ App::get('/v1/database/collections/:collectionId/indexes/:indexId')
             'collectionId' => $collectionId,
         ])]);
         
-        $response->dynamic2($index, Response::MODEL_INDEX);
+        $response->dynamic($index, Response::MODEL_INDEX);
     });
 
 App::delete('/v1/database/collections/:collectionId/indexes/:indexId')
@@ -659,7 +659,7 @@ App::delete('/v1/database/collections/:collectionId/indexes/:indexId')
         ;
 
         $events
-            ->setParam('payload', $response->output2($index, Response::MODEL_INDEX))
+            ->setParam('payload', $response->output($index, Response::MODEL_INDEX))
         ;
 
         $audits
@@ -731,7 +731,7 @@ App::post('/v1/database/collections/:collectionId/documents')
         ;
 
         $response->setStatusCode(Response::STATUS_CODE_CREATED);
-        $response->dynamic2($document, Response::MODEL_DOCUMENT);
+        $response->dynamic($document, Response::MODEL_DOCUMENT);
     });
 
 App::get('/v1/database/collections/:collectionId/documents')
@@ -782,7 +782,7 @@ App::get('/v1/database/collections/:collectionId/documents')
 
         $documents = $dbForExternal->find($collectionId, $queries, $limit, $offset, $orderAttributes, $orderTypes);
 
-        $response->dynamic2(new Document([
+        $response->dynamic(new Document([
             'sum' => \count($documents),
             'documents' => $documents,
         ]), Response::MODEL_DOCUMENT_LIST);
@@ -819,7 +819,7 @@ App::get('/v1/database/collections/:collectionId/documents/:documentId')
             throw new Exception('No document found', 404);
         }
 
-        $response->dynamic2($document, Response::MODEL_DOCUMENT);
+        $response->dynamic($document, Response::MODEL_DOCUMENT);
     });
 
 App::patch('/v1/database/collections/:collectionId/documents/:documentId')
@@ -890,7 +890,7 @@ App::patch('/v1/database/collections/:collectionId/documents/:documentId')
             ->setParam('data', $document->getArrayCopy())
         ;
 
-        $response->dynamic2($document, Response::MODEL_DOCUMENT);
+        $response->dynamic($document, Response::MODEL_DOCUMENT);
     });
 
 App::delete('/v1/database/collections/:collectionId/documents/:documentId')
@@ -931,7 +931,7 @@ App::delete('/v1/database/collections/:collectionId/documents/:documentId')
         $success = $dbForExternal->deleteDocument($collectionId, $documentId);
 
         $events
-            ->setParam('eventData', $response->output2($document, Response::MODEL_DOCUMENT))
+            ->setParam('eventData', $response->output($document, Response::MODEL_DOCUMENT))
         ;
 
         $audits
diff --git a/app/controllers/api/functions.php b/app/controllers/api/functions.php
index c0ea527765..8d2f28a87a 100644
--- a/app/controllers/api/functions.php
+++ b/app/controllers/api/functions.php
@@ -2,7 +2,7 @@
 
 use Ahc\Jwt\JWT;
 use Appwrite\Auth\Auth;
-use Appwrite\Database\Validator\UID;
+use Utopia\Database\Validator\UID;
 use Utopia\Storage\Storage;
 use Utopia\Storage\Validator\File;
 use Utopia\Storage\Validator\FileExt;
@@ -68,7 +68,7 @@ App::post('/v1/functions')
         ]));
 
         $response->setStatusCode(Response::STATUS_CODE_CREATED);
-        $response->dynamic2($function, Response::MODEL_FUNCTION);
+        $response->dynamic($function, Response::MODEL_FUNCTION);
     });
 
 App::get('/v1/functions')
@@ -94,7 +94,7 @@ App::get('/v1/functions')
 
         $queries = ($search) ? [new Query('name', Query::TYPE_SEARCH, [$search])] : [];
 
-        $response->dynamic2(new Document([
+        $response->dynamic(new Document([
             'functions' => $dbForInternal->find('functions', $queries, $limit, $offset, ['_id'], [$orderType]),
             'sum' => $dbForInternal->count('functions', $queries, APP_LIMIT_COUNT),
         ]), Response::MODEL_FUNCTION_LIST);
@@ -124,7 +124,7 @@ App::get('/v1/functions/:functionId')
             throw new Exception('Function not found', 404);
         }
 
-        $response->dynamic2($function, Response::MODEL_FUNCTION);
+        $response->dynamic($function, Response::MODEL_FUNCTION);
     });
 
 App::get('/v1/functions/:functionId/usage')
@@ -142,7 +142,7 @@ App::get('/v1/functions/:functionId/usage')
     ->inject('register')
     ->action(function ($functionId, $range, $response, $project, $dbForInternal, $register) {
         /** @var Appwrite\Utopia\Response $response */
-        /** @var Appwrite\Database\Document $project */
+        /** @var Utopia\Database\Document $project */
         /** @var Utopia\Database\Database $dbForInternal */
         /** @var Utopia\Registry\Registry $register */
 
@@ -272,7 +272,7 @@ App::put('/v1/functions/:functionId')
     ->action(function ($functionId, $name, $execute, $vars, $events, $schedule, $timeout, $response, $dbForInternal, $project) {
         /** @var Appwrite\Utopia\Response $response */
         /** @var Utopia\Database\Database $dbForInternal */
-        /** @var Appwrite\Database\Document $project */
+        /** @var Utopia\Database\Document $project */
 
         $function = $dbForInternal->getDocument('functions', $functionId);
 
@@ -305,7 +305,7 @@ App::put('/v1/functions/:functionId')
             ]);  // Async task rescheduale
         }
 
-        $response->dynamic2($function, Response::MODEL_FUNCTION);
+        $response->dynamic($function, Response::MODEL_FUNCTION);
     });
 
 App::patch('/v1/functions/:functionId/tag')
@@ -328,7 +328,7 @@ App::patch('/v1/functions/:functionId/tag')
     ->action(function ($functionId, $tag, $response, $dbForInternal, $project) {
         /** @var Appwrite\Utopia\Response $response */
         /** @var Utopia\Database\Database $dbForInternal */
-        /** @var Appwrite\Database\Document $project */
+        /** @var Utopia\Database\Document $project */
 
         $function = $dbForInternal->getDocument('functions', $functionId);
         $tag = $dbForInternal->getDocument('tags', $tag);
@@ -360,7 +360,7 @@ App::patch('/v1/functions/:functionId/tag')
             ]);  // Async task rescheduale
         }
 
-        $response->dynamic2($function, Response::MODEL_FUNCTION);
+        $response->dynamic($function, Response::MODEL_FUNCTION);
     });
 
 App::delete('/v1/functions/:functionId')
@@ -484,7 +484,7 @@ App::post('/v1/functions/:functionId/tags')
         ;
 
         $response->setStatusCode(Response::STATUS_CODE_CREATED);
-        $response->dynamic2($tag, Response::MODEL_TAG);
+        $response->dynamic($tag, Response::MODEL_TAG);
     });
 
 App::get('/v1/functions/:functionId/tags')
@@ -520,7 +520,7 @@ App::get('/v1/functions/:functionId/tags')
         $results = $dbForInternal->find('tags', $queries, $limit, $offset, ['_id'], [$orderType]);
         $sum = $dbForInternal->count('tags', $queries, APP_LIMIT_COUNT);
 
-        $response->dynamic2(new Document([
+        $response->dynamic(new Document([
             'tags' => $results,
             'sum' => $sum,
         ]), Response::MODEL_TAG_LIST);
@@ -561,7 +561,7 @@ App::get('/v1/functions/:functionId/tags/:tagId')
             throw new Exception('Tag not found', 404);
         }
 
-        $response->dynamic2($tag, Response::MODEL_TAG);
+        $response->dynamic($tag, Response::MODEL_TAG);
     });
 
 App::delete('/v1/functions/:functionId/tags/:tagId')
@@ -645,9 +645,9 @@ App::post('/v1/functions/:functionId/executions')
     ->inject('user')
     ->action(function ($functionId, $data, /*$async,*/ $response, $project, $dbForInternal, $user) {
         /** @var Appwrite\Utopia\Response $response */
-        /** @var Appwrite\Database\Document $project */
+        /** @var Utopia\Database\Document $project */
         /** @var Utopia\Database\Database $dbForInternal */
-        /** @var Appwrite\Database\Document $user */
+        /** @var Utopia\Database\Document $user */
 
         Authorization::disable();
 
@@ -699,7 +699,7 @@ App::post('/v1/functions/:functionId/executions')
             $sessions = $user->getAttribute('sessions', []);
             $current = new Document();
 
-            foreach ($sessions as $session) { /** @var Appwrite\Database\Document $session */
+            foreach ($sessions as $session) { /** @var Utopia\Database\Document $session */
                 if ($session->getAttribute('secret') == Auth::hash(Auth::$secret)) { // If current session delete the cookies too
                     $current = $session;
                 }
@@ -726,7 +726,7 @@ App::post('/v1/functions/:functionId/executions')
         ]);
 
         $response->setStatusCode(Response::STATUS_CODE_CREATED);
-        $response->dynamic2($execution, Response::MODEL_EXECUTION);
+        $response->dynamic($execution, Response::MODEL_EXECUTION);
     });
 
 App::get('/v1/functions/:functionId/executions')
@@ -765,7 +765,7 @@ App::get('/v1/functions/:functionId/executions')
             new Query('functionId', Query::TYPE_EQUAL, [$function->getId()]),
         ], APP_LIMIT_COUNT);
 
-        $response->dynamic2(new Document([
+        $response->dynamic(new Document([
             'executions' => $results,
             'sum' => $sum,
         ]), Response::MODEL_EXECUTION_LIST);
@@ -808,5 +808,5 @@ App::get('/v1/functions/:functionId/executions/:executionId')
             throw new Exception('Execution not found', 404);
         }
 
-        $response->dynamic2($execution, Response::MODEL_EXECUTION);
+        $response->dynamic($execution, Response::MODEL_EXECUTION);
     });
diff --git a/app/controllers/api/locale.php b/app/controllers/api/locale.php
index 0494789180..a1f9c1035b 100644
--- a/app/controllers/api/locale.php
+++ b/app/controllers/api/locale.php
@@ -1,6 +1,6 @@
 <?php
 
-use Appwrite\Database\Document;
+use Utopia\Database\Document;
 use Appwrite\Utopia\Response;
 use Utopia\App;
 use Utopia\Config\Config;
diff --git a/app/controllers/api/projects.php b/app/controllers/api/projects.php
index 3c932cf04a..d8163a8328 100644
--- a/app/controllers/api/projects.php
+++ b/app/controllers/api/projects.php
@@ -134,7 +134,7 @@ App::post('/v1/projects')
         $consoleDB->createNamespace($project->getId());
 
         $response->setStatusCode(Response::STATUS_CODE_CREATED);
-        $response->dynamic2($project, Response::MODEL_PROJECT);
+        $response->dynamic($project, Response::MODEL_PROJECT);
     });
 
 App::get('/v1/projects')
@@ -162,7 +162,7 @@ App::get('/v1/projects')
         $results = $dbForConsole->find('projects', $queries, $limit, $offset, ['_id'], [$orderType]);
         $sum = $dbForConsole->count('projects', $queries, APP_LIMIT_COUNT);
 
-        $response->dynamic2(new Document([
+        $response->dynamic(new Document([
             'projects' => $results,
             'sum' => $sum,
         ]), Response::MODEL_PROJECT_LIST);
@@ -191,7 +191,7 @@ App::get('/v1/projects/:projectId')
             throw new Exception('Project not found', 404);
         }
 
-        $response->dynamic2($project, Response::MODEL_PROJECT);
+        $response->dynamic($project, Response::MODEL_PROJECT);
     });
 
 App::get('/v1/projects/:projectId/usage')
@@ -440,7 +440,7 @@ App::patch('/v1/projects/:projectId')
                 ->setAttribute('legalTaxId', $legalTaxId)
         );
 
-        $response->dynamic2($project, Response::MODEL_PROJECT);
+        $response->dynamic($project, Response::MODEL_PROJECT);
     });
 
 App::patch('/v1/projects/:projectId/oauth2')
@@ -474,7 +474,7 @@ App::patch('/v1/projects/:projectId/oauth2')
                 ->setAttribute('usersOauth2' . \ucfirst($provider) . 'Secret', $secret)
         );
 
-        $response->dynamic2($project, Response::MODEL_PROJECT);
+        $response->dynamic($project, Response::MODEL_PROJECT);
     });
 
 App::patch('/v1/projects/:projectId/auth/limit')
@@ -505,7 +505,7 @@ App::patch('/v1/projects/:projectId/auth/limit')
                 ->setAttribute('usersAuthLimit', $limit)
         );
 
-        $response->dynamic2($project, Response::MODEL_PROJECT);
+        $response->dynamic($project, Response::MODEL_PROJECT);
     });
 
 App::patch('/v1/projects/:projectId/auth/:method')
@@ -540,7 +540,7 @@ App::patch('/v1/projects/:projectId/auth/:method')
                 ->setAttribute($authKey, $status)
         );
 
-        $response->dynamic2($project, Response::MODEL_PROJECT);
+        $response->dynamic($project, Response::MODEL_PROJECT);
     });
 
 App::delete('/v1/projects/:projectId')
@@ -638,7 +638,7 @@ App::post('/v1/projects/:projectId/webhooks')
         );
 
         $response->setStatusCode(Response::STATUS_CODE_CREATED);
-        $response->dynamic2($webhook, Response::MODEL_WEBHOOK);
+        $response->dynamic($webhook, Response::MODEL_WEBHOOK);
     });
 
 App::get('/v1/projects/:projectId/webhooks')
@@ -666,7 +666,7 @@ App::get('/v1/projects/:projectId/webhooks')
 
         $webhooks = $project->getAttribute('webhooks', []);
 
-        $response->dynamic2(new Document([
+        $response->dynamic(new Document([
             'webhooks' => $webhooks,
             'sum' => count($webhooks),
         ]), Response::MODEL_WEBHOOK_LIST);
@@ -702,7 +702,7 @@ App::get('/v1/projects/:projectId/webhooks/:webhookId')
             throw new Exception('Webhook not found', 404);
         }
 
-        $response->dynamic2($webhook, Response::MODEL_WEBHOOK);
+        $response->dynamic($webhook, Response::MODEL_WEBHOOK);
     });
 
 App::put('/v1/projects/:projectId/webhooks/:webhookId')
@@ -754,7 +754,7 @@ App::put('/v1/projects/:projectId/webhooks/:webhookId')
 
         $dbForConsole->updateDocument('projects', $project->getId(), $project);
 
-        $response->dynamic2($webhook, Response::MODEL_WEBHOOK);
+        $response->dynamic($webhook, Response::MODEL_WEBHOOK);
     });
 
 App::delete('/v1/projects/:projectId/webhooks/:webhookId')
@@ -828,7 +828,7 @@ App::post('/v1/projects/:projectId/keys')
         );
 
         $response->setStatusCode(Response::STATUS_CODE_CREATED);
-        $response->dynamic2($key, Response::MODEL_KEY);
+        $response->dynamic($key, Response::MODEL_KEY);
     });
 
 App::get('/v1/projects/:projectId/keys')
@@ -856,7 +856,7 @@ App::get('/v1/projects/:projectId/keys')
 
         $keys = $project->getAttribute('keys', []);
 
-        $response->dynamic2(new Document([
+        $response->dynamic(new Document([
             'keys' => $keys,
             'sum' => count($keys),
         ]), Response::MODEL_KEY_LIST);
@@ -889,7 +889,7 @@ App::get('/v1/projects/:projectId/keys/:keyId')
             throw new Exception('Key not found', 404);
         }
 
-        $response->dynamic2($key, Response::MODEL_KEY);
+        $response->dynamic($key, Response::MODEL_KEY);
     });
 
 App::put('/v1/projects/:projectId/keys/:keyId')
@@ -931,7 +931,7 @@ App::put('/v1/projects/:projectId/keys/:keyId')
 
         $dbForConsole->updateDocument('projects', $project->getId(), $project);
 
-        $response->dynamic2($key, Response::MODEL_KEY);
+        $response->dynamic($key, Response::MODEL_KEY);
     });
 
 App::delete('/v1/projects/:projectId/keys/:keyId')
@@ -1032,7 +1032,7 @@ App::post('/v1/projects/:projectId/tasks')
         }
 
         $response->setStatusCode(Response::STATUS_CODE_CREATED);
-        $response->dynamic2($task, Response::MODEL_TASK);
+        $response->dynamic($task, Response::MODEL_TASK);
     });
 
 App::get('/v1/projects/:projectId/tasks')
@@ -1060,7 +1060,7 @@ App::get('/v1/projects/:projectId/tasks')
 
         $tasks = $project->getAttribute('tasks', []);
 
-        $response->dynamic2(new Document([
+        $response->dynamic(new Document([
             'tasks' => $tasks,
             'sum' => count($tasks),
         ]), Response::MODEL_TASK_LIST);
@@ -1097,7 +1097,7 @@ App::get('/v1/projects/:projectId/tasks/:taskId')
             throw new Exception('Task not found', 404);
         }
 
-        $response->dynamic2($task, Response::MODEL_TASK);
+        $response->dynamic($task, Response::MODEL_TASK);
     });
 
 App::put('/v1/projects/:projectId/tasks/:taskId')
@@ -1163,7 +1163,7 @@ App::put('/v1/projects/:projectId/tasks/:taskId')
             ResqueScheduler::enqueueAt($next, 'v1-tasks', 'TasksV1', $task->getArrayCopy());
         }
 
-        $response->dynamic2($task, Response::MODEL_TASK);
+        $response->dynamic($task, Response::MODEL_TASK);
     });
 
 App::delete('/v1/projects/:projectId/tasks/:taskId')
@@ -1244,7 +1244,7 @@ App::post('/v1/projects/:projectId/platforms')
         );
 
         $response->setStatusCode(Response::STATUS_CODE_CREATED);
-        $response->dynamic2($platform, Response::MODEL_PLATFORM);
+        $response->dynamic($platform, Response::MODEL_PLATFORM);
     });
 
 App::get('/v1/projects/:projectId/platforms')
@@ -1272,7 +1272,7 @@ App::get('/v1/projects/:projectId/platforms')
 
         $platforms = $project->getAttribute('platforms', []);
 
-        $response->dynamic2(new Document([
+        $response->dynamic(new Document([
             'platforms' => $platforms,
             'sum' => count($platforms),
         ]), Response::MODEL_PLATFORM_LIST);
@@ -1308,7 +1308,7 @@ App::get('/v1/projects/:projectId/platforms/:platformId')
             throw new Exception('Platform not found', 404);
         }
 
-        $response->dynamic2($platform, Response::MODEL_PLATFORM);
+        $response->dynamic($platform, Response::MODEL_PLATFORM);
     });
 
 App::put('/v1/projects/:projectId/platforms/:platformId')
@@ -1363,7 +1363,7 @@ App::put('/v1/projects/:projectId/platforms/:platformId')
 
         $dbForConsole->updateDocument('projects', $project->getId(), $project);
 
-        $response->dynamic2($platform, Response::MODEL_PLATFORM);
+        $response->dynamic($platform, Response::MODEL_PLATFORM);
     });
 
 App::delete('/v1/projects/:projectId/platforms/:platformId')
@@ -1453,7 +1453,7 @@ App::post('/v1/projects/:projectId/domains')
         );
 
         $response->setStatusCode(Response::STATUS_CODE_CREATED);
-        $response->dynamic2($domain, Response::MODEL_DOMAIN);
+        $response->dynamic($domain, Response::MODEL_DOMAIN);
     });
 
 App::get('/v1/projects/:projectId/domains')
@@ -1481,7 +1481,7 @@ App::get('/v1/projects/:projectId/domains')
 
         $domains = $project->getAttribute('domains', []);
 
-        $response->dynamic2(new Document([
+        $response->dynamic(new Document([
             'domains' => $domains,
             'sum' => count($domains),
         ]), Response::MODEL_DOMAIN_LIST);
@@ -1517,7 +1517,7 @@ App::get('/v1/projects/:projectId/domains/:domainId')
             throw new Exception('Domain not found', 404);
         }
 
-        $response->dynamic2($domain, Response::MODEL_DOMAIN);
+        $response->dynamic($domain, Response::MODEL_DOMAIN);
     });
 
 App::patch('/v1/projects/:projectId/domains/:domainId/verification')
@@ -1557,7 +1557,7 @@ App::patch('/v1/projects/:projectId/domains/:domainId/verification')
         }
 
         if ($domain->getAttribute('verification') === true) {
-            return $response->dynamic2($domain, Response::MODEL_DOMAIN);
+            return $response->dynamic($domain, Response::MODEL_DOMAIN);
         }
 
         $validator = new CNAME($target->get()); // Verify Domain with DNS records
@@ -1578,7 +1578,7 @@ App::patch('/v1/projects/:projectId/domains/:domainId/verification')
             'domain' => $domain->getAttribute('domain'),
         ]);
 
-        $response->dynamic2($domain, Response::MODEL_DOMAIN);
+        $response->dynamic($domain, Response::MODEL_DOMAIN);
     });
 
 App::delete('/v1/projects/:projectId/domains/:domainId')
diff --git a/app/controllers/api/storage.php b/app/controllers/api/storage.php
index b006ed38cd..552b0a9df1 100644
--- a/app/controllers/api/storage.php
+++ b/app/controllers/api/storage.php
@@ -11,7 +11,7 @@ use Utopia\Cache\Cache;
 use Utopia\Cache\Adapter\Filesystem;
 use Appwrite\ClamAV\Network;
 use Utopia\Database\Document;
-use Appwrite\Database\Validator\UID;
+use Utopia\Database\Validator\UID;
 use Utopia\Storage\Storage;
 use Utopia\Storage\Validator\File;
 use Utopia\Storage\Validator\FileSize;
@@ -50,7 +50,7 @@ App::post('/v1/storage/files')
         /** @var Utopia\Swoole\Request $request */
         /** @var Appwrite\Utopia\Response $response */
         /** @var Utopia\Database\Database $dbForInternal */
-        /** @var Appwrite\Database\Document $user */
+        /** @var Utopia\Database\Document $user */
         /** @var Appwrite\Event\Event $audits */
         /** @var Appwrite\Event\Event $usage */
 
@@ -150,7 +150,7 @@ App::post('/v1/storage/files')
         ;
 
         $response->setStatusCode(Response::STATUS_CODE_CREATED);
-        $response->dynamic2($file, Response::MODEL_FILE);
+        $response->dynamic($file, Response::MODEL_FILE);
         ;
     });
 
@@ -177,7 +177,7 @@ App::get('/v1/storage/files')
 
         $queries = ($search) ? [new Query('name', Query::TYPE_SEARCH, $search)] : [];
 
-        $response->dynamic2(new Document([
+        $response->dynamic(new Document([
             'files' => $dbForInternal->find('files', $queries, $limit, $offset, ['_id'], [$orderType]),
             'sum' => $dbForInternal->count('files', $queries, APP_LIMIT_COUNT),
         ]), Response::MODEL_FILE_LIST);
@@ -207,7 +207,7 @@ App::get('/v1/storage/files/:fileId')
             throw new Exception('File not found', 404);
         }
 
-        $response->dynamic2($file, Response::MODEL_FILE);
+        $response->dynamic($file, Response::MODEL_FILE);
     });
 
 App::get('/v1/storage/files/:fileId/preview')
@@ -530,7 +530,7 @@ App::put('/v1/storage/files/:fileId')
             ->setParam('resource', 'storage/files/'.$file->getId())
         ;
 
-        $response->dynamic2($file, Response::MODEL_FILE);
+        $response->dynamic($file, Response::MODEL_FILE);
     });
 
 App::delete('/v1/storage/files/:fileId')
@@ -581,7 +581,7 @@ App::delete('/v1/storage/files/:fileId')
         ;
 
         $events
-            ->setParam('eventData', $response->output2($file, Response::MODEL_FILE))
+            ->setParam('eventData', $response->output($file, Response::MODEL_FILE))
         ;
 
         $response->noContent();
diff --git a/app/controllers/api/teams.php b/app/controllers/api/teams.php
index 5ad8ecd6c3..4e82260343 100644
--- a/app/controllers/api/teams.php
+++ b/app/controllers/api/teams.php
@@ -1,7 +1,6 @@
 <?php
 
 use Appwrite\Auth\Auth;
-use Appwrite\Database\Validator\UID;
 use Appwrite\Detector\Detector;
 use Appwrite\Template\Template;
 use Appwrite\Utopia\Response;
@@ -19,6 +18,7 @@ use Utopia\Database\Exception\Duplicate;
 use Utopia\Database\Query;
 use Utopia\Database\Validator\Authorization;
 use Utopia\Database\Validator\Key;
+use Utopia\Database\Validator\UID;
 
 App::post('/v1/teams')
     ->desc('Create Team')
@@ -80,7 +80,7 @@ App::post('/v1/teams')
         }
 
         $response->setStatusCode(Response::STATUS_CODE_CREATED);
-        $response->dynamic2($team, Response::MODEL_TEAM);
+        $response->dynamic($team, Response::MODEL_TEAM);
     });
 
 App::get('/v1/teams')
@@ -109,7 +109,7 @@ App::get('/v1/teams')
         $results = $dbForInternal->find('teams', $queries, $limit, $offset, ['_id'], [$orderType]);
         $sum = $dbForInternal->count('teams', $queries, APP_LIMIT_COUNT);
 
-        $response->dynamic2(new Document([
+        $response->dynamic(new Document([
             'teams' => $results,
             'sum' => $sum,
         ]), Response::MODEL_TEAM_LIST);
@@ -139,7 +139,7 @@ App::get('/v1/teams/:teamId')
             throw new Exception('Team not found', 404);
         }
 
-        $response->dynamic2($team, Response::MODEL_TEAM);
+        $response->dynamic($team, Response::MODEL_TEAM);
     });
 
 App::put('/v1/teams/:teamId')
@@ -170,7 +170,7 @@ App::put('/v1/teams/:teamId')
 
         $team = $dbForInternal->updateDocument('teams', $team->getId(), $team->setAttribute('name', $name));
 
-        $response->dynamic2($team, Response::MODEL_TEAM);
+        $response->dynamic($team, Response::MODEL_TEAM);
     });
 
 App::delete('/v1/teams/:teamId')
@@ -222,7 +222,7 @@ App::delete('/v1/teams/:teamId')
         ;
 
         $events
-            ->setParam('eventData', $response->output2($team, Response::MODEL_TEAM))
+            ->setParam('eventData', $response->output($team, Response::MODEL_TEAM))
         ;
 
         $response->noContent();
@@ -256,8 +256,8 @@ App::post('/v1/teams/:teamId/memberships')
     ->inject('mails')
     ->action(function ($teamId, $email, $name, $roles, $url, $response, $project, $user, $dbForInternal, $locale, $audits, $mails) {
         /** @var Appwrite\Utopia\Response $response */
-        /** @var Appwrite\Database\Document $project */
-        /** @var Appwrite\Database\Document $user */
+        /** @var Utopia\Database\Document $project */
+        /** @var Utopia\Database\Document $user */
         /** @var Utopia\Database\Database $dbForInternal */
         /** @var Appwrite\Event\Event $audits */
         /** @var Appwrite\Event\Event $mails */
@@ -409,7 +409,7 @@ App::post('/v1/teams/:teamId/memberships')
         ;
 
         $response->setStatusCode(Response::STATUS_CODE_CREATED);
-        $response->dynamic2($membership
+        $response->dynamic($membership
             ->setAttribute('email', $email)
             ->setAttribute('name', $name)
         , Response::MODEL_MEMBERSHIP);
@@ -457,7 +457,7 @@ App::get('/v1/teams/:teamId/memberships')
             $users[] = new Document(\array_merge($temp, $membership->getArrayCopy()));
         }
 
-        $response->dynamic2(new Document([
+        $response->dynamic(new Document([
             'memberships' => $users,
             'sum' => $sum,
         ]), Response::MODEL_MEMBERSHIP_LIST);
@@ -486,7 +486,7 @@ App::patch('/v1/teams/:teamId/memberships/:membershipId')
     ->action(function ($teamId, $membershipId, $roles, $request, $response, $user, $dbForInternal, $audits) {
         /** @var Utopia\Swoole\Request $request */
         /** @var Appwrite\Utopia\Response $response */
-        /** @var Appwrite\Database\Document $user */
+        /** @var Utopia\Database\Document $user */
         /** @var Utopia\Database\Database $dbForInternal */
         /** @var Appwrite\Event\Event $audits */
 
@@ -525,7 +525,7 @@ App::patch('/v1/teams/:teamId/memberships/:membershipId')
             ->setParam('resource', 'teams/'.$teamId)
         ;
 
-        $response->dynamic2($membership, Response::MODEL_MEMBERSHIP);
+        $response->dynamic($membership, Response::MODEL_MEMBERSHIP);
     });
 
 App::patch('/v1/teams/:teamId/memberships/:membershipId/status')
@@ -553,7 +553,7 @@ App::patch('/v1/teams/:teamId/memberships/:membershipId/status')
     ->action(function ($teamId, $membershipId, $userId, $secret, $request, $response, $user, $dbForInternal, $geodb, $audits) {
         /** @var Utopia\Swoole\Request $request */
         /** @var Appwrite\Utopia\Response $response */
-        /** @var Appwrite\Database\Document $user */
+        /** @var Utopia\Database\Document $user */
         /** @var Utopia\Database\Database $dbForInternal */
         /** @var MaxMind\Db\Reader $geodb */
         /** @var Appwrite\Event\Event $audits */
@@ -661,7 +661,7 @@ App::patch('/v1/teams/:teamId/memberships/:membershipId/status')
             ->addCookie(Auth::$cookieName, Auth::encodeSession($user->getId(), $secret), $expiry, '/', Config::getParam('cookieDomain'), ('https' == $protocol), true, Config::getParam('cookieSamesite'))
         ;
 
-        $response->dynamic2($membership
+        $response->dynamic($membership
             ->setAttribute('email', $user->getAttribute('email'))
             ->setAttribute('name', $user->getAttribute('name'))
         , Response::MODEL_MEMBERSHIP);
@@ -744,7 +744,7 @@ App::delete('/v1/teams/:teamId/memberships/:membershipId')
         ;
 
         $events
-            ->setParam('eventData', $response->output2($membership, Response::MODEL_MEMBERSHIP))
+            ->setParam('eventData', $response->output($membership, Response::MODEL_MEMBERSHIP))
         ;
 
         $response->noContent();
diff --git a/app/controllers/api/users.php b/app/controllers/api/users.php
index 8a1be03744..2abbc5b50a 100644
--- a/app/controllers/api/users.php
+++ b/app/controllers/api/users.php
@@ -65,7 +65,7 @@ App::post('/v1/users')
         }
 
         $response->setStatusCode(Response::STATUS_CODE_CREATED);
-        $response->dynamic2($user, Response::MODEL_USER);
+        $response->dynamic($user, Response::MODEL_USER);
     });
 
 App::get('/v1/users')
@@ -92,7 +92,7 @@ App::get('/v1/users')
         $results = $dbForInternal->find('users', [], $limit, $offset, ['_id'], [$orderType]);
         $sum = $dbForInternal->count('users', [], APP_LIMIT_COUNT);
 
-        $response->dynamic2(new Document([
+        $response->dynamic(new Document([
             'users' => $results,
             'sum' => $sum,
         ]), Response::MODEL_USER_LIST);
@@ -122,7 +122,7 @@ App::get('/v1/users/:userId')
             throw new Exception('User not found', 404);
         }
 
-        $response->dynamic2($user, Response::MODEL_USER);
+        $response->dynamic($user, Response::MODEL_USER);
     });
 
 App::get('/v1/users/:userId/prefs')
@@ -151,7 +151,7 @@ App::get('/v1/users/:userId/prefs')
 
         $prefs = $user->getAttribute('prefs', new \stdClass());
 
-        $response->dynamic2(new Document($prefs), Response::MODEL_PREFERENCES);
+        $response->dynamic(new Document($prefs), Response::MODEL_PREFERENCES);
     });
 
 App::get('/v1/users/:userId/sessions')
@@ -194,7 +194,7 @@ App::get('/v1/users/:userId/sessions')
             $sessions[$key] = $session;
         }
 
-        $response->dynamic2(new Document([
+        $response->dynamic(new Document([
             'sessions' => $sessions,
             'sum' => count($sessions),
         ]), Response::MODEL_SESSION_LIST);
@@ -218,7 +218,7 @@ App::get('/v1/users/:userId/logs')
     ->inject('geodb')
     ->action(function ($userId, $response, $dbForInternal, $locale, $geodb) {
         /** @var Appwrite\Utopia\Response $response */
-        /** @var Appwrite\Database\Document $project */
+        /** @var Utopia\Database\Document $project */
         /** @var Utopia\Database\Database $dbForInternal */
         /** @var Utopia\Locale\Locale $locale */
         /** @var MaxMind\Db\Reader $geodb */
@@ -305,7 +305,7 @@ App::get('/v1/users/:userId/logs')
             }
         }
 
-        $response->dynamic2(new Document(['logs' => $output]), Response::MODEL_LOG_LIST);
+        $response->dynamic(new Document(['logs' => $output]), Response::MODEL_LOG_LIST);
     });
 
 App::patch('/v1/users/:userId/status')
@@ -336,7 +336,7 @@ App::patch('/v1/users/:userId/status')
 
         $user = $dbForInternal->updateDocument('users', $user->getId(), $user->setAttribute('status', (bool) $status));
 
-        $response->dynamic2($user, Response::MODEL_USER);
+        $response->dynamic($user, Response::MODEL_USER);
     });
 
 App::patch('/v1/users/:userId/verification')
@@ -367,7 +367,7 @@ App::patch('/v1/users/:userId/verification')
 
         $user = $dbForInternal->updateDocument('users', $user->getId(), $user->setAttribute('emailVerification', $emailVerification));
 
-        $response->dynamic2($user, Response::MODEL_USER);
+        $response->dynamic($user, Response::MODEL_USER);
     });
 
 App::patch('/v1/users/:userId/prefs')
@@ -398,7 +398,7 @@ App::patch('/v1/users/:userId/prefs')
 
         $user = $dbForInternal->updateDocument('users', $user->getId(), $user->setAttribute('prefs', $prefs));
 
-        $response->dynamic2(new Document($prefs), Response::MODEL_PREFERENCES);
+        $response->dynamic(new Document($prefs), Response::MODEL_PREFERENCES);
     });
 
 App::delete('/v1/users/:userId/sessions/:sessionId')
@@ -440,7 +440,7 @@ App::delete('/v1/users/:userId/sessions/:sessionId')
                 $user->setAttribute('sessions', $sessions);
                 
                 $events
-                    ->setParam('eventData', $response->output2($user, Response::MODEL_USER))
+                    ->setParam('eventData', $response->output($user, Response::MODEL_USER))
                 ;
 
                 $dbForInternal->updateDocument('users', $user->getId(), $user);
@@ -486,7 +486,7 @@ App::delete('/v1/users/:userId/sessions')
         $dbForInternal->updateDocument('users', $user->getId(), $user->getAttribute('sessions', []));
 
         $events
-            ->setParam('eventData', $response->output2($user, Response::MODEL_USER))
+            ->setParam('eventData', $response->output($user, Response::MODEL_USER))
         ;
 
         $response->noContent();
@@ -535,7 +535,7 @@ App::delete('/v1/users/:userId')
         ;
 
         $events
-            ->setParam('eventData', $response->output2($user, Response::MODEL_USER))
+            ->setParam('eventData', $response->output($user, Response::MODEL_USER))
         ;
 
         // TODO : Response filter implementation
diff --git a/app/controllers/general.php b/app/controllers/general.php
index d8f24019f8..46bd81689d 100644
--- a/app/controllers/general.php
+++ b/app/controllers/general.php
@@ -10,16 +10,14 @@ use Utopia\Exception;
 use Utopia\Config\Config;
 use Utopia\Domains\Domain;
 use Appwrite\Auth\Auth;
-use Appwrite\Database\Validator\Authorization;
 use Appwrite\Network\Validator\Origin;
 use Appwrite\Utopia\Response\Filters\V06;
 use Appwrite\Utopia\Response\Filters\V07;
 use Appwrite\Utopia\Response\Filters\V08;
 use Utopia\CLI\Console;
-use Utopia\Database\Database;
 use Utopia\Database\Document;
 use Utopia\Database\Query;
-use Utopia\Database\Validator\Authorization as Authorization2;
+use Utopia\Database\Validator\Authorization;
 
 Config::setParam('domainVerification', false);
 Config::setParam('cookieDomain', 'localhost');
@@ -44,7 +42,7 @@ App::init(function ($utopia, $request, $response, $console, $project, $dbForCons
             $domains[$domain->get()] = false;
             Console::warning($domain->get() . ' is not a publicly accessible domain. Skipping SSL certificate generation.');
         } else {
-            Authorization2::disable();
+            Authorization::disable();
 
             $certificate = $dbForConsole->findFirst('certificates', [
                 new Query('domain', QUERY::TYPE_EQUAL, [$domain->get()])
@@ -55,7 +53,7 @@ App::init(function ($utopia, $request, $response, $console, $project, $dbForCons
                     'domain' => $domain->get(),
                 ]);
                 $certificate = $dbForConsole->createDocument('certificates', $certificate);
-                Authorization2::enable();
+                Authorization::enable();
 
                 Console::info('Issuing a TLS certificate for the master domain (' . $domain->get() . ') in a few seconds...');
 
@@ -66,7 +64,7 @@ App::init(function ($utopia, $request, $response, $console, $project, $dbForCons
                     'validateCNAME' => false,
                 ]);
             } else {
-                Authorization2::enable(); // ensure authorization is reenabled
+                Authorization::enable(); // ensure authorization is reenabled
             }
             $domains[$domain->get()] = true;
         }
@@ -239,26 +237,21 @@ App::init(function ($utopia, $request, $response, $console, $project, $dbForCons
             $scopes = \array_merge($roles[$role]['scopes'], $key->getAttribute('scopes', []));
 
             Authorization::setDefaultStatus(false);  // Cancel security segmentation for API keys.
-            Authorization2::setDefaultStatus(false);  // Cancel security segmentation for API keys.
         }
     }
 
     if ($user->getId()) {
         Authorization::setRole('user:'.$user->getId());
-        Authorization2::setRole('user:'.$user->getId());
     }
 
     Authorization::setRole('role:'.$role);
-    Authorization2::setRole('role:'.$role);
 
     \array_map(function ($node) {
         if (isset($node['teamId']) && isset($node['roles'])) {
             Authorization::setRole('team:'.$node['teamId']);
-            Authorization2::setRole('team:'.$node['teamId']);
 
             foreach ($node['roles'] as $nodeRole) { // Set all team roles
                 Authorization::setRole('team:'.$node['teamId'].'/'.$nodeRole);
-                Authorization2::setRole('team:'.$node['teamId'].'/'.$nodeRole);
             }
         }
     }, $user->getAttribute('memberships', []));
@@ -305,7 +298,7 @@ App::error(function ($error, $utopia, $request, $response, $layout, $project) {
     /** @var Utopia\Swoole\Request $request */
     /** @var Appwrite\Utopia\Response $response */
     /** @var Utopia\View $layout */
-    /** @var Appwrite\Database\Document $project */
+    /** @var Utopia\Database\Document $project */
 
     if ($error instanceof PDOException) {
         throw $error;
@@ -393,7 +386,7 @@ App::error(function ($error, $utopia, $request, $response, $layout, $project) {
         $response->html($layout->render());
     }
 
-    $response->dynamic2(new Document($output),
+    $response->dynamic(new Document($output),
         $utopia->isDevelopment() ? Response::MODEL_ERROR_DEV : Response::MODEL_ERROR);
 }, ['error', 'utopia', 'request', 'response', 'layout', 'project']);
 
diff --git a/app/controllers/mock.php b/app/controllers/mock.php
index 17bade5793..9d4479c01f 100644
--- a/app/controllers/mock.php
+++ b/app/controllers/mock.php
@@ -2,7 +2,7 @@
 
 global $utopia, $request, $response;
 
-use Appwrite\Database\Document;
+use Utopia\Database\Document;
 use Appwrite\Network\Validator\Host;
 use Appwrite\Utopia\Response;
 use Utopia\App;
diff --git a/app/controllers/shared/api.php b/app/controllers/shared/api.php
index 24fed96611..836ef8f714 100644
--- a/app/controllers/shared/api.php
+++ b/app/controllers/shared/api.php
@@ -1,7 +1,7 @@
 <?php
 
 use Appwrite\Auth\Auth;
-use Appwrite\Database\Validator\Authorization;
+use Utopia\Database\Validator\Authorization;
 use Utopia\App;
 use Utopia\Exception;
 use Utopia\Abuse\Abuse;
@@ -120,8 +120,8 @@ App::init(function ($utopia, $request, $response, $project, $user) {
     /** @var Utopia\App $utopia */
     /** @var Utopia\Swoole\Request $request */
     /** @var Appwrite\Utopia\Response $response */
-    /** @var Appwrite\Database\Document $project */
-    /** @var Appwrite\Database\Document $user */
+    /** @var Utopia\Database\Document $project */
+    /** @var Utopia\Database\Document $user */
     /** @var Utopia\Registry\Registry $register */
     /** @var Appwrite\Event\Event $events */
     /** @var Appwrite\Event\Event $audits */
@@ -174,7 +174,7 @@ App::shutdown(function ($utopia, $request, $response, $project, $events, $audits
     /** @var Utopia\App $utopia */
     /** @var Utopia\Swoole\Request $request */
     /** @var Appwrite\Utopia\Response $response */
-    /** @var Appwrite\Database\Document $project */
+    /** @var Utopia\Database\Document $project */
     /** @var Appwrite\Event\Event $events */
     /** @var Appwrite\Event\Event $audits */
     /** @var Appwrite\Event\Event $usage */
diff --git a/app/controllers/web/home.php b/app/controllers/web/home.php
index f4325f7b44..938b14b6f6 100644
--- a/app/controllers/web/home.php
+++ b/app/controllers/web/home.php
@@ -1,6 +1,5 @@
 <?php
 
-use Appwrite\Database\Database;
 use Appwrite\Specification\Format\OpenAPI3;
 use Appwrite\Specification\Format\Swagger2;
 use Appwrite\Specification\Specification;
@@ -8,7 +7,6 @@ use Utopia\App;
 use Utopia\View;
 use Utopia\Config\Config;
 use Utopia\Exception;
-use Utopia\Validator\Boolean;
 use Utopia\Validator\Range;
 use Utopia\Validator\WhiteList;
 
diff --git a/app/http.php b/app/http.php
index 55adbb2359..d6f0dfe1eb 100644
--- a/app/http.php
+++ b/app/http.php
@@ -2,7 +2,6 @@
 
 require_once __DIR__.'/../vendor/autoload.php';
 
-use Appwrite\Database\Validator\Authorization;
 use Appwrite\Utopia\Response;
 use Swoole\Process;
 use Swoole\Http\Server;
@@ -11,7 +10,7 @@ use Swoole\Http\Response as SwooleResponse;
 use Utopia\App;
 use Utopia\CLI\Console;
 use Utopia\Config\Config;
-use Utopia\Database\Validator\Authorization as Authorization2;
+use Utopia\Database\Validator\Authorization;
 use Utopia\Audit\Audit;
 use Utopia\Abuse\Adapters\TimeLimit;
 use Utopia\Database\Document;
@@ -184,9 +183,6 @@ $http->on('request', function (SwooleRequest $swooleRequest, SwooleResponse $swo
         Authorization::cleanRoles();
         Authorization::setRole('role:all');
 
-        Authorization2::cleanRoles();
-        Authorization2::setRole('role:all');
-
         $app->run($request, $response);
     } catch (\Throwable $th) {
         Console::error('[Error] Type: '.get_class($th));
diff --git a/app/init.php b/app/init.php
index a42513259e..af409497aa 100644
--- a/app/init.php
+++ b/app/init.php
@@ -24,7 +24,6 @@ use Appwrite\Database\Database;
 use Appwrite\Database\Adapter\MySQL as MySQLAdapter;
 use Appwrite\Database\Adapter\Redis as RedisAdapter;
 use Appwrite\Database\Document;
-use Appwrite\Database\Validator\Authorization;
 use Appwrite\Event\Event;
 use Appwrite\OpenSSL\OpenSSL;
 use Utopia\App;
@@ -39,7 +38,7 @@ use Utopia\Cache\Cache;
 use Utopia\Database\Adapter\MariaDB;
 use Utopia\Database\Document as Document2;
 use Utopia\Database\Database as Database2;
-use Utopia\Database\Validator\Authorization as Authorization2;
+use Utopia\Database\Validator\Authorization;
 use Swoole\Database\PDOConfig;
 use Swoole\Database\PDOPool;
 use Swoole\Database\RedisConfig;
@@ -439,7 +438,6 @@ App::setResource('user', function($mode, $project, $console, $request, $response
     /** @var string $mode */
 
     Authorization::setDefaultStatus(true);
-    Authorization2::setDefaultStatus(true);
 
     Auth::setCookieName('a_session_'.$project->getId());
 
@@ -484,7 +482,6 @@ App::setResource('user', function($mode, $project, $console, $request, $response
     if (APP_MODE_ADMIN === $mode) {
         if ($user->find('teamId', $project->getAttribute('teamId'), 'memberships')) {
             Authorization::setDefaultStatus(false);  // Cancel security segmentation for admin users.
-            Authorization2::setDefaultStatus(false);  // Cancel security segmentation for admin users.
         } else {
             $user = new Document2(['$id' => '', '$collection' => 'users']);
         }
@@ -529,12 +526,10 @@ App::setResource('project', function($dbForConsole, $request, $console) {
     }
 
     Authorization::disable();
-    Authorization2::disable();
 
     $project = $dbForConsole->getDocument('projects', $projectId);
 
     Authorization::reset();
-    Authorization2::reset();
 
     return $project;
 }, ['dbForConsole', 'request', 'console']);
diff --git a/src/Appwrite/Auth/Auth.php b/src/Appwrite/Auth/Auth.php
index 3ae28997b1..56f708493b 100644
--- a/src/Appwrite/Auth/Auth.php
+++ b/src/Appwrite/Auth/Auth.php
@@ -2,7 +2,7 @@
 
 namespace Appwrite\Auth;
 
-use Appwrite\Database\Document;
+use Utopia\Database\Document;
 
 class Auth
 {
diff --git a/src/Appwrite/Specification/Format/OpenAPI3.php b/src/Appwrite/Specification/Format/OpenAPI3.php
index b14134cdf2..02b3c315d0 100644
--- a/src/Appwrite/Specification/Format/OpenAPI3.php
+++ b/src/Appwrite/Specification/Format/OpenAPI3.php
@@ -238,7 +238,7 @@ class OpenAPI3 extends Format
                         $node['schema']['type'] = $validator->getType();
                         $node['schema']['x-example'] = false;
                         break;
-                    case 'Appwrite\Database\Validator\UID':
+                    case 'Utopia\Database\Validator\UID':
                         $node['schema']['type'] = $validator->getType();
                         $node['schema']['x-example'] = '['.\strtoupper(Template::fromCamelCaseToSnake($node['name'])).']';
                         break;
diff --git a/src/Appwrite/Specification/Format/Swagger2.php b/src/Appwrite/Specification/Format/Swagger2.php
index 9809220f87..d8a84e3ccf 100644
--- a/src/Appwrite/Specification/Format/Swagger2.php
+++ b/src/Appwrite/Specification/Format/Swagger2.php
@@ -234,7 +234,7 @@ class Swagger2 extends Format
                         $node['type'] = $validator->getType();
                         $node['x-example'] = false;
                         break;
-                    case 'Appwrite\Database\Validator\UID':
+                    case 'Utopia\Database\Validator\UID':
                         $node['type'] = $validator->getType();
                         $node['x-example'] = '['.\strtoupper(Template::fromCamelCaseToSnake($node['name'])).']';
                         break;
diff --git a/src/Appwrite/Utopia/Response.php b/src/Appwrite/Utopia/Response.php
index bbae1c3e90..981d18f4b2 100644
--- a/src/Appwrite/Utopia/Response.php
+++ b/src/Appwrite/Utopia/Response.php
@@ -5,7 +5,7 @@ namespace Appwrite\Utopia;
 use Exception;
 use Utopia\Swoole\Response as SwooleResponse;
 use Swoole\Http\Response as SwooleHTTPResponse;
-use Appwrite\Database\Document;
+use Utopia\Database\Document;
 use Appwrite\Utopia\Response\Filter;
 use Appwrite\Utopia\Response\Model;
 use Appwrite\Utopia\Response\Model\None;
@@ -45,7 +45,6 @@ use Appwrite\Utopia\Response\Model\Webhook;
 use Appwrite\Utopia\Response\Model\Preferences;
 use Appwrite\Utopia\Response\Model\Mock; // Keep last
 use stdClass;
-use Utopia\Database\Document as DatabaseDocument;
 
 /**
  * @method Response public function setStatusCode(int $code = 200)
@@ -286,27 +285,6 @@ class Response extends SwooleResponse
         $this->json(!empty($output) ? $output : new stdClass());
     }
 
-    /**
-     * Validate response objects and outputs
-     *  the response according to given format type
-     * 
-     * @param DatabaseDocument $document
-     * @param string $model
-     * 
-     * return void
-     */
-    public function dynamic2(DatabaseDocument $document, string $model): void
-    {
-        $output = $this->output2($document, $model);
-
-        // If filter is set, parse the output
-        if(self::isFilter()){
-            $output = self::getFilter()->parse($output, $model);
-        }
-
-        $this->json(!empty($output) ? $output : new stdClass());
-    }
-
     /**
      * Generate valid response object from document data
      * 
@@ -359,58 +337,6 @@ class Response extends SwooleResponse
         return $this->payload;
     }
 
-    /**
-     * Generate valid response object from document data
-     * 
-     * @param DatabaseDocument $document
-     * @param string $model
-     * 
-     * return array
-     */
-    public function output2(DatabaseDocument $document, string $model): array
-    {
-        $data       = $document;
-        $model      = $this->getModel($model);
-        $output     = [];
-
-        if ($model->isAny()) {
-            $this->payload = $document->getArrayCopy();
-            return $this->payload;
-        }
-
-        foreach ($model->getRules() as $key => $rule) {
-            if (!$document->isSet($key)) {
-                if (!is_null($rule['default'])) {
-                    $document->setAttribute($key, $rule['default']);
-                } else {
-                    throw new Exception('Model '.$model->getName().' is missing response key: '.$key);
-                }
-            }
-
-            if ($rule['array']) {
-                if (!is_array($data[$key])) {
-                    throw new Exception($key.' must be an array of type '.$rule['type']);
-                }
-
-                foreach ($data[$key] as &$item) {
-                    if ($item instanceof Document) {
-                        if (!array_key_exists($rule['type'], $this->models)) {
-                            throw new Exception('Missing model for rule: '. $rule['type']);
-                        }
-
-                        $item = $this->output($item, $rule['type']);
-                    }
-                }
-            }
-            
-            $output[$key] = $data[$key];
-        }
-
-        $this->payload = $output;
-
-        return $this->payload;
-    }
-
     /**
      * YAML
      *