diff --git a/.env b/.env
index 581af6d978..1c260bc3fc 100644
--- a/.env
+++ b/.env
@@ -1,5 +1,6 @@
 _APP_ENV=production
 _APP_ENV=development
+_APP_LOCALE=en
 _APP_SYSTEM_EMAIL_NAME=Appwrite
 _APP_SYSTEM_EMAIL_ADDRESS=team@appwrite.io
 _APP_SYSTEM_SECURITY_EMAIL_ADDRESS=security@appwrite.io
@@ -16,7 +17,7 @@ _APP_DB_PORT=3306
 _APP_DB_SCHEMA=appwrite
 _APP_DB_USER=user
 _APP_DB_PASS=password
-_APP_STORAGE_ANTIVIRUS=enabled
+_APP_STORAGE_ANTIVIRUS=disabled
 _APP_STORAGE_ANTIVIRUS_HOST=clamav
 _APP_STORAGE_ANTIVIRUS_PORT=3310
 _APP_INFLUXDB_HOST=influxdb
diff --git a/CHANGES.md b/CHANGES.md
index be68c21448..3ddc51a3bb 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -14,6 +14,10 @@
 - Option to limit number of users (good for app launches + god account PR)
 - Added 2 new endpoints to the projects API to allow new settings
 - Enabled 501 errors (Not Implemented) from the error handler
+- ClamAV is now disabled by default to allow lower min requirments for Appwrite (#1064)
+- Added a new env var named `_APP_LOCALE` that allow to change the default `en` locale value (#1056)
+- Updated all the console bottom control to be consistent. Dropped the `+` icon (#1062)
+
 ## Bugs
 
 - Fixed default value for HTTPS force option
diff --git a/Dockerfile b/Dockerfile
index 7cd404b7ae..74dc9685e4 100755
--- a/Dockerfile
+++ b/Dockerfile
@@ -68,6 +68,7 @@ ARG VERSION=dev
 
 ENV _APP_SERVER=swoole \
     _APP_ENV=production \
+    _APP_LOCALE=en \
     _APP_DOMAIN=localhost \
     _APP_DOMAIN_TARGET=localhost \
     _APP_HOME=https://appwrite.io \
diff --git a/app/config/environments.php b/app/config/environments.php
index 9f1c5638e1..473da1b769 100644
--- a/app/config/environments.php
+++ b/app/config/environments.php
@@ -70,6 +70,15 @@ $environments = [
         'logo' => 'python.png',
         'supports' => [System::X86, System::PPC, System::ARM],
     ],
+    'python-3.9' => [
+        'name' => 'Python',
+        'version' => '3.9',
+        'base' => 'python:3.9-alpine',
+        'image' => 'appwrite/env-python-3.9:1.0.0',
+        'build' => '/usr/src/code/docker/environments/python-3.9',
+        'logo' => 'python.png',
+        'supports' => [System::X86, System::PPC, System::ARM],
+    ],
     'deno-1.2' => [
         'name' => 'Deno',
         'version' => '1.2',
@@ -106,6 +115,15 @@ $environments = [
         'logo' => 'dart.png',
         'supports' => [System::X86],
     ],
+    'dart-2.12' => [
+        'name' => 'Dart',
+        'version' => '2.12',
+        'base' => 'google/dart:2.12',
+        'image' => 'appwrite/env-dart-2.12:1.0.0',
+        'build' => '/usr/src/code/docker/environments/dart-2.12',
+        'logo' => 'dart.png',
+        'supports' => [System::X86],
+    ],
     'dotnet-3.1' => [
         'name' => '.NET',
         'version' => '3.1',
diff --git a/app/config/events.php b/app/config/events.php
index cb0df42a06..bbccb62de9 100644
--- a/app/config/events.php
+++ b/app/config/events.php
@@ -84,17 +84,17 @@ return [
     ],
     'database.documents.create' => [
         'description' => 'This event triggers when a database document is created.',
-        'model' => Response::MODEL_ANY,
+        'model' => Response::MODEL_DOCUMENT,
         'note' => '',
     ],
     'database.documents.update' => [
         'description' => 'This event triggers when a database document is updated.',
-        'model' => Response::MODEL_ANY,
+        'model' => Response::MODEL_DOCUMENT,
         'note' => '',
     ],
     'database.documents.delete' => [
         'description' => 'This event triggers when a database document is deleted.',
-        'model' => Response::MODEL_ANY,
+        'model' => Response::MODEL_DOCUMENT,
         'note' => '',
     ],
     'functions.create' => [
diff --git a/app/config/variables.php b/app/config/variables.php
index 02738821a1..e262ebca40 100644
--- a/app/config/variables.php
+++ b/app/config/variables.php
@@ -15,6 +15,14 @@ return [
                 'required' => false,
                 'question' => '',
             ],
+            [
+                'name' => '_APP_LOCALE',
+                'description' => 'Set your Appwrite\'s locale. By default, the locale is set to \'en\'.',
+                'introduction' => '',
+                'default' => 'en',
+                'required' => false,
+                'question' => '',
+            ],
             [
                 'name' => '_APP_OPTIONS_ABUSE',
                 'description' => 'Allows you to disable abuse checks and API rate limiting. By default, set to \'enabled\'. To cancel the abuse checking, set to \'disabled\'. It is not recommended to disable this check-in a production environment.',
@@ -309,9 +317,9 @@ return [
             ],
             [
                 'name' => '_APP_STORAGE_ANTIVIRUS',
-                'description' => 'This variable allows you to disable the internal anti-virus scans. This value is set to \'enabled\' by default, to cancel the scans set the value to \'disabled\'. When disabled, it\'s recommended to turn off the ClamAV container for better resource usage.',
+                'description' => 'This variable allows you to disable the internal anti-virus scans. This value is set to \'disabled\' by default, to enable the scans set the value to \'enabled\'. Before enabling, you must add the ClamAV service and depend on it on main Appwrite service.',
                 'introduction' => '',
-                'default' => 'enabled',
+                'default' => 'disabled',
                 'required' => false,
                 'question' => '',
             ],
@@ -381,7 +389,7 @@ return [
                 'name' => '_APP_FUNCTIONS_ENVS',
                 'description' => 'This option allows you to limit the available environments for cloud functions. This option is very useful for low-cost servers to safe disk space.\n\nTo enable/activate this option, pass a list of allowed environments separated by a comma.\n\nCurrently, supported environments are: ' . \implode(', ', \array_keys(Config::getParam('providers'))),
                 'introduction' => '0.7.0',
-                'default' => 'node-14.5,deno-1.6,php-7.4,python-3.8,ruby-3.0,dotnet-5.0',
+                'default' => 'node-14.5,deno-1.6,php-7.4,python-3.9,ruby-3.0,dotnet-5.0',
                 'required' => false,
                 'question' => '',
             ],
diff --git a/app/controllers/api/account.php b/app/controllers/api/account.php
index 35f31a5e2b..09f36499b6 100644
--- a/app/controllers/api/account.php
+++ b/app/controllers/api/account.php
@@ -6,10 +6,10 @@ use Utopia\Exception;
 use Utopia\Config\Config;
 use Utopia\Validator\Assoc;
 use Utopia\Validator\Text;
-use Utopia\Validator\Email;
+use Appwrite\Network\Validator\Email;
 use Utopia\Validator\WhiteList;
-use Utopia\Validator\Host;
-use Utopia\Validator\URL;
+use Appwrite\Network\Validator\Host;
+use Appwrite\Network\Validator\URL;
 use Utopia\Audit\Audit;
 use Utopia\Audit\Adapters\MySQL as AuditAdapter;
 use Appwrite\Auth\Auth;
diff --git a/app/controllers/api/avatars.php b/app/controllers/api/avatars.php
index a094dc672a..b5c47c1987 100644
--- a/app/controllers/api/avatars.php
+++ b/app/controllers/api/avatars.php
@@ -14,7 +14,7 @@ use Utopia\Validator\Boolean;
 use Utopia\Validator\HexColor;
 use Utopia\Validator\Range;
 use Utopia\Validator\Text;
-use Utopia\Validator\URL;
+use Appwrite\Network\Validator\URL;
 use Utopia\Validator\WhiteList;
 
 $avatarCallback = function ($type, $code, $width, $height, $quality, $response) {
diff --git a/app/controllers/api/database.php b/app/controllers/api/database.php
index e86812e7e3..2b1b488b1e 100644
--- a/app/controllers/api/database.php
+++ b/app/controllers/api/database.php
@@ -294,7 +294,7 @@ App::post('/v1/database/collections/:collectionId/documents')
     ->label('sdk.description', '/docs/references/database/create-document.md')
     ->label('sdk.response.code', Response::STATUS_CODE_CREATED)
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
-    ->label('sdk.response.model', Response::MODEL_ANY)
+    ->label('sdk.response.model', Response::MODEL_DOCUMENT)
     ->param('collectionId', null, new UID(), 'Collection unique ID. You can create a new collection with validation rules using the Database service [server integration](/docs/server/database#createCollection).')
     ->param('data', [], new JSON(), 'Document data as JSON object.')
     ->param('read', null, new ArrayList(new Text(64)), 'An array of strings with read permissions. By default only the current user is granted with read permissions. [learn more about permissions](/docs/permissions) and get a full list of available permissions.', true)
@@ -401,7 +401,7 @@ App::post('/v1/database/collections/:collectionId/documents')
 
         $response
             ->setStatusCode(Response::STATUS_CODE_CREATED)
-            ->dynamic($data, Response::MODEL_ANY)
+            ->dynamic($data, Response::MODEL_DOCUMENT)
         ;
     });
 
@@ -478,7 +478,7 @@ App::get('/v1/database/collections/:collectionId/documents/:documentId')
     ->label('sdk.description', '/docs/references/database/get-document.md')
     ->label('sdk.response.code', Response::STATUS_CODE_OK)
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
-    ->label('sdk.response.model', Response::MODEL_ANY)
+    ->label('sdk.response.model', Response::MODEL_DOCUMENT)
     ->param('collectionId', null, new UID(), 'Collection unique ID. You can create a new collection with validation rules using the Database service [server integration](/docs/server/database#createCollection).')
     ->param('documentId', null, new UID(), 'Document unique ID.')
     ->inject('response')
@@ -494,7 +494,7 @@ App::get('/v1/database/collections/:collectionId/documents/:documentId')
             throw new Exception('No document found', 404);
         }
 
-        $response->dynamic($document, Response::MODEL_ANY);
+        $response->dynamic($document, Response::MODEL_DOCUMENT);
     });
 
 App::patch('/v1/database/collections/:collectionId/documents/:documentId')
@@ -508,7 +508,7 @@ App::patch('/v1/database/collections/:collectionId/documents/:documentId')
     ->label('sdk.description', '/docs/references/database/update-document.md')
     ->label('sdk.response.code', Response::STATUS_CODE_OK)
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
-    ->label('sdk.response.model', Response::MODEL_ANY)
+    ->label('sdk.response.model', Response::MODEL_DOCUMENT)
     ->param('collectionId', null, new UID(), 'Collection unique ID. You can create a new collection with validation rules using the Database service [server integration](/docs/server/database#createCollection).')
     ->param('documentId', null, new UID(), 'Document unique ID.')
     ->param('data', [], new JSON(), 'Document data as JSON object.')
@@ -566,7 +566,7 @@ App::patch('/v1/database/collections/:collectionId/documents/:documentId')
             ->setParam('data', $data->getArrayCopy())
         ;
 
-        $response->dynamic($data, Response::MODEL_ANY);
+        $response->dynamic($data, Response::MODEL_DOCUMENT);
     });
 
 App::delete('/v1/database/collections/:collectionId/documents/:documentId')
@@ -614,9 +614,9 @@ App::delete('/v1/database/collections/:collectionId/documents/:documentId')
         }
 
         $events
