diff --git a/app/controllers/api/database.php b/app/controllers/api/database.php
index 3b3e477d90..e2af571bf7 100644
--- a/app/controllers/api/database.php
+++ b/app/controllers/api/database.php
@@ -1,6 +1,5 @@
 <?php
 
-use Appwrite\Database\Validator\Authorization;
 use Utopia\App;
 use Utopia\Exception;
 use Utopia\Audit\Audit;
@@ -29,6 +28,7 @@ use Utopia\Database\Exception\Structure as StructureException;
 use Appwrite\Utopia\Response;
 use Appwrite\Database\Validator\CustomId;
 use DeviceDetector\DeviceDetector;
+use Utopia\Database\Validator\Authorization;
 
 $attributesCallback = function ($collectionId, $attribute, $response, $dbForInternal, $database, $audits, $usage) {
     /** @var Utopia\Database\Document $attribute*/
@@ -287,8 +287,6 @@ App::get('/v1/database/usage')
                 ],
             ];
 
-            Authorization::disable();
-
             $metrics = [
                 'database.documents.count',
                 'database.collections.count',
@@ -303,24 +301,24 @@ App::get('/v1/database/usage')
             ];
 
             $stats = [];
-            foreach ($metrics as $metric) {
-                $requestDocs = $dbForInternal->find('stats', [
-                    new Query('period', Query::TYPE_EQUAL, [$period[$range]['period']]),
-                    new Query('metric', Query::TYPE_EQUAL, [$metric]),
-                ], $period[$range]['limit'], 0, ['time'], [Database::ORDER_DESC]);
 
-                $stats[$metric] = [];
-                foreach ($requestDocs as $requestDoc) {
-                    $stats[$metric][] = [
-                        'value' => $requestDoc->getAttribute('value'),
-                        'date' => $requestDoc->getAttribute('time'),
-                    ];
-                }
-
-                $stats[$metric] = array_reverse($stats[$metric]);
-            }
-
-            Authorization::reset();
+            Authorization::skip(function() use ($dbForInternal, $period, $range, $metrics, &$stats) {
+                foreach ($metrics as $metric) {
+                    $requestDocs = $dbForInternal->find('stats', [
+                        new Query('period', Query::TYPE_EQUAL, [$period[$range]['period']]),
+                        new Query('metric', Query::TYPE_EQUAL, [$metric]),
+                    ], $period[$range]['limit'], 0, ['time'], [Database::ORDER_DESC]);
+    
+                    $stats[$metric] = [];
+                    foreach ($requestDocs as $requestDoc) {
+                        $stats[$metric][] = [
+                            'value' => $requestDoc->getAttribute('value'),
+                            'date' => $requestDoc->getAttribute('time'),
+                        ];
+                    }
+                    $stats[$metric] = array_reverse($stats[$metric]);
+                }    
+            });
 
             $usage = new Document([
                 'range' => $range,
@@ -387,8 +385,6 @@ App::get('/v1/database/:collectionId/usage')
                     'limit' => 90,
                 ],
             ];
-            
-            Authorization::disable();
 
             $metrics = [
                 "database.collections.$collectionId.documents.count",
@@ -399,23 +395,24 @@ App::get('/v1/database/:collectionId/usage')
             ];
 
             $stats = [];
