diff --git a/src/Appwrite/GraphQL/Types/Mapper.php b/src/Appwrite/GraphQL/Types/Mapper.php
index 347642e5a1..68eec1eb35 100644
--- a/src/Appwrite/GraphQL/Types/Mapper.php
+++ b/src/Appwrite/GraphQL/Types/Mapper.php
@@ -267,48 +267,51 @@ class Mapper
         }
 
         switch ((!empty($validator)) ? $validator::class : '') {
-            case 'Appwrite\Network\Validator\CNAME':
-            case 'Appwrite\Task\Validator\Cron':
-            case 'Appwrite\Utopia\Database\Validator\CustomId':
-            case 'Utopia\Validator\Domain':
-            case 'Appwrite\Network\Validator\Email':
+            case 'Appwrite\Auth\Validator\Password':
             case 'Appwrite\Event\Validator\Event':
             case 'Appwrite\Event\Validator\FunctionEvent':
+            case 'Appwrite\Network\Validator\CNAME':
+            case 'Appwrite\Network\Validator\Email':
+            case 'Appwrite\Network\Validator\Redirect':
+            case 'Appwrite\Network\Validator\DNS':
+            case 'Appwrite\Network\Validator\Origin':
+            case 'Appwrite\Task\Validator\Cron':
+            case 'Appwrite\Utopia\Database\Validator\CustomId':
+            case 'Utopia\Database\Validator\Key':
+            case 'Utopia\Database\Validator\UID':
+            case 'Utopia\Validator\Domain':
             case 'Utopia\Validator\HexColor':
             case 'Utopia\Validator\Host':
             case 'Utopia\Validator\IP':
-            case 'Utopia\Database\Validator\Key':
             case 'Utopia\Validator\Origin':
-            case 'Appwrite\Auth\Validator\Password':
             case 'Utopia\Validator\Text':
-            case 'Utopia\Database\Validator\UID':
             case 'Utopia\Validator\URL':
             case 'Utopia\Validator\WhiteList':
             default:
                 $type = Type::string();
                 break;
-            case 'Utopia\Database\Validator\Authorization':
+            case 'Appwrite\Utopia\Database\Validator\Queries\Attributes':
             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\Attributes':
-            case 'Appwrite\Utopia\Database\Validator\Queries\Indexes':
             case 'Appwrite\Utopia\Database\Validator\Queries\Databases':
             case 'Appwrite\Utopia\Database\Validator\Queries\Deployments':
-            case 'Appwrite\Utopia\Database\Validator\Queries\Installations':
-            case '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\Rules':
+            case 'Appwrite\Utopia\Database\Validator\Queries\Indexes':
+            case 'Appwrite\Utopia\Database\Validator\Queries\Installations':
             case 'Appwrite\Utopia\Database\Validator\Queries\Memberships':
-            case 'Utopia\Database\Validator\Permissions':
             case 'Appwrite\Utopia\Database\Validator\Queries\Projects':
-            case 'Utopia\Database\Validator\Queries':
-            case 'Utopia\Database\Validator\Roles':
+            case 'Appwrite\Utopia\Database\Validator\Queries\Rules':
             case 'Appwrite\Utopia\Database\Validator\Queries\Teams':
             case 'Appwrite\Utopia\Database\Validator\Queries\Users':
             case 'Appwrite\Utopia\Database\Validator\Queries\Variables':
+            case 'Utopia\Database\Validator\Authorization':
+            case 'Utopia\Database\Validator\Permissions':
+            case 'Utopia\Database\Validator\Queries':
+            case 'Utopia\Database\Validator\Queries\Documents':
+            case 'Utopia\Database\Validator\Roles':
                 $type = Type::listOf(Type::string());
                 break;
             case 'Utopia\Validator\Boolean':
diff --git a/src/Appwrite/SDK/Specification/Format/OpenAPI3.php b/src/Appwrite/SDK/Specification/Format/OpenAPI3.php
index b808a27f98..1bde6d330f 100644
--- a/src/Appwrite/SDK/Specification/Format/OpenAPI3.php
+++ b/src/Appwrite/SDK/Specification/Format/OpenAPI3.php
@@ -360,6 +360,7 @@ class OpenAPI3 extends Format
                         break;
                     case 'Utopia\Validator\Host':
                     case 'Utopia\Validator\URL':
+                    case 'Appwrite\Network\Validator\Redirect':
                         $node['schema']['type'] = $validator->getType();
                         $node['schema']['format'] = 'url';
                         $node['schema']['x-example'] = 'https://example.com';
diff --git a/src/Appwrite/SDK/Specification/Format/Swagger2.php b/src/Appwrite/SDK/Specification/Format/Swagger2.php
index 5142229840..b17d400b48 100644
--- a/src/Appwrite/SDK/Specification/Format/Swagger2.php
+++ b/src/Appwrite/SDK/Specification/Format/Swagger2.php
@@ -385,6 +385,7 @@ class Swagger2 extends Format
                         break;
                     case 'Utopia\Validator\Host':
                     case 'Utopia\Validator\URL':
+                    case 'Appwrite\Network\Validator\Redirect':
                         $node['type'] = $validator->getType();
                         $node['format'] = 'url';
                         $node['x-example'] = 'https://example.com';