-            ->setParam('eventData', $response->output($document, Response::MODEL_ANY))
+            ->setParam('eventData', $response->output($document, Response::MODEL_DOCUMENT))
         ;
-        
+
         $audits
             ->setParam('event', 'database.documents.delete')
             ->setParam('resource', 'database/document/'.$document->getId())
diff --git a/app/controllers/api/projects.php b/app/controllers/api/projects.php
index 5c350d2b99..059ff779e1 100644
--- a/app/controllers/api/projects.php
+++ b/app/controllers/api/projects.php
@@ -6,7 +6,7 @@ use Utopia\Validator\ArrayList;
 use Utopia\Validator\Boolean;
 use Utopia\Validator\Text;
 use Utopia\Validator\WhiteList;
-use Utopia\Validator\URL;
+use Appwrite\Network\Validator\URL;
 use Utopia\Validator\Range;
 use Utopia\Validator\Integer;
 use Utopia\Config\Config;
diff --git a/app/controllers/api/teams.php b/app/controllers/api/teams.php
index fba31271c3..682e051ddd 100644
--- a/app/controllers/api/teams.php
+++ b/app/controllers/api/teams.php
@@ -3,9 +3,9 @@
 use Utopia\App;
 use Utopia\Exception;
 use Utopia\Config\Config;
-use Utopia\Validator\Email;
+use Appwrite\Network\Validator\Email;
 use Utopia\Validator\Text;
-use Utopia\Validator\Host;
+use Appwrite\Network\Validator\Host;
 use Utopia\Validator\Range;
 use Utopia\Validator\ArrayList;
 use Utopia\Validator\WhiteList;
diff --git a/app/controllers/api/users.php b/app/controllers/api/users.php
index 3f6a82d9c0..44b64bd948 100644
--- a/app/controllers/api/users.php
+++ b/app/controllers/api/users.php
@@ -4,7 +4,7 @@ use Utopia\App;
 use Utopia\Exception;
 use Utopia\Validator\Assoc;
 use Utopia\Validator\WhiteList;
-use Utopia\Validator\Email;
+use Appwrite\Network\Validator\Email;
 use Utopia\Validator\Text;
 use Utopia\Validator\Range;
 use Utopia\Audit\Audit;
diff --git a/app/init.php b/app/init.php
index 387d7f29b5..439e9fea24 100644
--- a/app/init.php
+++ b/app/init.php
@@ -314,7 +314,7 @@ App::setResource('layout', function($locale) {
 }, ['locale']);
 
 App::setResource('locale', function() {
-    return new Locale('en');
+    return new Locale(App::getEnv('_APP_LOCALE', 'en'));
 });
 
 // Queues
diff --git a/app/views/console/database/collection.phtml b/app/views/console/database/collection.phtml
index 45d3287cf5..14b8872f57 100644
--- a/app/views/console/database/collection.phtml
+++ b/app/views/console/database/collection.phtml
@@ -36,9 +36,6 @@ $maxCells = 10;
     <div class="zone xl">
         <ul class="phases clear" data-ui-phases data-selected="{{router.params.tab}}">
             <li data-state="/console/database/collection?id={{router.params.id}}&project={{router.params.project}}">
-                <a data-ls-if="{{project-collection.rules.length}} > 0" data-ls-attrs="href=/console/database/document?collection={{router.params.id}}&project={{router.params.project}}&buster={{project-collection.dateUpdated}}" class="button fly round text-align-center">
-                    <i class="icon-plus"></i>
-                </a>
 
                 <h2>Documents</h2>
 
@@ -135,7 +132,7 @@ $maxCells = 10;
                         </div>
                     </div>
 
-                    <div class="clear text-align-center paging">
+                    <div class="pull-end text-align-center paging">
                         <form
                             data-service="database.listDocuments"
                             data-event="submit"
@@ -166,6 +163,10 @@ $maxCells = 10;
                             <button name="offset" data-paging-next data-offset="{{router.params.offset}}" data-sum="{{project-documents.sum}}" class="margin-start round small" aria-label="Next"><i class="icon-right-open"></i></button>
                         </form>
                     </div>
+
+                    <a data-ls-if="{{project-collection.rules.length}} > 0" data-ls-attrs="href=/console/database/document?collection={{router.params.id}}&project={{router.params.project}}&buster={{project-collection.dateUpdated}}" class="button">
+                        Add Document
+                    </a>
                 </div>
             </li>
             <li data-state="/console/database/collection/settings?id={{router.params.id}}&project={{router.params.project}}">
@@ -520,7 +521,7 @@ $maxCells = 10;
 
     <div data-ls-loop="project-collections.collections" data-ls-as="project" data-ls-key="$index2" class="tiles cell-3 margin-bottom-negative">
         <div class="margin-bottom" data-ls-if="{{project.$id}} != {{router.params.id}}">
-            <input type="radio" name="list" data-ls-attrs="value={{project.$id}},id={{project.$id}}" data-ls-bind="{{rule.list|firstElement}}" data-cast-to="array" required />
+            <input type="radio" data-ls-attrs="value={{project.$id}},id=[{{rule.$id}}].{{project.$id}},name=[{{rule.$id}}].list" data-ls-bind="{{rule.list|firstElement}}" data-cast-to="array" required />
             <label data-ls-attrs="for={{project.$id}}"data-ls-bind="{{project.name}}"></label>
         </div>
     </div>
diff --git a/app/views/console/database/index.phtml b/app/views/console/database/index.phtml
index 8ec46a13ad..2760a1ac10 100644
--- a/app/views/console/database/index.phtml
+++ b/app/views/console/database/index.phtml
@@ -12,40 +12,6 @@
         <li data-state="/console/database?project={{router.params.project}}">
             <h2>Collections</h2>
 
-            <div data-ui-modal class="box modal close" data-button-text="" data-button-class="fly round" data-button-icon="icon-plus">
-                <button type="button" class="close pull-end" data-ui-modal-close=""><i class="icon-cancel"></i></button>
-
-                <h1>New Collection</h1>
-
-                <form
-                    data-analytics
-                    data-analytics-activity
-                    data-analytics-event="submit"
-                    data-analytics-category="console"
-                    data-analytics-label="Create Database Collection"
-                    data-service="database.createCollection"
-                    data-event="submit"
-                    data-scope="sdk"
-                    data-success="alert,reset,redirect,trigger"
-                    data-success-param-alert-text="Collection created successfully"
-                    data-success-param-redirect-url="/console/database/collection/settings?id={{serviceData.$id}}&project={{router.params.project}}"
-                    data-success-param-trigger-events="database.createCollection"
-                    data-failure="alert"
-                    data-failure-param-alert-text="Failed to create collection"
-                    data-failure-param-alert-classname="error">
-
-                    <label for="user-name">Name</label>
-                    <input type="text" class="full-width" id="collection-name" name="name" required autocomplete="off" maxlength="128" />
-
-                    <input type="hidden" id="collection-read" name="read" required data-cast-to="json" value="<?php echo htmlentities(json_encode([])); ?>" />
-                    <input type="hidden" id="collection-write" name="write" required data-cast-to="json" value="<?php echo htmlentities(json_encode([])); ?>" />
-
-                    <hr />
-
-                    <button type="submit">Create</button> &nbsp; <button data-ui-modal-close="" type="button" class="reverse">Cancel</button>
-                </form>
-            </div>
-
             <div class="margin-top"
                 data-service="database.listCollections"
                 data-event="load,database.createCollection,database.updateCollection,database.deleteCollection"
@@ -76,7 +42,7 @@
                     </ul>
                 </div>
 
-                <div class="clear text-align-center paging">
+                <div class="pull-end text-align-center paging">
                     <form
                         data-service="database.listCollections"
                         data-event="submit"
@@ -105,6 +71,41 @@
                         <button name="offset" data-paging-next data-offset="{{router.params.offset}}" data-sum="{{project-collections.sum}}" class="margin-start round small" aria-label="Next"><i class="icon-right-open"></i></button>
                     </form>
                 </div>
+
+                <div data-ui-modal class="modal close box sticky-footer" data-button-text="Add Collection">
+                    <button type="button" class="close pull-end" data-ui-modal-close=""><i class="icon-cancel"></i></button>
+
+                    <h1>New Collection</h1>
+
+                    <form
+                        data-analytics
+                        data-analytics-activity
+                        data-analytics-event="submit"
+                        data-analytics-category="console"
+                        data-analytics-label="Create Database Collection"
+                        data-service="database.createCollection"
+                        data-event="submit"
+                        data-scope="sdk"
+                        data-success="alert,reset,redirect,trigger"
+                        data-success-param-alert-text="Collection created successfully"
+                        data-success-param-redirect-url="/console/database/collection/settings?id={{serviceData.$id}}&project={{router.params.project}}"
+                        data-success-param-trigger-events="database.createCollection"
+                        data-failure="alert"
+                        data-failure-param-alert-text="Failed to create collection"
+                        data-failure-param-alert-classname="error">
+
+                        <label for="user-name">Name</label>
+                        <input type="text" class="full-width" id="collection-name" name="name" required autocomplete="off" maxlength="128" />
+
+                        <input type="hidden" id="collection-read" name="read" required data-cast-to="json" value="<?php echo htmlentities(json_encode([])); ?>" />
+                        <input type="hidden" id="collection-write" name="write" required data-cast-to="json" value="<?php echo htmlentities(json_encode([])); ?>" />
+
+                        <hr />
+
+                        <button type="submit">Create</button> &nbsp; <button data-ui-modal-close="" type="button" class="reverse">Cancel</button>
+                    </form>
+                </div>
+
             </li>
             <!-- <li data-state="/console/database/usage?project={{router.params.project}}">
                 <h2>Usage</h2>
diff --git a/app/views/console/storage/index.phtml b/app/views/console/storage/index.phtml
index 6b03814ae2..05ed9453ea 100644
--- a/app/views/console/storage/index.phtml
+++ b/app/views/console/storage/index.phtml
@@ -17,48 +17,6 @@ $fileLimitHuman = $this->getParam('fileLimitHuman', 0);
         <li data-state="/console/database?project={{router.params.project}}">
             <h2 class="margin-bottom">Files</h2>
 