-            foreach ($metrics as $metric) {
-                $requestDocs = $dbForInternal->find('stats', [
-                    new Query('period', Query::TYPE_EQUAL, [$period[$range]['period']]),
-                    new Query('metric', Query::TYPE_EQUAL, [$metric]),
-                ], $period[$range]['limit'], 0, ['time'], [Database::ORDER_DESC]);
 
-                $stats[$metric] = [];
-                foreach ($requestDocs as $requestDoc) {
-                    $stats[$metric][] = [
-                        'value' => $requestDoc->getAttribute('value'),
-                        'date' => $requestDoc->getAttribute('time'),
-                    ];
-                }
-                $stats[$metric] = array_reverse($stats[$metric]);
-            }
-            
-            Authorization::reset();
+            Authorization::skip(function() use ($dbForInternal, $period, $range, $metrics, &$stats) {
+                foreach ($metrics as $metric) {
+                    $requestDocs = $dbForInternal->find('stats', [
+                        new Query('period', Query::TYPE_EQUAL, [$period[$range]['period']]),
+                        new Query('metric', Query::TYPE_EQUAL, [$metric]),
+                    ], $period[$range]['limit'], 0, ['time'], [Database::ORDER_DESC]);
+    
+                    $stats[$metric] = [];
+                    foreach ($requestDocs as $requestDoc) {
+                        $stats[$metric][] = [
+                            'value' => $requestDoc->getAttribute('value'),
+                            'date' => $requestDoc->getAttribute('time'),
+                        ];
+                    }
+                    $stats[$metric] = array_reverse($stats[$metric]);
+                }    
+            });
 
             $usage = new Document([
                 'range' => $range,
diff --git a/app/controllers/api/functions.php b/app/controllers/api/functions.php
index dec4fa92bf..fadc323832 100644
--- a/app/controllers/api/functions.php
+++ b/app/controllers/api/functions.php
@@ -188,8 +188,6 @@ App::get('/v1/functions/:functionId/usage')
                 ],
             ];
             
-            Authorization::disable();
-
             $metrics = [
                 "functions.$functionId.executions", 
                 "functions.$functionId.failures", 
@@ -197,24 +195,24 @@ App::get('/v1/functions/:functionId/usage')
             ];
 
             $stats = [];
