diff --git a/src/Appwrite/GraphQL/TypeMapper.php b/src/Appwrite/GraphQL/TypeMapper.php
index edc53d5a60..e0ac78e0c2 100644
--- a/src/Appwrite/GraphQL/TypeMapper.php
+++ b/src/Appwrite/GraphQL/TypeMapper.php
@@ -76,6 +76,21 @@ class TypeMapper
             case 'Utopia\Database\Validator\Authorization':
             case 'Utopia\Database\Validator\Permissions':
             case 'Utopia\Database\Validator\Roles':
+            case 'Appwrite\Utopia\Database\Validator\Queries':
+            case 'Appwrite\Utopia\Database\Validator\Queries\Base':
+            case 'Appwrite\Utopia\Database\Validator\Queries\Buckets':
+            case 'Appwrite\Utopia\Database\Validator\Queries\Collections':
+            case 'Appwrite\Utopia\Database\Validator\Queries\Databases':
+            case 'Appwrite\Utopia\Database\Validator\Queries\Deployments':
+            case 'Appwrite\Utopia\Database\Validator\Queries\Documents':
+            case 'Appwrite\Utopia\Database\Validator\Queries\Executions':
+            case 'Appwrite\Utopia\Database\Validator\Queries\Files':
+            case 'Appwrite\Utopia\Database\Validator\Queries\Functions':
+            case 'Appwrite\Utopia\Database\Validator\Queries\Memberships':
+            case 'Appwrite\Utopia\Database\Validator\Queries\Projects':
+            case 'Appwrite\Utopia\Database\Validator\Queries\Teams':
+            case 'Appwrite\Utopia\Database\Validator\Queries\Users':
+            case 'Appwrite\Utopia\Database\Validator\Queries\Variables':
                 $type = Type::listOf(Type::string());
                 break;
             case 'Utopia\Validator\Assoc':
diff --git a/tests/e2e/Services/GraphQL/GraphQLScopeTest.php b/tests/e2e/Services/GraphQL/GraphQLScopeTest.php
index a9f0e282b9..d002f50120 100644
--- a/tests/e2e/Services/GraphQL/GraphQLScopeTest.php
+++ b/tests/e2e/Services/GraphQL/GraphQLScopeTest.php
@@ -34,7 +34,7 @@ class GraphQLScopeTest extends Scope
             'x-appwrite-key' => $apiKey,
         ], $gqlPayload);
 
-        $message = "app.${projectId}@service.localhost (role: application) missing scope (databases.write)";
+        $message = "app.${projectId}@service.localhost (role: applications) missing scope (databases.write)";
         $this->assertArrayHasKey('errors', $database['body']);
         $this->assertEquals($message, $database['body']['errors'][0]['message']);
     }
diff --git a/tests/e2e/Services/GraphQL/GraphQLStorageServerTest.php b/tests/e2e/Services/GraphQL/GraphQLStorageServerTest.php
index 82bbebcf3b..76943effe4 100644
--- a/tests/e2e/Services/GraphQL/GraphQLStorageServerTest.php
+++ b/tests/e2e/Services/GraphQL/GraphQLStorageServerTest.php
@@ -330,7 +330,6 @@ class GraphQLStorageServerTest extends Scope
                 'fileId' => $file['_id'],
                 'permissions' => [
                     Permission::read(Role::any()),
-                    Permission::create(Role::any()),
                     Permission::update(Role::any()),
                     Permission::delete(Role::any()),
                 ],
diff --git a/tests/e2e/Services/GraphQL/GraphQLUsersTest.php b/tests/e2e/Services/GraphQL/GraphQLUsersTest.php
index a32b396af3..68787fbd66 100644
--- a/tests/e2e/Services/GraphQL/GraphQLUsersTest.php
+++ b/tests/e2e/Services/GraphQL/GraphQLUsersTest.php
@@ -7,6 +7,7 @@ use Tests\E2E\Scopes\ProjectCustom;
 use Tests\E2E\Scopes\Scope;
 use Tests\E2E\Scopes\SideServer;
 use Utopia\Database\ID;
+use Utopia\Database\Query;
 
 class GraphQLUsersTest extends Scope
 {
@@ -51,8 +52,10 @@ class GraphQLUsersTest extends Scope
         $graphQLPayload = [
             'query' => $query,
             'variables' => [
-                'limit' => 100,
-                'offset' => 0,
+                'queries' => [
+                    'limit(100)',
+                    'offset(0)',
+                ],
             ]
         ];
 
@@ -61,6 +64,8 @@ class GraphQLUsersTest extends Scope
             'x-appwrite-project' => $projectId,
         ], $this->getHeaders()), $graphQLPayload);
 
+        \var_dump($users);
+
         $this->assertIsArray($users['body']['data']);
         $this->assertArrayNotHasKey('errors', $users['body']);
         $this->assertIsArray($users['body']['data']['usersList']);
@@ -149,7 +154,7 @@ class GraphQLUsersTest extends Scope
 
         $this->assertIsArray($user['body']['data']);
         $this->assertArrayNotHasKey('errors', $user['body']);
-        $this->assertIsArray($user['body']['data']['usersGetMemberships']);
+        $this->assertIsArray($user['body']['data']['usersListMemberships']);
     }
 
     public function testGetUserLogs()
@@ -329,7 +334,7 @@ class GraphQLUsersTest extends Scope
         $this->assertIsArray($user['body']['data']);
         $this->assertArrayNotHasKey('errors', $user['body']);
         $this->assertIsArray($user['body']['data']['usersUpdatePhone']);
-        $this->assertEquals('+123456789', $user['body']['data']['usersUpdatePhone']['number']);
+        $this->assertEquals('+123456789', $user['body']['data']['usersUpdatePhone']['phone']);
     }
 
     public function testUpdateUserPrefs()