-            <div data-ui-modal class="box modal sticky-footer close" data-button-text="" data-button-class="fly round" data-button-icon="icon-plus">
-                <button type="button" class="close pull-end" data-ui-modal-close=""><i class="icon-cancel"></i></button>
-
-                <h1>Upload File</h1>
-
-                <form
-                    data-analytics
-                    data-analytics-activity
-                    data-analytics-event="submit"
-                    data-analytics-category="console"
-                    data-analytics-label="Create Storage File"
-                    data-service="storage.createFile"
-                    data-event="submit"
-                    data-scope="sdk"
-                    data-loading="Uploading File..."
-                    data-success="alert,trigger,reset"
-                    data-success-param-alert-text="File uploaded successfully"
-                    data-success-param-trigger-events="storage.createFile"
-                    data-failure="alert"
-                    data-failure-param-alert-text="Failed to upload file"
-                    data-failure-param-alert-classname="error">
-                    <input type="hidden" name="folderId" id="files-folderId" data-cast-to="integer" value="1">
-
-                    <label for="file-read">File</label>
-                    <input type="file" name="file" id="file-file" size="1" required>
-
-                    <div class="text-fade text-size-xs margin-top-negative-small margin-bottom">(Max file size allowed: <?php echo $fileLimitHuman; ?>)</div>
-
-                    <label for="file-read">Read Access (<a data-ls-attrs="href={{env.HOME}}/docs/permissions" target="_blank" rel="noopener">Learn more</a>)</label>
-                    <input type="hidden" id="file-read" name="read" data-forms-tags data-cast-to="json" value="<?php echo htmlentities(json_encode(['*'])); ?>" placeholder="User ID, Team ID or Role" />
-                    <div class="text-fade text-size-xs margin-top-negative-small margin-bottom">Add * for wildcard access</div>
-                    
-                    <label for="file-write">Write Access (<a data-ls-attrs="href={{env.HOME}}/docs/permissions" target="_blank" rel="noopener">Learn more</a>)</label>
-                    <input type="hidden" id="file-write" name="write" data-forms-tags data-cast-to="json" value="" placeholder="User ID, Team ID or Role" />
-                    <div class="text-fade text-size-xs margin-top-negative-small margin-bottom">Add * for wildcard access</div>
-
-                    <footer>
-                        <button type="submit">Create</button> &nbsp; <button data-ui-modal-close="" type="button" class="reverse">Cancel</button>
-                    </footer>
-                </form>
-            </div>
-
             <form class="box padding-small margin-bottom search"
                 data-service="storage.listFiles"
                 data-event="submit"
@@ -215,7 +173,7 @@ $fileLimitHuman = $this->getParam('fileLimitHuman', 0);
                     </div>
                 </div>
 
-                <div class="clear text-align-center paging">
+                <div class="pull-end text-align-center paging">
                     <form
                         data-service="storage.listFiles"
                         data-event="submit"
@@ -244,6 +202,48 @@ $fileLimitHuman = $this->getParam('fileLimitHuman', 0);
                         <button name="offset" data-paging-next data-offset="{{router.params.offset}}" data-sum="{{project-files.sum}}" class="margin-start round small" aria-label="Next"><i class="icon-right-open"></i></button>
                     </form>
                 </div>
+
+                <div data-ui-modal class="box modal sticky-footer close" data-button-text="Add File">
+                    <button type="button" class="close pull-end" data-ui-modal-close=""><i class="icon-cancel"></i></button>
+
+                    <h1>Upload File</h1>
+
+                    <form
+                        data-analytics
+                        data-analytics-activity
+                        data-analytics-event="submit"
+                        data-analytics-category="console"
+                        data-analytics-label="Create Storage File"
+                        data-service="storage.createFile"
+                        data-event="submit"
+                        data-scope="sdk"
+                        data-loading="Uploading File..."
+                        data-success="alert,trigger,reset"
+                        data-success-param-alert-text="File uploaded successfully"
+                        data-success-param-trigger-events="storage.createFile"
+                        data-failure="alert"
+                        data-failure-param-alert-text="Failed to upload file"
+                        data-failure-param-alert-classname="error">
+                        <input type="hidden" name="folderId" id="files-folderId" data-cast-to="integer" value="1">
+
+                        <label for="file-read">File</label>
+                        <input type="file" name="file" id="file-file" size="1" required>
+
+                        <div class="text-fade text-size-xs margin-top-negative-small margin-bottom">(Max file size allowed: <?php echo $fileLimitHuman; ?>)</div>
+
+                        <label for="file-read">Read Access (<a data-ls-attrs="href={{env.HOME}}/docs/permissions" target="_blank" rel="noopener">Learn more</a>)</label>
+                        <input type="hidden" id="file-read" name="read" data-forms-tags data-cast-to="json" value="<?php echo htmlentities(json_encode(['*'])); ?>" placeholder="User ID, Team ID or Role" />
+                        <div class="text-fade text-size-xs margin-top-negative-small margin-bottom">Add * for wildcard access</div>
+                        
+                        <label for="file-write">Write Access (<a data-ls-attrs="href={{env.HOME}}/docs/permissions" target="_blank" rel="noopener">Learn more</a>)</label>
+                        <input type="hidden" id="file-write" name="write" data-forms-tags data-cast-to="json" value="" placeholder="User ID, Team ID or Role" />
+                        <div class="text-fade text-size-xs margin-top-negative-small margin-bottom">Add * for wildcard access</div>
+
+                        <footer>
+                            <button type="submit">Create</button> &nbsp; <button data-ui-modal-close="" type="button" class="reverse">Cancel</button>
+                        </footer>
+                    </form>
+                </div>
             </div>
         </li>
     </ul>
diff --git a/app/views/console/users/index.phtml b/app/views/console/users/index.phtml
index e8b74d3fb9..b750a3f94d 100644
--- a/app/views/console/users/index.phtml
+++ b/app/views/console/users/index.phtml
@@ -18,41 +18,6 @@ $auth = $this->getParam('auth', []);
 
             <h2>Users</h2>
 
-            <div data-ui-modal class="box modal close" data-button-text="" data-button-class="fly round" data-button-icon="icon-plus">
-                <button type="button" class="close pull-end" data-ui-modal-close=""><i class="icon-cancel"></i></button>
-
-                <h1>Create User</h1>
-
-                <form
-                    data-analytics
-                    data-analytics-activity
-                    data-analytics-event="submit"
-                    data-analytics-category="console"
-                    data-analytics-label="Create User"
-                    data-service="users.create"
-                    data-event="submit"
-                    data-success="alert,trigger,reset"
-                    data-success-param-alert-text="Created user successfully"
-                    data-success-param-trigger-events="users.create"
-                    data-failure="alert"
-                    data-failure-param-alert-text="Failed to create user"
-                    data-failure-param-alert-classname="error">
-
-                    <label for="user-name">Name</label>
-                    <input type="text" class="full-width" id="user-name" name="name" required autocomplete="off" maxlength="128" />
-
-                    <label for="user-email">Email</label>
-                    <input type="email" class="full-width" id="user-email" name="email" required autocomplete="off" />
-
-                    <label for="user-password">Password</label>
-                    <input type="password" class="full-width" id="user-password" name="password" required pattern=".{6,}" title="Six or more characters" autocomplete="off" />
-
-                    <hr />
-
-                    <button type="submit">Create</button> &nbsp; <button data-ui-modal-close="" type="button" class="reverse">Cancel</button>
-                </form>
-            </div>
-
             <form class="box padding-small margin-bottom search"
                 data-service="users.list"
                 data-event="submit"
@@ -138,7 +103,7 @@ $auth = $this->getParam('auth', []);
                     </div>
                 </div>
 
-                <div class="clear text-align-center paging">
+                <div class="pull-end text-align-center paging">
                     <form
                         data-service="users.list"
                         data-event="submit"
@@ -167,41 +132,47 @@ $auth = $this->getParam('auth', []);
                         <button name="offset" data-paging-next data-offset="{{router.params.offset}}" data-sum="{{project-users.sum}}" class="margin-start round small" aria-label="Next"><i class="icon-right-open"></i></button>
                     </form>
                 </div>
+
+                <div data-ui-modal class="box modal close" data-button-text="Add User">
+                    <button type="button" class="close pull-end" data-ui-modal-close=""><i class="icon-cancel"></i></button>
+
+                    <h1>Create User</h1>
+
+                    <form
+                        data-analytics
+                        data-analytics-activity
+                        data-analytics-event="submit"
+                        data-analytics-category="console"
+                        data-analytics-label="Create User"
+                        data-service="users.create"
+                        data-event="submit"
+                        data-success="alert,trigger,reset"
+                        data-success-param-alert-text="Created user successfully"
+                        data-success-param-trigger-events="users.create"
+                        data-failure="alert"
+                        data-failure-param-alert-text="Failed to create user"
+                        data-failure-param-alert-classname="error">
+
+                        <label for="user-name">Name</label>
+                        <input type="text" class="full-width" id="user-name" name="name" required autocomplete="off" maxlength="128" />
+
+                        <label for="user-email">Email</label>
+                        <input type="email" class="full-width" id="user-email" name="email" required autocomplete="off" />
+
+                        <label for="user-password">Password</label>
+                        <input type="password" class="full-width" id="user-password" name="password" required pattern=".{6,}" title="Six or more characters" autocomplete="off" />
+
+                        <hr />
+
+                        <button type="submit">Create</button> &nbsp; <button data-ui-modal-close="" type="button" class="reverse">Cancel</button>
+                    </form>
+                </div>
             </div>
         </li>
 
         <li data-state="/console/users/teams?project={{router.params.project}}">
             <h2>Teams</h2>
 
-            <div data-ui-modal class="box modal close" data-button-text="" data-button-class="fly round" data-button-icon="icon-plus">
-                <button type="button" class="close pull-end" data-ui-modal-close=""><i class="icon-cancel"></i></button>
-
-                <h1>Create Team</h1>
-
-                <form
-                    data-analytics
-                    data-analytics-activity
-                    data-analytics-event="submit"
-                    data-analytics-category="console"
-                    data-analytics-label="Create Team"
-                    data-service="teams.create"
-                    data-event="submit"
-                    data-success="alert,trigger,reset"
-                    data-success-param-alert-text="Created team successfully"
-                    data-success-param-trigger-events="filter-teams-changed,teams.create"
-                    data-failure="alert"
-                    data-failure-param-alert-text="Failed to create team"
-                    data-failure-param-alert-classname="error">
-
-                    <label for="team-name">Name</label>
-                    <input type="text" class="full-width" id="team-name" name="name" required autocomplete="off" maxlength="128" />
-                    
-                    <hr />
-
-                    <button type="submit">Create</button> &nbsp; <button data-ui-modal-close="" type="button" class="reverse">Cancel</button>
-                </form>
-            </div>
-
             <form class="box padding-small margin-bottom search"
                 data-service="teams.list"
                 data-event="submit"
@@ -240,7 +211,7 @@ $auth = $this->getParam('auth', []);
                 </div>
 
                 <div data-ls-if="0 != {{project-teams.sum}}">
-                <div class="margin-bottom-small margin-end-small text-align-end text-size-small"><span data-ls-bind="{{project-teams.sum}}"></span> results found</div>
+                    <div class="margin-bottom-small margin-end-small text-align-end text-size-small"><span data-ls-bind="{{project-teams.sum}}"></span> results found</div>
 
                     <div class="box margin-bottom">
                         <table class="vertical">
@@ -268,7 +239,7 @@ $auth = $this->getParam('auth', []);
                     </div>
                 </div>
 
-                <div class="clear text-align-center paging">
+                <div class="pull-end text-align-center paging">
                     <form
                         data-service="teams.list"
                         data-event="submit"
@@ -297,6 +268,35 @@ $auth = $this->getParam('auth', []);
                         <button name="offset" data-paging-next data-offset="{{router.params.offset}}" data-sum="{{project-teams.sum}}" class="margin-start round small" aria-label="Next"><i class="icon-right-open"></i></button>
                     </form>
                 </div>
+
+                <div data-ui-modal class="box modal close" data-button-text="Add Team">
+                    <button type="button" class="close pull-end" data-ui-modal-close=""><i class="icon-cancel"></i></button>
+
+                    <h1>Create Team</h1>
+
+                    <form
+                        data-analytics
+                        data-analytics-activity
+                        data-analytics-event="submit"
+                        data-analytics-category="console"
+                        data-analytics-label="Create Team"
+                        data-service="teams.create"
+                        data-event="submit"
+                        data-success="alert,trigger,reset"
+                        data-success-param-alert-text="Created team successfully"
+                        data-success-param-trigger-events="filter-teams-changed,teams.create"
+                        data-failure="alert"
+                        data-failure-param-alert-text="Failed to create team"
+                        data-failure-param-alert-classname="error">
+
+                        <label for="team-name">Name</label>
+                        <input type="text" class="full-width" id="team-name" name="name" required autocomplete="off" maxlength="128" />
+                        
+                        <hr />
+
+                        <button type="submit">Create</button> &nbsp; <button data-ui-modal-close="" type="button" class="reverse">Cancel</button>
+                    </form>
+                </div>
             </div>
         </li>
         