-            foreach ($metrics as $metric) {
-                $requestDocs = $dbForInternal->find('stats', [
-                    new Query('period', Query::TYPE_EQUAL, [$period[$range]['period']]),
-                    new Query('metric', Query::TYPE_EQUAL, [$metric]),
-                ], $period[$range]['limit'], 0, ['time'], [Database::ORDER_DESC]);
 
-                $stats[$metric] = [];
-                foreach ($requestDocs as $requestDoc) {
-                    $stats[$metric][] = [
-                        'value' => $requestDoc->getAttribute('value'),
-                        'date' => $requestDoc->getAttribute('time'),
-                    ];
-                }
-
-                $stats[$metric] = array_reverse($stats[$metric]);
-            }
-
-            Authorization::reset();
+            Authorization::skip(function() use ($dbForInternal, $period, $range, $metrics, &$stats) {
+                foreach ($metrics as $metric) {
+                    $requestDocs = $dbForInternal->find('stats', [
+                        new Query('period', Query::TYPE_EQUAL, [$period[$range]['period']]),
+                        new Query('metric', Query::TYPE_EQUAL, [$metric]),
+                    ], $period[$range]['limit'], 0, ['time'], [Database::ORDER_DESC]);
+    
+                    $stats[$metric] = [];
+                    foreach ($requestDocs as $requestDoc) {
+                        $stats[$metric][] = [
+                            'value' => $requestDoc->getAttribute('value'),
+                            'date' => $requestDoc->getAttribute('time'),
+                        ];
+                    }
+                    $stats[$metric] = array_reverse($stats[$metric]);
+                }    
+            });
 
             $usage = new Document([
                 'range' => $range,
diff --git a/app/controllers/api/projects.php b/app/controllers/api/projects.php
index 2d8311845a..0d1c3b713a 100644
--- a/app/controllers/api/projects.php
+++ b/app/controllers/api/projects.php
@@ -267,8 +267,6 @@ App::get('/v1/projects/:projectId/usage')
 
             $dbForInternal->setNamespace('project_' . $projectId . '_internal');
 
-            Authorization::disable();
-
             $metrics = [
                 'requests', 
                 'network', 
@@ -280,24 +278,24 @@ App::get('/v1/projects/:projectId/usage')
             ];
 
             $stats = [];
-            foreach ($metrics as $metric) {
-                $requestDocs = $dbForInternal->find('stats', [
-                    new Query('period', Query::TYPE_EQUAL, [$period[$range]['period']]),
-                    new Query('metric', Query::TYPE_EQUAL, [$metric]),
-                ], $period[$range]['limit'], 0, ['time'], [Database::ORDER_DESC]);
 
-                $stats[$metric] = [];
-                foreach ($requestDocs as $requestDoc) {
-                    $stats[$metric][] = [
-                        'value' => $requestDoc->getAttribute('value'),
-                        'date' => $requestDoc->getAttribute('time'),
-                    ];
-                }
-
-                $stats[$metric] = array_reverse($stats[$metric]);
-            }    
-
-            Authorization::reset();
+            Authorization::skip(function() use ($dbForInternal, $period, $range, $metrics, &$stats) {
+                foreach ($metrics as $metric) {
+                    $requestDocs = $dbForInternal->find('stats', [
+                        new Query('period', Query::TYPE_EQUAL, [$period[$range]['period']]),
+                        new Query('metric', Query::TYPE_EQUAL, [$metric]),
+                    ], $period[$range]['limit'], 0, ['time'], [Database::ORDER_DESC]);
+    
+                    $stats[$metric] = [];
+                    foreach ($requestDocs as $requestDoc) {
+                        $stats[$metric][] = [
+                            'value' => $requestDoc->getAttribute('value'),
+                            'date' => $requestDoc->getAttribute('time'),
+                        ];
+                    }
+                    $stats[$metric] = array_reverse($stats[$metric]);
+                }    
+            });
 
             $usage = new Document([
                 'range' => $range,
diff --git a/app/controllers/api/storage.php b/app/controllers/api/storage.php
index c3804b2f60..a11d50b5e3 100644
--- a/app/controllers/api/storage.php
+++ b/app/controllers/api/storage.php
@@ -10,7 +10,7 @@ use Utopia\Validator\HexColor;
 use Utopia\Cache\Cache;
 use Utopia\Cache\Adapter\Filesystem;
 use Appwrite\ClamAV\Network;
-use Appwrite\Database\Validator\Authorization;
+use Utopia\Database\Validator\Authorization;
 use Appwrite\Database\Validator\CustomId;
 use Utopia\Database\Document;
 use Utopia\Database\Validator\UID;
@@ -682,29 +682,30 @@ App::get('/v1/storage/usage')
                 ],
             ];
 
-            Authorization::disable();
-
             $metrics = [
                 "storage.total",
                 "storage.files.count"
             ];
 
             $stats = [];
-            foreach ($metrics as $metric) {
-                $requestDocs = $dbForInternal->find('stats', [
-                    new Query('period', Query::TYPE_EQUAL, [$period[$range]['period']]),
-                    new Query('metric', Query::TYPE_EQUAL, [$metric]),
-                ], $period[$range]['limit'], 0, ['time'], [Database::ORDER_DESC]);
 
-                $stats[$metric] = [];
-                foreach ($requestDocs as $requestDoc) {
-                    $stats[$metric][] = [
-                        'value' => $requestDoc->getAttribute('value'),
-                        'date' => $requestDoc->getAttribute('time'),
-                    ];
-                }
-                $stats[$metric] = array_reverse($stats[$metric]);
-            }
+            Authorization::skip(function() use ($dbForInternal, $period, $range, $metrics, &$stats) {
+                foreach ($metrics as $metric) {
+                    $requestDocs = $dbForInternal->find('stats', [
+                        new Query('period', Query::TYPE_EQUAL, [$period[$range]['period']]),
+                        new Query('metric', Query::TYPE_EQUAL, [$metric]),
+                    ], $period[$range]['limit'], 0, ['time'], [Database::ORDER_DESC]);
+    
+                    $stats[$metric] = [];
+                    foreach ($requestDocs as $requestDoc) {
+                        $stats[$metric][] = [
+                            'value' => $requestDoc->getAttribute('value'),
+                            'date' => $requestDoc->getAttribute('time'),
+                        ];
+                    }
+                    $stats[$metric] = array_reverse($stats[$metric]);
+                }    
+            });
 
             $usage = new Document([
                 'range' => $range,
@@ -757,7 +758,6 @@ App::get('/v1/storage/:bucketId/usage')
                 ],
             ];
 
-            Authorization::disable();
             $metrics = [
                 "storage.buckets.$bucketId.files.create",
                 "storage.buckets.$bucketId.files.read",
@@ -766,22 +766,24 @@ App::get('/v1/storage/:bucketId/usage')
             ];
 
             $stats = [];
-            foreach ($metrics as $metric) {
-                $requestDocs = $dbForInternal->find('stats', [
-                    new Query('period', Query::TYPE_EQUAL, [$period[$range]['period']]),
-                    new Query('metric', Query::TYPE_EQUAL, [$metric]),
-                ], $period[$range]['limit'], 0, ['time'], [Database::ORDER_DESC]);
 
-                $stats[$metric] = [];
-                foreach ($requestDocs as $requestDoc) {
-                    $stats[$metric][] = [
-                        'value' => $requestDoc->getAttribute('value'),
-                        'date' => $requestDoc->getAttribute('time'),
-                    ];
-                }
-                $stats[$metric] = array_reverse($stats[$metric]);
-            }
-            Authorization::reset();
+            Authorization::skip(function() use ($dbForInternal, $period, $range, $metrics, &$stats) {
+                foreach ($metrics as $metric) {
+                    $requestDocs = $dbForInternal->find('stats', [
+                        new Query('period', Query::TYPE_EQUAL, [$period[$range]['period']]),
+                        new Query('metric', Query::TYPE_EQUAL, [$metric]),
+                    ], $period[$range]['limit'], 0, ['time'], [Database::ORDER_DESC]);
+    
+                    $stats[$metric] = [];
+                    foreach ($requestDocs as $requestDoc) {
+                        $stats[$metric][] = [
+                            'value' => $requestDoc->getAttribute('value'),
+                            'date' => $requestDoc->getAttribute('time'),
+                        ];
+                    }
+                    $stats[$metric] = array_reverse($stats[$metric]);
+                }    
+            });
 
             $usage = new Document([
                 'range' => $range,
diff --git a/app/controllers/api/users.php b/app/controllers/api/users.php
index 1895098bf2..7541487ba0 100644
--- a/app/controllers/api/users.php
+++ b/app/controllers/api/users.php
@@ -2,7 +2,6 @@
 
 use Appwrite\Auth\Auth;
 use Appwrite\Auth\Validator\Password;
-use Appwrite\Database\Validator\Authorization;
 use Appwrite\Utopia\Response;
 use Utopia\App;
 use Utopia\Exception;
@@ -21,6 +20,7 @@ use Appwrite\Database\Validator\CustomId;
 use Appwrite\Utopia\Response\Model;
 use Utopia\Database\Database;
 use Utopia\Database\Query;
+use Utopia\Database\Validator\Authorization;
 
 App::post('/v1/users')
     ->desc('Create User')
@@ -649,7 +649,6 @@ App::get('/v1/users/usage')
                 ],
             ];
 
-            Authorization::disable();
             $metrics = [
                 "users.count",
                 "users.create",
@@ -661,24 +660,24 @@ App::get('/v1/users/usage')
             ];
 
             $stats = [];
-            foreach ($metrics as $metric) {
-                $requestDocs = $dbForInternal->find('stats', [
-                    new Query('period', Query::TYPE_EQUAL, [$period[$range]['period']]),
-                    new Query('metric', Query::TYPE_EQUAL, [$metric]),
-                ], $period[$range]['limit'], 0, ['time'], [Database::ORDER_DESC]);
 
-                $stats[$metric] = [];
-                foreach ($requestDocs as $requestDoc) {
-                    $stats[$metric][] = [
-                        'value' => $requestDoc->getAttribute('value'),
-                        'date' => $requestDoc->getAttribute('time'),
-                    ];
-                }
-
-                $stats[$metric] = array_reverse($stats[$metric]);
-            }
-            
-            Authorization::reset();
+            Authorization::skip(function() use ($dbForInternal, $period, $range, $metrics, &$stats) {
+                foreach ($metrics as $metric) {
+                    $requestDocs = $dbForInternal->find('stats', [
+                        new Query('period', Query::TYPE_EQUAL, [$period[$range]['period']]),
+                        new Query('metric', Query::TYPE_EQUAL, [$metric]),
+                    ], $period[$range]['limit'], 0, ['time'], [Database::ORDER_DESC]);
+    
+                    $stats[$metric] = [];
+                    foreach ($requestDocs as $requestDoc) {
+                        $stats[$metric][] = [
+                            'value' => $requestDoc->getAttribute('value'),
+                            'date' => $requestDoc->getAttribute('time'),
+                        ];
+                    }
+                    $stats[$metric] = array_reverse($stats[$metric]);
+                }    
+            });
 
             $usage = new Document([
                 'range' => $range,