diff --git a/app/views/install/compose.phtml b/app/views/install/compose.phtml
index 1c0c98108f..cbe2bb531f 100644
--- a/app/views/install/compose.phtml
+++ b/app/views/install/compose.phtml
@@ -52,10 +52,11 @@ services:
     depends_on:
       - mariadb
       - redis
-      - clamav
+#      - clamav
       - influxdb
     environment:
       - _APP_ENV
+      - _APP_LOCALE
       - _APP_CONSOLE_WHITELIST_EMAILS
       - _APP_CONSOLE_WHITELIST_IPS
       - _APP_SYSTEM_EMAIL_NAME
@@ -351,14 +352,14 @@ services:
     volumes:
       - appwrite-redis:/data:rw
 
-  clamav:
-    image: appwrite/clamav:1.2.0
-    container_name: appwrite-clamav
-    restart: unless-stopped
-    networks:
-      - appwrite
-    volumes:
-      - appwrite-uploads:/storage/uploads
+#  clamav:
+#    image: appwrite/clamav:1.2.0
+#    container_name: appwrite-clamav
+#    restart: unless-stopped
+#    networks:
+#      - appwrite
+#    volumes:
+#      - appwrite-uploads:/storage/uploads
 
   influxdb:
     image: influxdb:1.8-alpine
diff --git a/docker-compose.yml b/docker-compose.yml
index c4ad29c643..9942707854 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -71,10 +71,11 @@ services:
     depends_on:
       - mariadb
       - redis
-      - clamav
+      # - clamav
       - influxdb
     environment:
       - _APP_ENV
+      - _APP_LOCALE
       - _APP_SYSTEM_EMAIL_NAME
       - _APP_SYSTEM_EMAIL_ADDRESS
       - _APP_SYSTEM_SECURITY_EMAIL_ADDRESS
@@ -413,13 +414,13 @@ services:
     volumes:
       - appwrite-redis:/data:rw
 
-  clamav:
-    image: appwrite/clamav:1.2.0
-    container_name: appwrite-clamav
-    networks:
-      - appwrite
-    volumes:
-      - appwrite-uploads:/storage/uploads
+  # clamav:
+  #   image: appwrite/clamav:1.2.0
+  #   container_name: appwrite-clamav
+  #   networks:
+  #     - appwrite
+  #   volumes:
+  #     - appwrite-uploads:/storage/uploads
       
   influxdb:
     image: influxdb:1.8-alpine
diff --git a/docker/environments/build.sh b/docker/environments/build.sh
index 1543c5814d..6dffb17611 100644
--- a/docker/environments/build.sh
+++ b/docker/environments/build.sh
@@ -24,6 +24,9 @@ docker buildx build --platform linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
 echo 'Python 3.8...'
 docker buildx build --platform linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/386,linux/ppc64le -t appwrite/env-python-3.8:1.0.0 ./docker/environments/python-3.8/ --push
 
+echo 'Python 3.9...'
+docker buildx build --platform linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/386,linux/ppc64le -t appwrite/env-python-3.9:1.0.0 ./docker/environments/python-3.9/ --push
+
 echo 'Ruby 2.7...'
 docker buildx build --platform linux/amd64,linux/arm64,linux/386,linux/ppc64le -t appwrite/env-ruby-2.7:1.0.2 ./docker/environments/ruby-2.7/ --push
 
@@ -33,6 +36,9 @@ docker buildx build --platform linux/amd64,linux/arm64,linux/386,linux/ppc64le -
 echo 'Dart 2.10...'
 docker buildx build --platform linux/amd64 -t appwrite/env-dart-2.10:1.0.0 ./docker/environments/dart-2.10/ --push
 
+echo 'Dart 2.12...'
+docker buildx build --platform linux/amd64 -t appwrite/env-dart-2.12:1.0.0 ./docker/environments/dart-2.12/ --push
+
 echo '.NET 3.1...'
 docker buildx build --platform linux/amd64,linux/arm64 -t appwrite/env-dotnet-3.1:1.0.0 ./docker/environments/dotnet-3.1/ --push
 
diff --git a/docker/environments/dart-2.12/Dockerfile b/docker/environments/dart-2.12/Dockerfile
new file mode 100644
index 0000000000..06740803a8
--- /dev/null
+++ b/docker/environments/dart-2.12/Dockerfile
@@ -0,0 +1,9 @@
+FROM google/dart:2.12
+
+LABEL maintainer="team@appwrite.io"
+
+RUN apt-get update -y && apt-get install -y tar
+
+WORKDIR /usr/local/src/
+
+ENV PUB_CACHE=/usr/local/src/.appwrite
\ No newline at end of file
diff --git a/docker/environments/python-3.9/Dockerfile b/docker/environments/python-3.9/Dockerfile
new file mode 100644
index 0000000000..94b7b8ceb8
--- /dev/null
+++ b/docker/environments/python-3.9/Dockerfile
@@ -0,0 +1,11 @@
+FROM python:3.9-alpine
+
+LABEL maintainer="team@appwrite.io"
+
+RUN apk add tar
+
+RUN mkdir /usr/local/src
+
+WORKDIR /usr/local/src/
+
+ENV PYTHONPATH "${PYTHONPATH}:/usr/local/src/.appwrite"
\ No newline at end of file
diff --git a/docs/sdks/dart/GETTING_STARTED.md b/docs/sdks/dart/GETTING_STARTED.md
index 56297a2e5e..5318c8ce1b 100644
--- a/docs/sdks/dart/GETTING_STARTED.md
+++ b/docs/sdks/dart/GETTING_STARTED.md
@@ -11,6 +11,7 @@ void main() async {
     .setEndpoint('http://[HOSTNAME_OR_IP]/v1') // Make sure your endpoint is accessible
     .setProject('5ff3379a01d25') // Your project ID
     .setKey('cd868c7af8bdc893b4...93b7535db89')
+    .setSelfSigned() // Use only on dev mode with a self-signed SSL cert
 
   Users users = Users(client);
 
diff --git a/docs/sdks/deno/GETTING_STARTED.md b/docs/sdks/deno/GETTING_STARTED.md
index bfe40468b3..b8f851a4b9 100644
--- a/docs/sdks/deno/GETTING_STARTED.md
+++ b/docs/sdks/deno/GETTING_STARTED.md
@@ -10,6 +10,7 @@ client
     .setEndpoint('https://[HOSTNAME_OR_IP]/v1') // Your API Endpoint
     .setProject('5df5acd0d48c2') // Your project ID
     .setKey('919c2d18fb5d4...a2ae413da83346ad2') // Your secret API key
+    .setSelfSigned() // Use only on dev mode with a self-signed SSL cert
 ;
 
 ```
@@ -41,6 +42,7 @@ client
     .setEndpoint('https://[HOSTNAME_OR_IP]/v1') // Your API Endpoint
     .setProject('5df5acd0d48c2') // Your project ID
     .setKey('919c2d18fb5d4...a2ae413da83346ad2') // Your secret API key
+    .setSelfSigned() // Use only on dev mode with a self-signed SSL cert
 ;
 
 let promise = users.create('email@example.com', 'password');
diff --git a/docs/sdks/dotnet/GETTING_STARTED.md b/docs/sdks/dotnet/GETTING_STARTED.md
index 66dca9ff3f..4363c68204 100644
--- a/docs/sdks/dotnet/GETTING_STARTED.md
+++ b/docs/sdks/dotnet/GETTING_STARTED.md
@@ -14,6 +14,7 @@ static async Task Main(string[] args)
     .setEndpoint('http://[HOSTNAME_OR_IP]/v1') // Make sure your endpoint is accessible
     .setProject('5ff3379a01d25') // Your project ID
     .setKey('cd868c7af8bdc893b4...93b7535db89')
+    .setSelfSigned() // Use only on dev mode with a self-signed SSL cert
   ;
 
   var users = Users(client);
diff --git a/docs/sdks/flutter/GETTING_STARTED.md b/docs/sdks/flutter/GETTING_STARTED.md
index 78845f3e18..9af9720d89 100644
--- a/docs/sdks/flutter/GETTING_STARTED.md
+++ b/docs/sdks/flutter/GETTING_STARTED.md
@@ -58,7 +58,7 @@ Client client = Client();
 client
   .setEndpoint('https://localhost/v1') // Your Appwrite Endpoint
   .setProject('5e8cf4f46b5e8') // Your project ID
-  .setSelfSigned() // Remove in production
+  .setSelfSigned() // Use only on dev mode with a self-signed SSL cert
 ;
 ```
 
@@ -91,7 +91,7 @@ Client client = Client();
 client
   .setEndpoint('https://localhost/v1') // Your Appwrite Endpoint
   .setProject('5e8cf4f46b5e8') // Your project ID
-  .setSelfSigned() // Remove in production
+  .setSelfSigned() // Use only on dev mode with a self-signed SSL cert
   ;
 
 
diff --git a/docs/sdks/nodejs/GETTING_STARTED.md b/docs/sdks/nodejs/GETTING_STARTED.md
index 1053f28142..b2ce5f091c 100644
--- a/docs/sdks/nodejs/GETTING_STARTED.md
+++ b/docs/sdks/nodejs/GETTING_STARTED.md
@@ -12,6 +12,7 @@ client
     .setEndpoint('https://[HOSTNAME_OR_IP]/v1') // Your API Endpoint
     .setProject('5df5acd0d48c2') // Your project ID
     .setKey('919c2d18fb5d4...a2ae413da83346ad2') // Your secret API key
+    .setSelfSigned() // Use only on dev mode with a self-signed SSL cert
 ;
 ```
 
@@ -40,6 +41,7 @@ client
     .setEndpoint('https://[HOSTNAME_OR_IP]/v1') // Your API Endpoint
     .setProject('5df5acd0d48c2') // Your project ID
     .setKey('919c2d18fb5d4...a2ae413da83346ad2') // Your secret API key
+    .setSelfSigned() // Use only on dev mode with a self-signed SSL cert
 ;
 
 let users = new sdk.Users(client);
diff --git a/docs/sdks/php/GETTING_STARTED.md b/docs/sdks/php/GETTING_STARTED.md
index b92bb90e93..a7ceb61372 100644
--- a/docs/sdks/php/GETTING_STARTED.md
+++ b/docs/sdks/php/GETTING_STARTED.md
@@ -10,6 +10,7 @@ $client
     ->setEndpoint('https://[HOSTNAME_OR_IP]/v1') // Your API Endpoint
     ->setProject('5df5acd0d48c2') // Your project ID
     ->setKey('919c2d18fb5d4...a2ae413da83346ad2') // Your secret API key
+    ->setSelfSigned() // Use only on dev mode with a self-signed SSL cert
 ;
 ```
 
@@ -33,6 +34,7 @@ $client
     ->setEndpoint('https://[HOSTNAME_OR_IP]/v1') // Your API Endpoint
     ->setProject('5df5acd0d48c2') // Your project ID
     ->setKey('919c2d18fb5d4...a2ae413da83346ad2') // Your secret API key
+    ->setSelfSigned() // Use only on dev mode with a self-signed SSL cert
 ;
 
 $users = new Users($client);
diff --git a/docs/sdks/python/GETTING_STARTED.md b/docs/sdks/python/GETTING_STARTED.md
index b513f01da8..81c7954509 100644
--- a/docs/sdks/python/GETTING_STARTED.md
+++ b/docs/sdks/python/GETTING_STARTED.md
@@ -13,6 +13,7 @@ client = Client()
   .set_endpoint('https://[HOSTNAME_OR_IP]/v1') # Your API Endpoint
   .set_project('5df5acd0d48c2') # Your project ID
   .set_key('919c2d18fb5d4...a2ae413da83346ad2') # Your secret API key
+  .set_self_signed() # Use only on dev mode with a self-signed SSL cert
 )
 ```
 
@@ -36,6 +37,7 @@ client = Client()
   .set_endpoint('https://[HOSTNAME_OR_IP]/v1') # Your API Endpoint
   .set_project('5df5acd0d48c2') # Your project ID
   .set_key('919c2d18fb5d4...a2ae413da83346ad2') # Your secret API key
+  .set_self_signed() # Use only on dev mode with a self-signed SSL cert
 )
 
 users = Users(client)
diff --git a/docs/sdks/ruby/GETTING_STARTED.md b/docs/sdks/ruby/GETTING_STARTED.md
index 23de47c1a3..acabf1c0a9 100644
--- a/docs/sdks/ruby/GETTING_STARTED.md
+++ b/docs/sdks/ruby/GETTING_STARTED.md
@@ -12,6 +12,7 @@ client
     .set_endpoint(ENV["APPWRITE_ENDPOINT"]) # Your API Endpoint
     .set_project(ENV["APPWRITE_PROJECT"]) # Your project ID
     .set_key(ENV["APPWRITE_SECRET"]) # Your secret API key
+    .setSelfSigned() # Use only on dev mode with a self-signed SSL cert
 ;
 ```
 
@@ -34,6 +35,7 @@ client
     .set_endpoint(ENV["APPWRITE_ENDPOINT"]) # Your API Endpoint
     .set_project(ENV["APPWRITE_PROJECT"]) # Your project ID
     .set_key(ENV["APPWRITE_SECRET"]) # Your secret API key
+    .setSelfSigned() # Use only on dev mode with a self-signed SSL cert
 ;
 
 users = Appwrite::Users.new(client);
diff --git a/docs/sdks/web/GETTING_STARTED.md b/docs/sdks/web/GETTING_STARTED.md
index c8eee4999b..f8908ae9d3 100644
--- a/docs/sdks/web/GETTING_STARTED.md
+++ b/docs/sdks/web/GETTING_STARTED.md
@@ -15,6 +15,7 @@ const appwrite = new Appwrite();
 appwrite
     .setEndpoint('http://localhost/v1') // Your Appwrite Endpoint
     .setProject('455x34dfkj') // Your project ID
+    .setSelfSigned() // Use only on dev mode with a self-signed SSL cert
 ;
 ```
 
@@ -41,6 +42,7 @@ const appwrite = new Appwrite();
 appwrite
     .setEndpoint('http://localhost/v1') // Your Appwrite Endpoint
     .setProject('455x34dfkj')
+    .setSelfSigned() // Use only on dev mode with a self-signed SSL cert
 ;
 
 // Register User
diff --git a/docs/tutorials/running-in-production.md b/docs/tutorials/running-in-production.md
deleted file mode 100644
index 2ed69d0ef4..0000000000
--- a/docs/tutorials/running-in-production.md
+++ /dev/null
@@ -1,45 +0,0 @@
-# Running in Production
-
-This tutorial will cover some basic concepts and best practices for running a production Appwrite server. This tutorial assumes you have some basic knowledge of Docker and Docker Compose command-line tools.
-
-## Error Reporting
-
-By default, Appwrite installation comes with error debugging turned on, We do this to help new users solve issues and report problems while still in development mode.
-
-In production, it is highly recommended to turn error reporting off. To do so, you have to change the Appwrite container environment variable **_APP_ENV** value from **development** to **production**.
-
-## Enable Encryption
-
-By default, the Appwrite setup doesn’t come with a uniquely generated encryption key. This key is used to store your files and sensitive data like webhook passwords or API keys in a safe way. To take advantage of this feature, you must generate a unique key and set it as the value of the **_APP_OPENSSL_KEY_V1** environment variable.
-
-Make sure to keep this key in a safe place and never make it publicly accessible. There are many [online resources]([https://www.freecodecamp.org/news/how-to-securely-store-api-keys-4ff3ea19ebda/](https://www.freecodecamp.org/news/how-to-securely-store-api-keys-4ff3ea19ebda/)) with methods of keeping your secret keys safe in your servers.
-
-## Limit Access to your Console
-
-By default, anyone can signup for your Appwrite server, create projects, and use your computing power. While this is great for testing around or running your Appwrite service in a network isolated environment, it is highly not recommended for public production use.
-
-We are providing three different methods to limit access to your Appwrite console. You can either set a list of [IPs]([https://github.com/appwrite/appwrite/blob/master/docs/tutorials/environment-variables.md#_app_console_whitelist_ips](https://github.com/appwrite/appwrite/blob/master/docs/tutorials/environment-variables.md#_app_console_whitelist_ips)), [email address]([https://github.com/appwrite/appwrite/blob/master/docs/tutorials/environment-variables.md#_app_console_whitelist_emails](https://github.com/appwrite/appwrite/blob/master/docs/tutorials/environment-variables.md#_app_console_whitelist_emails)) or [email domains]([https://github.com/appwrite/appwrite/blob/master/docs/tutorials/environment-variables.md#_app_console_whitelist_domains](https://github.com/appwrite/appwrite/blob/master/docs/tutorials/environment-variables.md#_app_console_whitelist_domains)) which users are allowed to signup from. You can choose one or multiple restriction methods to apply.
-
-## Scaling
-
-Appwrite was built with scalability in mind. Appwrite can potentially scale horizontally infinitely with no known limitations.
-
-Appwrite uses a few containers to run, where each container has its job. Most of the Appwrite containers are stateless, and in order to scale them, all you need is run multiple instances of them and setup a load balancer in front of them.
-
-If you decide to set up a load balancer for a specific container, make sure that the containers that are trying to communicate with it are accessing it through a load balancer and not directly. All connections between Appwrite different containers are set using Docker environment variables.
-
-There are three Appwrite containers that do keep their state are the MariaDB, Redis, and InfluxDB containers that are used for storing data, cache, and stats (in this order). To scale them out, all you need to do is set up a standard cluster (same as you would with any other app using these technologies) according to your needs and performance.
-
-## Sending Emails
-
-Sending emails is hard. There are a lot of SPAM rules and configurations to master in order to set a functional SMTP server. The SMTP server that comes packaged with Appwrite is great for development but needs some work done to function well against SPAM filters. You can find some guidelines in this [tutorial]([https://www.digitalocean.com/community/tutorials/how-to-use-an-spf-record-to-prevent-spoofing-improve-e-mail-reliability](https://www.digitalocean.com/community/tutorials/how-to-use-an-spf-record-to-prevent-spoofing-improve-e-mail-reliability)).
-
-Another **easier option** is to use an ‘SMTP as a service’ product like [Sendgrid]([https://sendgrid.com/](https://sendgrid.com/)) or [Mailgun]([https://www.mailgun.com/](https://www.mailgun.com/)). You can change Appwrite SMTP settings and credentials to any 3rd party provider you like who support SMTP integration using our [Docker environment variables]([https://github.com/appwrite/appwrite/blob/master/docs/tutorials/environment-variables.md#smtp](https://github.com/appwrite/appwrite/blob/master/docs/tutorials/environment-variables.md#smtp)). Most services offer a decent free tier to get started with.
-
-## Backups
-
-Backups are highly recommended for any production environment. Currently, there is not built-in script we provide to do this automatically. To be able to backup your Appwrite server data, stats, and files you will need to do the following.
-
-1.  Create a script to backups and restore your MariaDB Appwrite schema. Note that trying to backup MariaDB using a docker volume backup can result in a corrupted copy of your data. It is recommended to use MariaDB or MySQL built-in tools for this.
-2.  Create a script to backups and restore your InfluxDB stats. If you don’t care much about your server stats, you can skip this.
-3.  Create a script to backup Appwrite storage volume. There are many [online resources]([https://blog.ssdnodes.com/blog/docker-backup-volumes/](https://blog.ssdnodes.com/blog/docker-backup-volumes/)) explaining different ways to backup a docker volume. When running on multiple servers, it is very recommended to use an attachable storage point. Some cloud providers offer integrated backups to such attachable mount like GCP, AWS, DigitalOcean, and the list continues.
diff --git a/public/dist/scripts/app-all.js b/public/dist/scripts/app-all.js
index 0302351268..e97ece6287 100644
--- a/public/dist/scripts/app-all.js
+++ b/public/dist/scripts/app-all.js
@@ -2219,9 +2219,11 @@ match=text.match(new RegExp(regex,'gi'))
 if(!match){return fail}
 for(i=0,len=match.length;i<len;i++){if(!process(match[i])){return fail}}
 return(date.getTime()/1000)}
-return{format:format,strtotime:strtotime}}(),true);})(window);(function(window){"use strict";window.ls.container.set('env',function(){return APP_ENV;},true);})(window);(function(window){"use strict";window.ls.container.set('form',function(){function cast(value,to){switch(to){case'int':case'integer':value=parseInt(value);break;case'numeric':value=Number(value);break;case'string':value=value.toString();break;case'json':value=(value)?JSON.parse(value):[];break;case'array':value=(value&&value.constructor&&value.constructor===Array)?value:[value];break;case'array-empty':value=[];break;case'bool':case'boolean':value=(value==='false')?false:value;value=!!value;break;}
+return{format:format,strtotime:strtotime}}(),true);})(window);(function(window){"use strict";window.ls.container.set('env',function(){return APP_ENV;},true);})(window);(function(window){"use strict";window.ls.container.set('form',function(){function cast(value,to){if(value&&Array.isArray(value)&&to!=='array'){value=value.map(element=>cast(element,to));return value;}
+switch(to){case'int':case'integer':value=parseInt(value);break;case'numeric':value=Number(value);break;case'string':value=value.toString();break;case'json':value=(value)?JSON.parse(value):[];break;case'array':value=(value&&value.constructor&&value.constructor===Array)?value:[value];break;case'array-empty':value=[];break;case'bool':case'boolean':value=(value==='false')?false:value;value=!!value;break;}
 return value;}
-function toJson(element,json){json=json||{};let name=element.getAttribute('name');let type=element.getAttribute('type');let castTo=element.getAttribute('data-cast-to');let ref=json;if(name&&'FORM'!==element.tagName){if('FIELDSET'===element.tagName){if(castTo==='object'){if(json[name]===undefined){json[name]={};}
+function toJson(element,json){json=json||{};let name=element.getAttribute('name');let type=element.getAttribute('type');let castTo=element.getAttribute('data-cast-to');let ref=json;if(name&&'FORM'!==element.tagName){if(name.startsWith('[')){let splitName=name.split('.');if(splitName.length>1&&splitName[0].endsWith(']')){name=splitName[splitName.length-1];}}
+if('FIELDSET'===element.tagName){if(castTo==='object'){if(json[name]===undefined){json[name]={};}
 ref=json[name];}
 else{if(!Array.isArray(json[name])){json[name]=[];}
 json[name].push({});ref=json[name][json[name].length-1];}}
diff --git a/public/dist/scripts/app.js b/public/dist/scripts/app.js
index 54a7abd94d..663a324551 100644
--- a/public/dist/scripts/app.js
+++ b/public/dist/scripts/app.js
@@ -256,9 +256,11 @@ match=text.match(new RegExp(regex,'gi'))
 if(!match){return fail}
 for(i=0,len=match.length;i<len;i++){if(!process(match[i])){return fail}}
 return(date.getTime()/1000)}
-return{format:format,strtotime:strtotime}}(),true);})(window);(function(window){"use strict";window.ls.container.set('env',function(){return APP_ENV;},true);})(window);(function(window){"use strict";window.ls.container.set('form',function(){function cast(value,to){switch(to){case'int':case'integer':value=parseInt(value);break;case'numeric':value=Number(value);break;case'string':value=value.toString();break;case'json':value=(value)?JSON.parse(value):[];break;case'array':value=(value&&value.constructor&&value.constructor===Array)?value:[value];break;case'array-empty':value=[];break;case'bool':case'boolean':value=(value==='false')?false:value;value=!!value;break;}
+return{format:format,strtotime:strtotime}}(),true);})(window);(function(window){"use strict";window.ls.container.set('env',function(){return APP_ENV;},true);})(window);(function(window){"use strict";window.ls.container.set('form',function(){function cast(value,to){if(value&&Array.isArray(value)&&to!=='array'){value=value.map(element=>cast(element,to));return value;}
+switch(to){case'int':case'integer':value=parseInt(value);break;case'numeric':value=Number(value);break;case'string':value=value.toString();break;case'json':value=(value)?JSON.parse(value):[];break;case'array':value=(value&&value.constructor&&value.constructor===Array)?value:[value];break;case'array-empty':value=[];break;case'bool':case'boolean':value=(value==='false')?false:value;value=!!value;break;}
 return value;}
-function toJson(element,json){json=json||{};let name=element.getAttribute('name');let type=element.getAttribute('type');let castTo=element.getAttribute('data-cast-to');let ref=json;if(name&&'FORM'!==element.tagName){if('FIELDSET'===element.tagName){if(castTo==='object'){if(json[name]===undefined){json[name]={};}
+function toJson(element,json){json=json||{};let name=element.getAttribute('name');let type=element.getAttribute('type');let castTo=element.getAttribute('data-cast-to');let ref=json;if(name&&'FORM'!==element.tagName){if(name.startsWith('[')){let splitName=name.split('.');if(splitName.length>1&&splitName[0].endsWith(']')){name=splitName[splitName.length-1];}}
+if('FIELDSET'===element.tagName){if(castTo==='object'){if(json[name]===undefined){json[name]={};}
 ref=json[name];}
 else{if(!Array.isArray(json[name])){json[name]=[];}
 json[name].push({});ref=json[name][json[name].length-1];}}
diff --git a/public/scripts/services/form.js b/public/scripts/services/form.js
index 636c07b36f..01cfacabc7 100644
--- a/public/scripts/services/form.js
+++ b/public/scripts/services/form.js
@@ -4,6 +4,10 @@
     window.ls.container.set('form', function () {
 
         function cast(value, to) {
+            if (value && Array.isArray(value) && to !== 'array') {
+                value = value.map(element => cast(element, to));
+                return value;
+            }
             switch (to) {
                 case 'int':
                 case 'integer':
@@ -42,6 +46,12 @@
             let ref = json;
 
             if (name && 'FORM' !== element.tagName) {
+                if (name.startsWith('[')) { // Check for array names
+                    let splitName = name.split('.');
+                    if (splitName.length > 1 && splitName[0].endsWith(']')) {
+                        name = splitName[splitName.length-1];
+                    }
+                }
                 if ('FIELDSET' === element.tagName) { // Fieldset Array / Object
                     if (castTo === 'object') {
 
@@ -118,4 +128,4 @@
         }
     }, true, false);
 
-})(window);
\ No newline at end of file
+})(window);
diff --git a/src/Appwrite/Network/Validator/Email.php b/src/Appwrite/Network/Validator/Email.php
new file mode 100644
index 0000000000..ca9ba1d53d
--- /dev/null
+++ b/src/Appwrite/Network/Validator/Email.php
@@ -0,0 +1,56 @@
+<?php
+
+namespace Appwrite\Network\Validator;
+
+use Utopia\Validator;
+
+/**
+ * Email
+ *
+ * Validate that an variable is a valid email address
+ *
+ * @package Utopia\Validator
+ */
+class Email extends Validator
+{
+    /**
+     * Get Description
+     *
+     * Returns validator description
+     *
+     * @return string
+     */
+    public function getDescription()
+    {
+        return 'Value must be a valid email address';
+    }
+
+    /**
+     * Get Type
+     *
+     * Returns validator type.
+     *
+     * @return string
+     */
+    public function getType()
+    {
+        return 'string';
+    }
+
+    /**
+     * Is valid
+     *
+     * Validation will pass when $value is valid email address.
+     *
+     * @param  mixed $value
+     * @return bool
+     */
+    public function isValid($value)
+    {
+        if (!\filter_var($value, FILTER_VALIDATE_EMAIL)) {
+            return false;
+        }
+
+        return true;
+    }
+}
diff --git a/src/Appwrite/Network/Validator/Host.php b/src/Appwrite/Network/Validator/Host.php
new file mode 100644
index 0000000000..f746ecd752
--- /dev/null
+++ b/src/Appwrite/Network/Validator/Host.php
@@ -0,0 +1,72 @@
+<?php
+
+namespace Appwrite\Network\Validator;
+
+use Utopia\Validator;
+
+/**
+ * Host
+ *
+ * Validate that a host is allowed from given whitelisted hosts list
+ *
+ * @package Utopia\Validator
+ */
+class Host extends Validator
+{
+    protected $whitelist = [];
+
+    /**
+     * @param array $whitelist
+     */
+    public function __construct(array $whitelist)
+    {
+        $this->whitelist = $whitelist;
+    }
+
+    /**
+     * Get Description
+     *
+     * Returns validator description
+     *
+     * @return string
+     */
+    public function getDescription()
+    {
+        return 'URL host must be one of: ' . \implode(', ', $this->whitelist);
+    }
+
+    /**
+     * Get Type
+     *
+     * Returns validator type.
+     *
+     * @return string
+     */
+    public function getType()
+    {
+        return 'string';
+    }
+
+    /**
+     * Is valid
+     *
+     * Validation will pass when $value starts with one of the given hosts
+     *
+     * @param  mixed $value
+     * @return bool
+     */
+    public function isValid($value)
+    {
+        $urlValidator = new URL();
+
+        if (!$urlValidator->isValid($value)) {
+            return false;
+        }
+
+        if (\in_array(\parse_url($value, PHP_URL_HOST), $this->whitelist)) {
+            return true;
+        }
+
+        return false;
+    }
+}
diff --git a/src/Appwrite/Network/Validator/IP.php b/src/Appwrite/Network/Validator/IP.php
new file mode 100644
index 0000000000..523147eb2d
--- /dev/null
+++ b/src/Appwrite/Network/Validator/IP.php
@@ -0,0 +1,102 @@
+<?php
+
+namespace Appwrite\Network\Validator;
+
+use Exception;
+use Utopia\Validator;
+
+/**
+ * IP
+ *
+ * Validate that an variable is a valid IP address
+ *
+ * @package Utopia\Validator
+ */
+class IP extends Validator
+{
+    const ALL = 'all';
+    const V4 = 'ipv4';
+    const V6 = 'ipv6';
+
+    /**
+     * @var string
+     */
+    protected $type = self::ALL;
+
+    /**
+     * Constructor
+     *
+     * Set a the type of IP check.
+     *
+     * @param string $type
+     */
+    public function __construct(string $type = self::ALL)
+    {
+        if (!in_array($type, [self::ALL, self::V4, self::V6])) {
+            throw new Exception('Unsupported IP type');
+        }
+
+        $this->type = $type;
+    }
+
+    /**
+     * Get Description
+     *
+     * Returns validator description
+     *
+     * @return string
+     */
+    public function getDescription()
+    {
+        return 'Value must be a valid IP address';
+    }
+
+    /**
+     * Get Type
+     *
+     * Returns validator type.
+     *
+     * @return string
+     */
+    public function getType()
+    {
+        return 'string';
+    }
+
+    /**
+     * Is valid
+     *
+     * Validation will pass when $value is valid IP address.
+     *
+     * @param  mixed $value
+     * @return bool
+     */
+    public function isValid($value)
+    {
+        switch ($this->type) {
+            case self::ALL:
+                if (\filter_var($value, FILTER_VALIDATE_IP)) {
+                    return true;
+                }
+            break;
+            
+            case self::V4:
+                if (\filter_var($value, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
+                    return true;
+                }
+                break;
+            
+            case self::V6:
+                if (\filter_var($value, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) {
+                    return true;
+                }
+                break;
+            
+            default:
+                return false;
+            break;
+        }
+        
+        return false;
+    }
+}
diff --git a/src/Appwrite/Network/Validator/URL.php b/src/Appwrite/Network/Validator/URL.php
new file mode 100644
index 0000000000..bd1546e111
--- /dev/null
+++ b/src/Appwrite/Network/Validator/URL.php
@@ -0,0 +1,56 @@
+<?php
+
+namespace Appwrite\Network\Validator;
+
+use Utopia\Validator;
+
+/**
+ * URL
+ *
+ * Validate that an variable is a valid URL
+ *
+ * @package Utopia\Validator
+ */
+class URL extends Validator
+{
+    /**
+     * Get Description
+     *
+     * Returns validator description
+     *
+     * @return string
+     */
+    public function getDescription()
+    {
+        return 'Value must be a valid URL';
+    }
+
+    /**
+     * Get Type
+     *
+     * Returns validator type.
+     *
+     * @return string
+     */
+    public function getType()
+    {
+        return 'string';
+    }
+
+    /**
+     * Is valid
+     *
+     * Validation will pass when $value is valid URL.
+     *
+     * @param  mixed $value
+     * @return bool
+     */
+    public function isValid($value)
+    {
+        if (\filter_var($value, FILTER_VALIDATE_URL) === false) {
+            return false;
+        }
+
+        return true;
+    }
+}
diff --git a/src/Appwrite/Specification/Format/OpenAPI3.php b/src/Appwrite/Specification/Format/OpenAPI3.php
index 3c62daf5f7..f01673d3a5 100644
--- a/src/Appwrite/Specification/Format/OpenAPI3.php
+++ b/src/Appwrite/Specification/Format/OpenAPI3.php
@@ -83,7 +83,9 @@ class OpenAPI3 extends Format
             $output['components']['securitySchemes']['Mode']['x-appwrite'] = ['demo' => ''];
         }
 
-        foreach ($this->routes as $route) { /* @var $route \Utopia\Route */
+        $usedModels = [];
+
+        foreach ($this->routes as $route) { /** @var \Utopia\Route $route */
             $url = \str_replace('/v1', '', $route->getURL());
             $scope = $route->getLabel('scope', '');
             $hide = $route->getLabel('sdk.hide', false);
@@ -146,6 +148,7 @@ class OpenAPI3 extends Format
                     // ],
                 ];
             } else {
+                $usedModels[] = $model->getType();
                 $temp['responses'][(string)$route->getLabel('sdk.response.code', '500')] = [
                     'description' => $model->getName(),
                     'content' => [
@@ -236,7 +239,7 @@ class OpenAPI3 extends Format
                         $node['schema']['format'] = 'format';
                         $node['schema']['x-example'] = 'password';
                         break;
-                    case 'Utopia\Validator\Range': /* @var $validator \Utopia\Validator\Range */
+                    case 'Utopia\Validator\Range': /** @var \Utopia\Validator\Range $validator */
                         $node['schema']['type'] = 'integer';
                         $node['schema']['format'] = 'int32';
                         $node['schema']['x-example'] = $validator->getMin();
@@ -253,7 +256,7 @@ class OpenAPI3 extends Format
                         $node['schema']['format'] = 'url';
                         $node['schema']['x-example'] = 'https://example.com';
                         break;
-                    case 'Utopia\Validator\WhiteList': /* @var $validator \Utopia\Validator\WhiteList */
+                    case 'Utopia\Validator\WhiteList': /** @var \Utopia\Validator\WhiteList $validator */
                         $node['schema']['type'] = 'string';
                         $node['schema']['x-example'] = $validator->getList()[0];
                         break;
@@ -307,8 +310,18 @@ class OpenAPI3 extends Format
 
             $output['paths'][$url][\strtolower($route->getMethod())] = $temp;
         }
-
         foreach ($this->models as $model) {
+            foreach ($model->getRules() as $rule) {
+                if (!in_array($rule['type'], ['string', 'integer', 'boolean', 'json', 'float'])) {
+                    $usedModels[] = $rule['type'];
+                }
+            }
+        }
+        foreach ($this->models as $model) {
+            if (!in_array($model->getType(), $usedModels) && $model->getType() !== 'error') {
+                continue;
+            }
+
             $required = $model->getRequired();
             $rules = $model->getRules();
 
diff --git a/src/Appwrite/Specification/Format/Swagger2.php b/src/Appwrite/Specification/Format/Swagger2.php
index 4dd0406088..1d92a0ea3c 100644
--- a/src/Appwrite/Specification/Format/Swagger2.php
+++ b/src/Appwrite/Specification/Format/Swagger2.php
@@ -4,6 +4,7 @@ namespace Appwrite\Specification\Format;
 
 use Appwrite\Specification\Format;
 use Appwrite\Template\Template;
+use Appwrite\Utopia\Response\Model;
 use stdClass;
 
 class Swagger2 extends Format
@@ -81,7 +82,9 @@ class Swagger2 extends Format
             $output['securityDefinitions']['Mode']['x-appwrite'] = ['demo' => ''];
         }
 
-        foreach ($this->routes as $route) { /* @var $route \Utopia\Route */
+        $usedModels = [];
+
+        foreach ($this->routes as $route) { /** @var \Utopia\Route $route */
             $url = \str_replace('/v1', '', $route->getURL());
             $scope = $route->getLabel('scope', '');
             $hide = $route->getLabel('sdk.hide', false);
@@ -148,6 +151,7 @@ class Swagger2 extends Format
                     ],
                 ];
             } else {
+                $usedModels[] = $model->getType();
                 $temp['responses'][(string)$route->getLabel('sdk.response.code', '500')] = [
                     'description' => $model->getName(),
                     'schema' => [
@@ -232,7 +236,7 @@ class Swagger2 extends Format
                         $node['format'] = 'format';
                         $node['x-example'] = 'password';
                         break;
-                    case 'Utopia\Validator\Range': /* @var $validator \Utopia\Validator\Range */
+                    case 'Utopia\Validator\Range': /** @var \Utopia\Validator\Range $validator */
                         $node['type'] = 'integer';
                         $node['format'] = 'int32';
                         $node['x-example'] = $validator->getMin();
@@ -249,7 +253,7 @@ class Swagger2 extends Format
                         $node['format'] = 'url';
                         $node['x-example'] = 'https://example.com';
                         break;
-                    case 'Utopia\Validator\WhiteList': /* @var $validator \Utopia\Validator\WhiteList */
+                    case 'Utopia\Validator\WhiteList': /** @var \Utopia\Validator\WhiteList $validator */
                         $node['type'] = 'string';
                         $node['x-example'] = $validator->getList()[0];
                         break;
@@ -308,8 +312,18 @@ class Swagger2 extends Format
 
             $output['paths'][$url][\strtolower($route->getMethod())] = $temp;
         }
-
         foreach ($this->models as $model) {
+            foreach ($model->getRules() as $rule) {
+                if (!in_array($rule['type'], ['string', 'integer', 'boolean', 'json', 'float'])) {
+                    $usedModels[] = $rule['type'];
+                }
+            }
+        }
+        foreach ($this->models as $model) {
+            if (!in_array($model->getType(), $usedModels) && $model->getType() !== 'error') {
+                continue;
+            }
+
             $required = $model->getRequired();
             $rules = $model->getRules();
 
diff --git a/src/Appwrite/Utopia/Response.php b/src/Appwrite/Utopia/Response.php
index e7f7e4e84e..0bed14e45c 100644
--- a/src/Appwrite/Utopia/Response.php
+++ b/src/Appwrite/Utopia/Response.php
@@ -15,6 +15,7 @@ use Appwrite\Utopia\Response\Model\Collection;
 use Appwrite\Utopia\Response\Model\Continent;
 use Appwrite\Utopia\Response\Model\Country;
 use Appwrite\Utopia\Response\Model\Currency;
+use Appwrite\Utopia\Response\Model\Document as ModelDocument;
 use Appwrite\Utopia\Response\Model\Domain;
 use Appwrite\Utopia\Response\Model\Error;
 use Appwrite\Utopia\Response\Model\ErrorDev;
@@ -61,6 +62,7 @@ class Response extends SwooleResponse
     const MODEL_COLLECTION = 'collection';
     const MODEL_COLLECTION_LIST = 'collectionList';
     const MODEL_RULE = 'rule';
+    const MODEL_DOCUMENT = 'document';
     const MODEL_DOCUMENT_LIST = 'documentList';
 
     // Users
@@ -145,7 +147,7 @@ class Response extends SwooleResponse
             ->setModel(new ErrorDev())
             // Lists
             ->setModel(new BaseList('Collections List', self::MODEL_COLLECTION_LIST, 'collections', self::MODEL_COLLECTION))
-            ->setModel(new BaseList('Documents List', self::MODEL_DOCUMENT_LIST, 'documents', self::MODEL_ANY))
+            ->setModel(new BaseList('Documents List', self::MODEL_DOCUMENT_LIST, 'documents', self::MODEL_DOCUMENT))
             ->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('Logs List', self::MODEL_LOG_LIST, 'logs', self::MODEL_LOG, false))
@@ -169,6 +171,7 @@ class Response extends SwooleResponse
             // Entities
             ->setModel(new Permissions())
             ->setModel(new Collection())
+            ->setModel(new ModelDocument())
             ->setModel(new Rule())
             ->setModel(new Log())
             ->setModel(new User())
diff --git a/src/Appwrite/Utopia/Response/Filters/V06.php b/src/Appwrite/Utopia/Response/Filters/V06.php
index 137ecbfb5a..13ee89cbb7 100644
--- a/src/Appwrite/Utopia/Response/Filters/V06.php
+++ b/src/Appwrite/Utopia/Response/Filters/V06.php
@@ -108,6 +108,7 @@ class V06 extends Filter {
                 break;
 
             case Response::MODEL_ANY :
+            case Response::MODEL_DOCUMENT :
                 $parsedResponse = $content;
                 break;
 
diff --git a/src/Appwrite/Utopia/Response/Model/Document.php b/src/Appwrite/Utopia/Response/Model/Document.php
new file mode 100644
index 0000000000..a8a9f80970
--- /dev/null
+++ b/src/Appwrite/Utopia/Response/Model/Document.php
@@ -0,0 +1,52 @@
+<?php
+
+namespace Appwrite\Utopia\Response\Model;
+
+use Appwrite\Utopia\Response;
+
+class Document extends Any
+{
+    /**
+     * Get Name
+     * 
+     * @return string
+     */
+    public function getName(): string
+    {
+        return 'Document';
+    }
+
+    /**
+     * Get Collection
+     * 
+     * @return string
+     */
+    public function getType(): string
+    {
+        return Response::MODEL_DOCUMENT;
+    }
+
+    public function __construct()
+    {
+        $this
+            ->addRule('$id', [
+                'type' => self::TYPE_STRING,
+                'description' => 'Document ID.',
+                'default' => '',
+                'example' => '5e5ea5c16897e',
+            ])
+            ->addRule('$collection', [
+                'type' => self::TYPE_STRING,
+                'description' => 'Collection ID.',
+                'default' => '',
+                'example' => '5e5ea5c15117e',
+            ])
+            ->addRule('$permissions', [
+                'type' => Response::MODEL_PERMISSIONS,
+                'description' => 'Document permissions.',
+                'default' => new \stdClass,
+                'example' => new \stdClass,
+                'array' => false,
+            ]);
+    }
+}
diff --git a/tests/e2e/Services/Functions/FunctionsCustomServerTest.php b/tests/e2e/Services/Functions/FunctionsCustomServerTest.php
index 2326ccff36..9149d6b8a3 100644
--- a/tests/e2e/Services/Functions/FunctionsCustomServerTest.php
+++ b/tests/e2e/Services/Functions/FunctionsCustomServerTest.php
@@ -485,6 +485,14 @@ class FunctionsCustomServerTest extends Scope
                 'command' => 'python main.py',
                 'timeout' => 15,
             ],
+            [
+                'language' => 'Python',
+                'version' => '3.9',
+                'name' => 'python-3.9',
+                'code' => $functions.'/python.tar.gz',
+                'command' => 'python main.py',
+                'timeout' => 15,
+            ],
             [
                 'language' => 'Node.js',
                 'version' => '14.5',
@@ -541,6 +549,14 @@ class FunctionsCustomServerTest extends Scope
                 'command' => 'dart main.dart',
                 'timeout' => 15,
             ],
+            [
+                'language' => 'Dart',
+                'version' => '2.12',
+                'name' => 'dart-2.12',
+                'code' => $functions.'/dart.tar.gz',
+                'command' => 'dart main.dart',
+                'timeout' => 15,
+            ],
             [
                 'language' => '.NET',
                 'version' => '3.1',
diff --git a/tests/resources/docker/docker-compose.yml b/tests/resources/docker/docker-compose.yml
index 9f4074c540..7a931600c2 100644
--- a/tests/resources/docker/docker-compose.yml
+++ b/tests/resources/docker/docker-compose.yml
@@ -62,7 +62,7 @@ services:
     depends_on:
       - mariadb
       - redis
-      - clamav
+      # - clamav
       - influxdb
     environment:
       - _APP_ENV
@@ -81,6 +81,7 @@ services:
       - _APP_USAGE_STATS
       - _APP_INFLUXDB_HOST
       - _APP_INFLUXDB_PORT
+      - _APP_STORAGE_ANTIVIRUS=disabled
       - _APP_STORAGE_LIMIT
       - _APP_FUNCTIONS_TIMEOUT
       - _APP_FUNCTIONS_CONTAINERS
@@ -326,14 +327,14 @@ services:
     volumes:
       - appwrite-redis:/data:rw
 
-  clamav:
-    image: appwrite/clamav:1.2.0
-    container_name: appwrite-clamav
-    restart: unless-stopped
-    networks:
-      - appwrite
-    volumes:
-      - appwrite-uploads:/storage/uploads
+  # clamav:
+  #   image: appwrite/clamav:1.2.0
+  #   container_name: appwrite-clamav
+  #   restart: unless-stopped
+  #   networks:
+  #     - appwrite
+  #   volumes:
+  #     - appwrite-uploads:/storage/uploads
 
   influxdb:
     image: influxdb:1.6
diff --git a/tests/unit/Docker/ComposeTest.php b/tests/unit/Docker/ComposeTest.php
index c484fc17e8..79fbdd9f95 100644
--- a/tests/unit/Docker/ComposeTest.php
+++ b/tests/unit/Docker/ComposeTest.php
@@ -36,7 +36,7 @@ class ComposeTest extends TestCase
 
     public function testServices()
     {
-        $this->assertCount(17, $this->object->getServices());
+        $this->assertCount(16, $this->object->getServices());
         $this->assertEquals('appwrite-telegraf', $this->object->getService('telegraf')->getContainerName());
         $this->assertEquals('appwrite', $this->object->getService('appwrite')->getContainerName());
         $this->assertEquals('', $this->object->getService('appwrite')->getImageVersion());
diff --git a/tests/unit/Network/Validators/EmailTest.php b/tests/unit/Network/Validators/EmailTest.php
new file mode 100755
index 0000000000..5a7bf0f963
--- /dev/null
+++ b/tests/unit/Network/Validators/EmailTest.php
@@ -0,0 +1,71 @@
+<?php
+/**
+ * Utopia PHP Framework
+ *
+ * @package Framework
+ * @subpackage Tests
+ *
+ * @link https://github.com/utopia-php/framework
+ * @author Appwrite Team <team@appwrite.io>
+ * @version 1.0 RC4
+ * @license The MIT License (MIT) <http://www.opensource.org/licenses/mit-license.php>
+ */
+
+namespace Appwrite\Network\Validator;
+
+use PHPUnit\Framework\TestCase;
+
+class EmailTest extends TestCase
+{
+    /**
+     * @var Email
+     */
+    protected $email = null;
+
+    public function setUp():void
+    {
+        $this->email = new Email();
+    }
+
+    public function tearDown():void
+    {
+        $this->email = null;
+    }
+
+    public function testIsValid()
+    {
+        // Assertions
+        $this->assertEquals(true, $this->email->isValid('email@domain.com'));
+        $this->assertEquals(true, $this->email->isValid('firstname.lastname@domain.com'));
+        $this->assertEquals(true, $this->email->isValid('email@subdomain.domain.com'));
+        $this->assertEquals(true, $this->email->isValid('firstname+lastname@domain.com'));
+        $this->assertEquals(true, $this->email->isValid('email@[123.123.123.123]'));
+        $this->assertEquals(true, $this->email->isValid('"email"@domain.com'));
+        $this->assertEquals(true, $this->email->isValid('1234567890@domain.com'));
+        $this->assertEquals(true, $this->email->isValid('email@domain-one.com'));
+        $this->assertEquals(true, $this->email->isValid('_______@domain.com'));
+        $this->assertEquals(true, $this->email->isValid('email@domain.name'));
+        $this->assertEquals(true, $this->email->isValid('email@domain.co.jp'));
+        $this->assertEquals(true, $this->email->isValid('firstname-lastname@domain.com'));
+        $this->assertEquals(false, $this->email->isValid(false));
+        $this->assertEquals(false, $this->email->isValid(['string', 'string']));
+        $this->assertEquals(false, $this->email->isValid(1));
+        $this->assertEquals(false, $this->email->isValid(1.2));
+        $this->assertEquals(false, $this->email->isValid('plainaddress')); // Missing @ sign and domain
+        $this->assertEquals(false, $this->email->isValid('@domain.com')); // Missing username
+        $this->assertEquals(false, $this->email->isValid('#@%^%#$@#$@#.com')); // Garbage
+        $this->assertEquals(false, $this->email->isValid('Joe Smith <email@domain.com>')); // Encoded html within email is invalid
+        $this->assertEquals(false, $this->email->isValid('email.domain.com')); // Missing @
+        $this->assertEquals(false, $this->email->isValid('email@domain@domain.com')); // Two @ sign
+        $this->assertEquals(false, $this->email->isValid('.email@domain.com')); // Leading dot in address is not allowed
+        $this->assertEquals(false, $this->email->isValid('email.@domain.com')); // Trailing dot in address is not allowed
+        $this->assertEquals(false, $this->email->isValid('email..email@domain.com')); // Multiple dots
+        $this->assertEquals(false, $this->email->isValid('あいうえお@domain.com')); // Unicode char as address
+        $this->assertEquals(false, $this->email->isValid('email@domain.com (Joe Smith)')); // Text followed email is not allowed
+        $this->assertEquals(false, $this->email->isValid('email@domain')); // Missing top level domain (.com/.net/.org/etc)
+        $this->assertEquals(false, $this->email->isValid('email@-domain.com')); // Leading dash in front of domain is invalid
+        $this->assertEquals(false, $this->email->isValid('email@111.222.333.44444')); // Invalid IP format
+        $this->assertEquals(false, $this->email->isValid('email@domain..com')); // Multiple dot in the domain portion is invalid
+        $this->assertEquals($this->email->getType(), 'string');
+    }
+}
diff --git a/tests/unit/Network/Validators/HostTest.php b/tests/unit/Network/Validators/HostTest.php
new file mode 100755
index 0000000000..724ad74152
--- /dev/null
+++ b/tests/unit/Network/Validators/HostTest.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * Utopia PHP Framework
+ *
+ * @package Framework
+ * @subpackage Tests
+ *
+ * @link https://github.com/utopia-php/framework
+ * @author Appwrite Team <team@appwrite.io>
+ * @version 1.0 RC4
+ * @license The MIT License (MIT) <http://www.opensource.org/licenses/mit-license.php>
+ */
+
+namespace Appwrite\Network\Validator;
+
+use PHPUnit\Framework\TestCase;
+
+class HostTest extends TestCase
+{
+    /**
+     * @var Host
+     */
+    protected $host = null;
+
+    public function setUp():void
+    {
+        $this->host = new Host(['appwrite.io', 'subdomain.appwrite.test', 'localhost']);
+    }
+
+    public function tearDown():void
+    {
+        $this->host = null;
+    }
+
+    public function testIsValid()
+    {
+        // Assertions
+        $this->assertEquals($this->host->isValid('https://appwrite.io/link'), true);
+        $this->assertEquals($this->host->isValid('https://localhost'), true);
+        $this->assertEquals($this->host->isValid('localhost'), false);
+        $this->assertEquals($this->host->isValid('http://subdomain.appwrite.test/path'), true);
+        $this->assertEquals($this->host->isValid('http://test.subdomain.appwrite.test/path'), false);
+        $this->assertEquals($this->host->getType(), 'string');
+    }
+}
diff --git a/tests/unit/Network/Validators/IPTest.php b/tests/unit/Network/Validators/IPTest.php
new file mode 100755
index 0000000000..8ebd12dd03
--- /dev/null
+++ b/tests/unit/Network/Validators/IPTest.php
@@ -0,0 +1,81 @@
+<?php
+/**
+ * Utopia PHP Framework
+ *
+ * @package Framework
+ * @subpackage Tests
+ *
+ * @link https://github.com/utopia-php/framework
+ * @author Appwrite Team <team@appwrite.io>
+ * @version 1.0 RC4
+ * @license The MIT License (MIT) <http://www.opensource.org/licenses/mit-license.php>
+ */
+
+namespace Appwrite\Network\Validator;
+
+use PHPUnit\Framework\TestCase;
+
+class IPTest extends TestCase
+{
+    public function tearDown():void
+    {
+        $this->validator = null;
+    }
+
+    public function testIsValidIP()
+    {
+        $validator = new IP();
+
+        // Assertions
+        $this->assertEquals($validator->isValid('2001:0db8:85a3:08d3:1319:8a2e:0370:7334'), true);
+        $this->assertEquals($validator->isValid('109.67.204.101'), true);
+        $this->assertEquals($validator->isValid(23.5), false);
+        $this->assertEquals($validator->isValid('23.5'), false);
+        $this->assertEquals($validator->isValid(null), false);
+        $this->assertEquals($validator->isValid(true), false);
+        $this->assertEquals($validator->isValid(false), false);
+        $this->assertEquals($validator->getType(), 'string');
+    }
+
+    public function testIsValidIPALL()
+    {
+        $validator = new IP(IP::ALL);
+
+        // Assertions
+        $this->assertEquals($validator->isValid('2001:0db8:85a3:08d3:1319:8a2e:0370:7334'), true);
+        $this->assertEquals($validator->isValid('109.67.204.101'), true);
+        $this->assertEquals($validator->isValid(23.5), false);
+        $this->assertEquals($validator->isValid('23.5'), false);
+        $this->assertEquals($validator->isValid(null), false);
+        $this->assertEquals($validator->isValid(true), false);
+        $this->assertEquals($validator->isValid(false), false);
+    }
+
+    public function testIsValidIPV4()
+    {
+        $validator = new IP(IP::V4);
+
+        // Assertions
+        $this->assertEquals($validator->isValid('2001:0db8:85a3:08d3:1319:8a2e:0370:7334'), false);
+        $this->assertEquals($validator->isValid('109.67.204.101'), true);
+        $this->assertEquals($validator->isValid(23.5), false);
+        $this->assertEquals($validator->isValid('23.5'), false);
+        $this->assertEquals($validator->isValid(null), false);
+        $this->assertEquals($validator->isValid(true), false);
+        $this->assertEquals($validator->isValid(false), false);
+    }
+
+    public function testIsValidIPV6()
+    {
+        $validator = new IP(IP::V6);
+
+        // Assertions
+        $this->assertEquals($validator->isValid('2001:0db8:85a3:08d3:1319:8a2e:0370:7334'), true);
+        $this->assertEquals($validator->isValid('109.67.204.101'), false);
+        $this->assertEquals($validator->isValid(23.5), false);
+        $this->assertEquals($validator->isValid('23.5'), false);
+        $this->assertEquals($validator->isValid(null), false);
+        $this->assertEquals($validator->isValid(true), false);
+        $this->assertEquals($validator->isValid(false), false);
+    }
+}
diff --git a/tests/unit/Network/Validators/URLTest.php b/tests/unit/Network/Validators/URLTest.php
new file mode 100755
index 0000000000..458637da67
--- /dev/null
+++ b/tests/unit/Network/Validators/URLTest.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * Utopia PHP Framework
+ *
+ * @package Framework
+ * @subpackage Tests
+ *
+ * @link https://github.com/utopia-php/framework
+ * @author Appwrite Team <team@appwrite.io>
+ * @version 1.0 RC4
+ * @license The MIT License (MIT) <http://www.opensource.org/licenses/mit-license.php>
+ */
+
+namespace Appwrite\Network\Validator;
+
+use PHPUnit\Framework\TestCase;
+
+class URLTest extends TestCase
+{
+    /**
+     * @var Domain
+     */
+    protected $url = null;
+
+    public function setUp():void
+    {
+        $this->url = new URL();
+    }
+
+    public function tearDown():void
+    {
+        $this->url = null;
+    }
+
+    public function testIsValid()
+    {
+        // Assertions
+        $this->assertEquals(true, $this->url->isValid('http://example.com'));
+        $this->assertEquals(true, $this->url->isValid('https://example.com'));
+        $this->assertEquals(true, $this->url->isValid('htts://example.com')); // does not validate protocol
+        $this->assertEquals(false, $this->url->isValid('example.com')); // though, requires some kind of protocol
+        $this->assertEquals(false, $this->url->isValid('http:/example.com')); 
+        $this->assertEquals(true, $this->url->isValid('http://exa-mple.com'));
+        $this->assertEquals(false, $this->url->isValid('htt@s://example.com'));
+        $this->assertEquals(true, $this->url->isValid('http://www.example.com/foo%2\u00c2\u00a9zbar'));
+        $this->assertEquals(true, $this->url->isValid('http://www.example.com/?q=%3Casdf%3E'));
+    }
+}