diff --git a/app/controllers/api/database.php b/app/controllers/api/database.php
index f1acd69194..649c346452 100644
--- a/app/controllers/api/database.php
+++ b/app/controllers/api/database.php
@@ -3,11 +3,11 @@
 use Utopia\App;
 use Utopia\Exception;
 use Utopia\Validator\Boolean;
+use Utopia\Validator\FloatValidator;
 use Utopia\Validator\Integer;
 use Utopia\Validator\Numeric;
 use Utopia\Validator\Range;
 use Utopia\Validator\WhiteList;
-use Utopia\Validator\Wildcard;
 use Utopia\Validator\Text;
 use Utopia\Validator\ArrayList;
 use Utopia\Validator\JSON;
@@ -15,6 +15,7 @@ use Utopia\Database\Validator\Key;
 use Utopia\Database\Validator\Permissions;
 use Utopia\Database\Validator\QueryValidator;
 use Utopia\Database\Validator\Queries as QueriesValidator;
+use Utopia\Database\Validator\Structure;
 use Utopia\Database\Validator\UID;
 use Utopia\Database\Exception\Authorization as AuthorizationException;
 use Utopia\Database\Exception\Structure as StructureException;
@@ -23,6 +24,101 @@ use Utopia\Database\Database;
 use Utopia\Database\Document;
 use Utopia\Database\Query;
 
+$attributesCallback = function ($attribute, $response, $dbForExternal, $database, $audits) {
+    /** @var Utopia\Database\Document $document*/
+    /** @var Appwrite\Utopia\Response $response */
+    /** @var Utopia\Database\Database $dbForExternal*/
+    /** @var Appwrite\Event\Event $database */
+    /** @var Appwrite\Event\Event $audits */
+
+    $collectionId = $attribute->getCollection();
+    $attributeId = $attribute->getId();
+    $type = $attribute->getAttribute('type', '');
+    $size = $attribute->getAttribute('size', 0);
+    $required = $attribute->getAttribute('required', true);
+    $default = $attribute->getAttribute('default', null);
+    $min = $attribute->getAttribute('min', null);
+    $max = $attribute->getAttribute('max', null);
+    $signed = $attribute->getAttribute('signed', true); // integers are signed by default 
+    $array = $attribute->getAttribute('array', false);
+    $format = $attribute->getAttribute('format', null);
+    $filters = $attribute->getAttribute('filters', []); // filters are hidden from the endpoint 
+
+    $collection = $dbForExternal->getCollection($collectionId);
+
+    if ($collection->isEmpty()) {
+        throw new Exception('Collection not found', 404);
+    }
+
+    // TODO@kodumbeats how to depend on $size for Text validator length
+    // Ensure attribute default is within required size
+    if ($size > 0 && !\is_null($default)) {
+        $validator = new Text($size);
+        if (!$validator->isValid($default)) {
+            throw new Exception('Length of default attribute exceeds attribute size', 400);
+        }
+    } 
+
+    if (!\is_null($format)) {
+        $name = \json_decode($format, true)['name'];
+        if (!Structure::hasFormat($name, $type)) {
+            throw new Exception("Format {$name} not available for {$type} attributes.", 400);
+        }
+    }
+
+    if (!is_null($min) || !is_null($max)) { // Add range validator if either $min or $max is provided
+        switch ($type) {
+            case Database::VAR_INTEGER:
+                $min = (is_null($min)) ? -INF : \intval($min);
+                $max = (is_null($max)) ? INF : \intval($max);
+                $format = 'int-range';
+                break;
+            case Database::VAR_FLOAT:
+                $min = (is_null($min)) ? -INF : \floatval($min);
+                $max = (is_null($max)) ? INF : \floatval($max);
+                $format = 'float-range';
+                break;
+            default:
+                throw new Exception("Format range not available for {$type} attributes.", 400);
+        }
+    }
+
+    $success = $dbForExternal->addAttributeInQueue($collectionId, $attributeId, $type, $size, $required, $default, $signed, $array, $format, $filters);
+
+    // Database->addAttributeInQueue() does not return a document
+    // So we need to create one for the response
+    //
+    // TODO@kodumbeats should $signed and $filters be part of the response model?
+    $attribute = new Document([
+        '$collection' => $collectionId,
+        '$id' => $attributeId,
+        'type' => $type,
+        'size' => $size,
+        'required' => $required,
+        'default' => $default,
+        'min' => $min,
+        'max' => $max,
+        'signed' => $signed,
+        'array' => $array,
+        'format' => $format,
+        'filters' => $filters,
+    ]);
+
+    $database
+        ->setParam('type', CREATE_TYPE_ATTRIBUTE)
+        ->setParam('document', $attribute)
+    ;
+
+    $audits
+        ->setParam('event', 'database.attributes.create')
+        ->setParam('resource', 'database/attributes/'.$attribute->getId())
+        ->setParam('data', $attribute)
+    ;
+
+    $response->setStatusCode(Response::STATUS_CODE_CREATED);
+    $response->dynamic($attribute, Response::MODEL_ATTRIBUTE);
+};
+
 App::post('/v1/database/collections')
     ->desc('Create Collection')
     ->groups(['api', 'database'])
@@ -224,79 +320,289 @@ App::delete('/v1/database/collections/:collectionId')
         $response->noContent();
     });
 
-App::post('/v1/database/collections/:collectionId/attributes')
-    ->desc('Create Attribute')
+App::post('/v1/database/collections/:collectionId/attributes/string')
+    ->desc('Create String Attribute')
     ->groups(['api', 'database'])
     ->label('event', 'database.attributes.create')
     ->label('scope', 'attributes.write')
     ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
     ->label('sdk.namespace', 'database')
-    ->label('sdk.method', 'createAttribute')
-    ->label('sdk.description', '/docs/references/database/create-attribute.md')
+    ->label('sdk.method', 'createStringAttribute')
+    ->label('sdk.description', '/docs/references/database/create-attribute-string.md')
     ->label('sdk.response.code', Response::STATUS_CODE_CREATED)
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_ATTRIBUTE)
     ->param('collectionId', '', new UID(), 'Collection unique ID. You can create a new collection using the Database service [server integration](/docs/server/database#createCollection).')
-    // TODO@kodumbeats attributeId
-    ->param('id', '', new Key(), 'Attribute ID.')
-    // TODO@kodumbeats whitelist (allowlist)
-    ->param('type', null, new Text(8), 'Attribute type.')
-    // TODO@kodumbeats hide size for ints/floats/bools
-    ->param('size', null, new Integer(), 'Attribute size for text attributes, in number of characters. For integers, floats, or bools, use 0.')
+    ->param('attributeId', '', new Key(), 'Attribute ID.')
+    ->param('size', null, new Integer(), 'Attribute size for text attributes, in number of characters.')
     ->param('required', null, new Boolean(), 'Is attribute required?')
-    ->param('default', null, new Wildcard(), 'Default value for attribute when not provided. Cannot be set when attribute is required.', true)
+    ->param('default', null, new Text(0), 'Default value for attribute when not provided. Cannot be set when attribute is required.', true)
     ->param('array', false, new Boolean(), 'Is attribute an array?', true)
     ->inject('response')
     ->inject('dbForExternal')
     ->inject('database')
     ->inject('audits')
-    ->action(function ($collectionId, $id, $type, $size, $required, $default, $array, $response, $dbForExternal, $database, $audits) {
+    ->action(function ($collectionId, $attributeId, $size, $required, $default, $array, $response, $dbForExternal, $database, $audits) use ($attributesCallback) {
         /** @var Appwrite\Utopia\Response $response */
         /** @var Utopia\Database\Database $dbForExternal*/
         /** @var Appwrite\Event\Event $database */
         /** @var Appwrite\Event\Event $audits */
 
-        $collection = $dbForExternal->getCollection($collectionId);
-
-        if ($collection->isEmpty()) {
-            throw new Exception('Collection not found', 404);
-        }
-
-        // integers are signed by default, and filters are hidden from the endpoint.
-        $signed = true;
-        $filters = [];
-
-        $success = $dbForExternal->addAttributeInQueue($collectionId, $id, $type, $size, $required, $default, $signed, $array, /*format*/ null, $filters);
-
-        // Database->addAttributeInQueue() does not return a document
-        // So we need to create one for the response
-        //
-        // TODO@kodumbeats should $signed and $filters be part of the response model?
-        $attribute = new Document([
+        return $attributesCallback(new Document([
             '$collection' => $collectionId,
-            '$id' => $id,
-            'type' => $type,
+            '$id' => $attributeId,
+            'type' => Database::VAR_STRING,
             'size' => $size,
             'required' => $required,
             'default' => $default,
-            'signed' => $signed,
             'array' => $array,
-            'filters' => $filters
-        ]);
+        ]), $response, $dbForExternal, $database, $audits);
+    });
 
-        $database
-            ->setParam('type', CREATE_TYPE_ATTRIBUTE)
-            ->setParam('document', $attribute)
-        ;
+App::post('/v1/database/collections/:collectionId/attributes/email')
+    ->desc('Create Email Attribute')
+    ->groups(['api', 'database'])
+    ->label('event', 'database.attributes.create')
+    ->label('scope', 'attributes.write')
+    ->label('sdk.namespace', 'database')
+    ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
+    ->label('sdk.method', 'createEmailAttribute')
+    ->label('sdk.description', '/docs/references/database/create-attribute-email.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_CREATED)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_ATTRIBUTE)
+    ->param('collectionId', '', new UID(), 'Collection unique ID. You can create a new collection using the Database service [server integration](/docs/server/database#createCollection).')
+    ->param('attributeId', '', new Key(), 'Attribute ID.')
+    ->param('required', null, new Boolean(), 'Is attribute required?')
+    ->param('default', null, new Text(0), 'Default value for attribute when not provided. Cannot be set when attribute is required.', true)
+    ->param('array', false, new Boolean(), 'Is attribute an array?', true)
+    ->inject('response')
+    ->inject('dbForExternal')
+    ->inject('database')
+    ->inject('audits')
+    ->action(function ($collectionId, $attributeId, $required, $default, $array, $response, $dbForExternal, $database, $audits) use ($attributesCallback) {
+        /** @var Appwrite\Utopia\Response $response */
+        /** @var Utopia\Database\Database $dbForExternal*/
+        /** @var Appwrite\Event\Event $database */
+        /** @var Appwrite\Event\Event $audits */
 
-        $audits
-            ->setParam('event', 'database.attributes.create')
-            ->setParam('resource', 'database/attributes/'.$attribute->getId())
-            ->setParam('data', $attribute)
-        ;
+        return $attributesCallback(new Document([
+            '$collection' => $collectionId,
+            '$id' => $attributeId,
+            'type' => Database::VAR_STRING,
+            'size' => 254,
+            'required' => $required,
+            'default' => $default,
+            'array' => $array,
+            'format' => \json_encode(['name'=>'email']),
+        ]), $response, $dbForExternal, $database, $audits);
+    });
 
-        $response->setStatusCode(Response::STATUS_CODE_CREATED);
-        $response->dynamic($attribute, Response::MODEL_ATTRIBUTE);
+App::post('/v1/database/collections/:collectionId/attributes/ip')
+    ->desc('Create IP Address Attribute')
+    ->groups(['api', 'database'])
+    ->label('event', 'database.attributes.create')
+    ->label('scope', 'attributes.write')
+    ->label('sdk.namespace', 'database')
+    ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
+    ->label('sdk.method', 'createIpAttribute')
+    ->label('sdk.description', '/docs/references/database/create-attribute-ip.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_CREATED)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_ATTRIBUTE)
+    ->param('collectionId', '', new UID(), 'Collection unique ID. You can create a new collection using the Database service [server integration](/docs/server/database#createCollection).')
+    ->param('attributeId', '', new Key(), 'Attribute ID.')
+    ->param('required', null, new Boolean(), 'Is attribute required?')
+    ->param('default', null, new Text(0), 'Default value for attribute when not provided. Cannot be set when attribute is required.', true)
+    ->param('array', false, new Boolean(), 'Is attribute an array?', true)
+    ->inject('response')
+    ->inject('dbForExternal')
+    ->inject('database')
+    ->inject('audits')
+    ->action(function ($collectionId, $attributeId, $required, $default, $array, $response, $dbForExternal, $database, $audits) use ($attributesCallback) {
+        /** @var Appwrite\Utopia\Response $response */
+        /** @var Utopia\Database\Database $dbForExternal*/
+        /** @var Appwrite\Event\Event $database */
+        /** @var Appwrite\Event\Event $audits */
+
+        return $attributesCallback(new Document([
+            '$collection' => $collectionId,
+            '$id' => $attributeId,
+            'type' => Database::VAR_STRING,
+            'size' => 39,
+            'required' => $required,
+            'default' => $default,
+            'array' => $array,
+            'format' => \json_encode(['name'=>'ip']),
+        ]), $response, $dbForExternal, $database, $audits);
+    });
+
+App::post('/v1/database/collections/:collectionId/attributes/url')
+    ->desc('Create IP Address Attribute')
+    ->groups(['api', 'database'])
+    ->label('event', 'database.attributes.create')
+    ->label('scope', 'attributes.write')
+    ->label('sdk.namespace', 'database')
+    ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
+    ->label('sdk.method', 'createUrlAttribute')
+    ->label('sdk.description', '/docs/references/database/create-attribute-url.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_CREATED)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_ATTRIBUTE)
+    ->param('collectionId', '', new UID(), 'Collection unique ID. You can create a new collection using the Database service [server integration](/docs/server/database#createCollection).')
+    ->param('attributeId', '', new Key(), 'Attribute ID.')
+    ->param('size', null, new Integer(), 'Attribute size for text attributes, in number of characters.')
+    ->param('required', null, new Boolean(), 'Is attribute required?')
+    ->param('default', null, new Text(0), 'Default value for attribute when not provided. Cannot be set when attribute is required.', true)
+    ->param('array', false, new Boolean(), 'Is attribute an array?', true)
+    ->inject('response')
+    ->inject('dbForExternal')
+    ->inject('database')
+    ->inject('audits')
+    ->action(function ($collectionId, $attributeId, $size, $required, $default, $array, $response, $dbForExternal, $database, $audits) use ($attributesCallback) {
+        /** @var Appwrite\Utopia\Response $response */
+        /** @var Utopia\Database\Database $dbForExternal*/
+        /** @var Appwrite\Event\Event $database */
+        /** @var Appwrite\Event\Event $audits */
+
+        return $attributesCallback(new Document([
+            '$collection' => $collectionId,
+            '$id' => $attributeId,
+            'type' => Database::VAR_STRING,
+            'size' => $size,
+            'required' => $required,
+            'default' => $default,
+            'array' => $array,
+            'format' => \json_encode(['name'=>'url']),
+        ]), $response, $dbForExternal, $database, $audits);
+    });
+
+App::post('/v1/database/collections/:collectionId/attributes/integer')
+    ->desc('Create Integer Attribute')
+    ->groups(['api', 'database'])
+    ->label('event', 'database.attributes.create')
+    ->label('scope', 'attributes.write')
+    ->label('sdk.namespace', 'database')
+    ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
+    ->label('sdk.method', 'createIntegerAttribute')
+    ->label('sdk.description', '/docs/references/database/create-attribute-integer.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_CREATED)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_ATTRIBUTE)
+    ->param('collectionId', '', new UID(), 'Collection unique ID. You can create a new collection using the Database service [server integration](/docs/server/database#createCollection).')
+    ->param('attributeId', '', new Key(), 'Attribute ID.')
+    ->param('required', null, new Boolean(), 'Is attribute required?')
+    ->param('min', null, new Integer(), 'Minimum value to enforce on new documents', true)
+    ->param('max', null, new Integer(), 'Maximum value to enforce on new documents', true)
+    ->param('default', null, new Integer(), 'Default value for attribute when not provided. Cannot be set when attribute is required.', true)
+    ->param('array', false, new Boolean(), 'Is attribute an array?', true)
+    ->inject('response')
+    ->inject('dbForExternal')
+    ->inject('database')
+    ->inject('audits')
+    ->action(function ($collectionId, $attributeId, $required, $min, $max, $default, $array, $response, $dbForExternal, $database, $audits) use ($attributesCallback) {
+        /** @var Appwrite\Utopia\Response $response */
+        /** @var Utopia\Database\Database $dbForExternal*/
+        /** @var Appwrite\Event\Event $database */
+        /** @var Appwrite\Event\Event $audits */
+
+        return $attributesCallback(new Document([
+            '$collection' => $collectionId,
+            '$id' => $attributeId,
+            'type' => Database::VAR_INTEGER,
+            'size' => 0,
+            'required' => $required,
+            'default' => $default,
+            'array' => $array,
+            'format' => \json_encode([
+                'name'=>'int-range',
+                'min' => $min,
+                'max' => $max,
+            ]),
+        ]), $response, $dbForExternal, $database, $audits);
+    });
+
+App::post('/v1/database/collections/:collectionId/attributes/float')
+    ->desc('Create Float Attribute')
+    ->groups(['api', 'database'])
+    ->label('event', 'database.attributes.create')
+    ->label('scope', 'attributes.write')
+    ->label('sdk.namespace', 'database')
+    ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
+    ->label('sdk.method', 'createFloatAttribute')
+    ->label('sdk.description', '/docs/references/database/create-attribute-float.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_CREATED)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_ATTRIBUTE)
+    ->param('collectionId', '', new UID(), 'Collection unique ID. You can create a new collection using the Database service [server integration](/docs/server/database#createCollection).')
+    ->param('attributeId', '', new Key(), 'Attribute ID.')
+    ->param('required', null, new Boolean(), 'Is attribute required?')
+    ->param('min', null, new FloatValidator(), 'Minimum value to enforce on new documents', true)
+    ->param('max', null, new FloatValidator(), 'Maximum value to enforce on new documents', true)
+    ->param('default', null, new FloatValidator(), 'Default value for attribute when not provided. Cannot be set when attribute is required.', true)
+    ->param('array', false, new Boolean(), 'Is attribute an array?', true)
+    ->inject('response')
+    ->inject('dbForExternal')
+    ->inject('database')
+    ->inject('audits')
+    ->action(function ($collectionId, $attributeId, $required, $min, $max, $default, $array, $response, $dbForExternal, $database, $audits) use ($attributesCallback) {
+        /** @var Appwrite\Utopia\Response $response */
+        /** @var Utopia\Database\Database $dbForExternal*/
+        /** @var Appwrite\Event\Event $database */
+        /** @var Appwrite\Event\Event $audits */
+
+        return $attributesCallback(new Document([
+            '$collection' => $collectionId,
+            '$id' => $attributeId,
+            'type' => Database::VAR_FLOAT,
+            'required' => $required,
+            'size' => 0,
+            'default' => $default,
+            'array' => $array,
+            'format' => \json_encode([
+                'name'=>'float-range',
+                'min' => $min,
+                'max' => $max,
+            ]),
+        ]), $response, $dbForExternal, $database, $audits);
+    });
+
+App::post('/v1/database/collections/:collectionId/attributes/boolean')
+    ->desc('Create Boolean Attribute')
+    ->groups(['api', 'database'])
+    ->label('event', 'database.attributes.create')
+    ->label('scope', 'attributes.write')
+    ->label('sdk.namespace', 'database')
+    ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
+    ->label('sdk.method', 'createBooleanAttribute')
+    ->label('sdk.description', '/docs/references/database/create-attribute-boolean.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_CREATED)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_ATTRIBUTE)
+    ->param('collectionId', '', new UID(), 'Collection unique ID. You can create a new collection using the Database service [server integration](/docs/server/database#createCollection).')
+    ->param('attributeId', '', new Key(), 'Attribute ID.')
+    ->param('required', null, new Boolean(), 'Is attribute required?')
+    ->param('default', null, new Boolean(), 'Default value for attribute when not provided. Cannot be set when attribute is required.', true)
+    ->param('array', false, new Boolean(), 'Is attribute an array?', true)
+    ->inject('response')
+    ->inject('dbForExternal')
+    ->inject('database')
+    ->inject('audits')
+    ->action(function ($collectionId, $attributeId, $required, $default, $array, $response, $dbForExternal, $database, $audits) use ($attributesCallback) {
+        /** @var Appwrite\Utopia\Response $response */
+        /** @var Utopia\Database\Database $dbForExternal*/
+        /** @var Appwrite\Event\Event $database */
+        /** @var Appwrite\Event\Event $audits */
+
+        return $attributesCallback(new Document([
+            '$collection' => $collectionId,
+            '$id' => $attributeId,
+            'type' => Database::VAR_BOOLEAN,
+            'size' => 0,
+            'required' => $required,
+            'default' => $default,
+            'array' => $array,
+        ]), $response, $dbForExternal, $database, $audits);
     });
 
 App::get('/v1/database/collections/:collectionId/attributes')
@@ -422,6 +728,9 @@ App::delete('/v1/database/collections/:collectionId/attributes/:attributeId')
             'collectionId' => $collectionId,
         ])]);
 
+        $type = $attribute->getAttribute('type', '');
+        $format = $attribute->getAttribute('format', '');
+
         $database
             ->setParam('type', DELETE_TYPE_ATTRIBUTE)
             ->setParam('document', $attribute)
@@ -456,9 +765,7 @@ App::post('/v1/database/collections/:collectionId/indexes')
     ->param('id', null, new Key(), 'Index ID.')
     ->param('type', null, new WhiteList([Database::INDEX_KEY, Database::INDEX_FULLTEXT, Database::INDEX_UNIQUE, Database::INDEX_SPATIAL, Database::INDEX_ARRAY]), 'Index type.')
     ->param('attributes', null, new ArrayList(new Key()), 'Array of attributes to index.')
-    // TODO@kodumbeats debug below
     ->param('orders', [], new ArrayList(new WhiteList(['ASC', 'DESC'], false, Database::VAR_STRING)), 'Array of index orders.', true)
-    // ->param('orders', [], new ArrayList(new Text(4)), 'Array of index orders.', true)
     ->inject('response')
     ->inject('dbForExternal')
     ->inject('database')
diff --git a/app/init.php b/app/init.php
index 9d8413e64d..ff57d7cfc1 100644
--- a/app/init.php
+++ b/app/init.php
@@ -25,6 +25,9 @@ use Appwrite\Database\Adapter\MySQL as MySQLAdapter;
 use Appwrite\Database\Adapter\Redis as RedisAdapter;
 use Appwrite\Database\Document;
 use Appwrite\Event\Event;
+use Appwrite\Network\Validator\Email;
+use Appwrite\Network\Validator\IP;
+use Appwrite\Network\Validator\URL;
 use Appwrite\OpenSSL\OpenSSL;
 use Utopia\App;
 use Utopia\View;
@@ -38,7 +41,9 @@ use Utopia\Cache\Cache;
 use Utopia\Database\Adapter\MariaDB;
 use Utopia\Database\Document as Document2;
 use Utopia\Database\Database as Database2;
+use Utopia\Database\Validator\Structure;
 use Utopia\Database\Validator\Authorization;
+use Utopia\Validator\Range;
 use Swoole\Database\PDOConfig;
 use Swoole\Database\PDOPool;
 use Swoole\Database\RedisConfig;
@@ -184,6 +189,38 @@ Database2::addFilter('encrypt',
     }
 );
 
+Structure::addFormat('email', function() {
+    return new Email();
+}, Database2::VAR_STRING);
+
+Structure::addFormat('ip', function() {
+    return new IP();
+}, Database2::VAR_STRING);
+
+Structure::addFormat('url', function() {
+    return new URL();
+}, Database2::VAR_STRING);
+
+Structure::addFormat('int-range', function($attribute) {
+    // Format encoded as json string containing name and relevant options
+    // E.g. Range: $format = json_encode(['name'=>$name, 'min'=>$min, 'max'=>$max]);
+    $format = json_decode($attribute['format'], true);
+    $min = $format['min'] ?? -INF;
+    $max = $format['max'] ?? INF;
+    $type = $attribute['type'];
+    return new Range($min, $max, $type);
+}, Database2::VAR_INTEGER);
+
+Structure::addFormat('float-range', function($attribute) {
+    // Format encoded as json string containing name and relevant options
+    // E.g. Range: $format = json_encode(['name'=>$name, 'min'=>$min, 'max'=>$max]);
+    $format = json_decode($attribute['format'], true);
+    $min = $format['min'] ?? -INF;
+    $max = $format['max'] ?? INF;
+    $type = $attribute['type'] ?? '';
+    return new Range($min, $max, $type);
+}, Database2::VAR_FLOAT);
+
 /*
  * Registry
  */
diff --git a/composer.json b/composer.json
index 1c9b75e832..f595bfd1a8 100644
--- a/composer.json
+++ b/composer.json
@@ -38,7 +38,7 @@
         "appwrite/php-clamav": "1.1.*",
         "appwrite/php-runtimes": "0.4.*",
 
-        "utopia-php/framework": "0.16.*",
+        "utopia-php/framework": "0.17.*",
         "utopia-php/abuse": "0.6.*",
         "utopia-php/analytics": "0.2.*",
         "utopia-php/audit": "0.6.*",
@@ -62,6 +62,7 @@
         "adhocore/jwt": "1.1.2",
         "slickdeals/statsd": "3.1.0"
     },
+    "repositories": [],
     "require-dev": {
         "appwrite/sdk-generator": "0.13.0",
         "swoole/ide-helper": "4.6.7",
diff --git a/composer.lock b/composer.lock
index 93211445d4..b43adc9166 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "0247f77dbdda25ccaeef2d9ae9671325",
+    "content-hash": "f9727be2725e573a92b2d1aeeb77b421",
     "packages": [
         {
             "name": "adhocore/jwt",
@@ -2101,16 +2101,16 @@
         },
         {
             "name": "utopia-php/framework",
-            "version": "0.16.2",
+            "version": "0.17.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/utopia-php/framework.git",
-                "reference": "df02354a670df366b92e2e927fbf128be9a8e64e"
+                "reference": "0274f6b3e49db2af0d702edf278ec7504dc99878"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/utopia-php/framework/zipball/df02354a670df366b92e2e927fbf128be9a8e64e",
-                "reference": "df02354a670df366b92e2e927fbf128be9a8e64e",
+                "url": "https://api.github.com/repos/utopia-php/framework/zipball/0274f6b3e49db2af0d702edf278ec7504dc99878",
+                "reference": "0274f6b3e49db2af0d702edf278ec7504dc99878",
                 "shasum": ""
             },
             "require": {
@@ -2144,9 +2144,9 @@
             ],
             "support": {
                 "issues": "https://github.com/utopia-php/framework/issues",
-                "source": "https://github.com/utopia-php/framework/tree/0.16.2"
+                "source": "https://github.com/utopia-php/framework/tree/0.17.3"
             },
-            "time": "2021-07-20T10:24:56+00:00"
+            "time": "2021-08-03T13:57:01+00:00"
         },
         {
             "name": "utopia-php/image",
diff --git a/tests/e2e/Services/Database/DatabaseBase.php b/tests/e2e/Services/Database/DatabaseBase.php
index 21f22ba7a0..755321ed73 100644
--- a/tests/e2e/Services/Database/DatabaseBase.php
+++ b/tests/e2e/Services/Database/DatabaseBase.php
@@ -32,35 +32,32 @@ trait DatabaseBase
      */
     public function testCreateAttributes(array $data): array
     {
-        $title = $this->client->call(Client::METHOD_POST, '/database/collections/' . $data['moviesId'] . '/attributes', array_merge([
+        $title = $this->client->call(Client::METHOD_POST, '/database/collections/' . $data['moviesId'] . '/attributes/string', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
         ]), [
-            'id' => 'title',
-            'type' => 'string',
+            'attributeId' => 'title',
             'size' => 256,
             'required' => true,
         ]);
 
-        $releaseYear = $this->client->call(Client::METHOD_POST, '/database/collections/' . $data['moviesId'] . '/attributes', array_merge([
+        $releaseYear = $this->client->call(Client::METHOD_POST, '/database/collections/' . $data['moviesId'] . '/attributes/integer', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
         ]), [
-            'id' => 'releaseYear',
-            'type' => 'integer',
+            'attributeId' => 'releaseYear',
             'size' => 0,
             'required' => true,
         ]);
 
-        $actors = $this->client->call(Client::METHOD_POST, '/database/collections/' . $data['moviesId'] . '/attributes', array_merge([
+        $actors = $this->client->call(Client::METHOD_POST, '/database/collections/' . $data['moviesId'] . '/attributes/string', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
         ]), [
-            'id' => 'actors',
-            'type' => 'string',
+            'attributeId' => 'actors',
             'size' => 256,
             'required' => false,
             'default' => null,
@@ -514,6 +511,332 @@ trait DatabaseBase
         return $data;
     }
 
+    public function testInvalidDocumentStructure()
+    {
+        $collection = $this->client->call(Client::METHOD_POST, '/database/collections', array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+            'x-appwrite-key' => $this->getProject()['apiKey']
+        ]), [
+            'name' => 'invalidDocumentStructure',
+            'read' => ['role:all'],
+            'write' => ['role:all'],
+        ]);
+
+        $this->assertEquals(201, $collection['headers']['status-code']);
+        $this->assertEquals('invalidDocumentStructure', $collection['body']['name']);
+
+        $collectionId = $collection['body']['$id'];
+
+        $email = $this->client->call(Client::METHOD_POST, '/database/collections/' . $collectionId . '/attributes/email', array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+            'x-appwrite-key' => $this->getProject()['apiKey']
+        ]), [
+            'attributeId' => 'email',
+            'required' => false,
+        ]);
+
+        $ip = $this->client->call(Client::METHOD_POST, '/database/collections/' . $collectionId . '/attributes/ip', array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+            'x-appwrite-key' => $this->getProject()['apiKey']
+        ]), [
+            'attributeId' => 'ip',
+            'required' => false,
+        ]);
+
+        $url = $this->client->call(Client::METHOD_POST, '/database/collections/' . $collectionId . '/attributes/url', array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+            'x-appwrite-key' => $this->getProject()['apiKey']
+        ]), [
+            'attributeId' => 'url',
+            'size' => 256,
+            'required' => false,
+        ]);
+
+        $range = $this->client->call(Client::METHOD_POST, '/database/collections/' . $collectionId . '/attributes/integer', array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+            'x-appwrite-key' => $this->getProject()['apiKey']
+        ]), [
+            'attributeId' => 'range',
+            'required' => false,
+            'min' => 1,
+            'max' => 10,
+        ]);
+
+        // TODO@kodumbeats min and max are rounded in error message
+        $floatRange = $this->client->call(Client::METHOD_POST, '/database/collections/' . $collectionId . '/attributes/float', array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+            'x-appwrite-key' => $this->getProject()['apiKey']
+        ]), [
+            'attributeId' => 'floatRange',
+            'required' => false,
+            'min' => 1.1,
+            'max' => 1.4,
+        ]);
+
+        // TODO@kodumbeats float validator rejects 0.0 and 1.0 as floats
+        // $probability = $this->client->call(Client::METHOD_POST, '/database/collections/' . $collectionId . '/attributes/float', array_merge([
+        //     'content-type' => 'application/json',
+        //     'x-appwrite-project' => $this->getProject()['$id'],
+        //     'x-appwrite-key' => $this->getProject()['apiKey']
+        // ]), [
+        //     'attributeId' => 'probability',
+        //     'required' => false,
+        //     'min' => \floatval(0.0),
+        //     'max' => \floatval(1.0),
+        // ]);
+
+        $upperBound = $this->client->call(Client::METHOD_POST, '/database/collections/' . $collectionId . '/attributes/integer', array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+            'x-appwrite-key' => $this->getProject()['apiKey']
+        ]), [
+            'attributeId' => 'upperBound',
+            'required' => false,
+            'max' => 10,
+        ]);
+
+        $lowerBound = $this->client->call(Client::METHOD_POST, '/database/collections/' . $collectionId . '/attributes/integer', array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+            'x-appwrite-key' => $this->getProject()['apiKey']
+        ]), [
+            'attributeId' => 'lowerBound',
+            'required' => false,
+            'min' => 5,
+        ]);
+
+        /**
+         * Test for failure
+         */
+
+        // TODO@kodumbeats troubleshoot
+        // $invalidRange = $this->client->call(Client::METHOD_POST, '/database/collections/' . $collectionId . '/attributes/integer', array_merge([
+        //     'content-type' => 'application/json', 'x-appwrite-project' => $this->getProject()['$id'],
+        //     'x-appwrite-key' => $this->getProject()['apiKey']
+        // ]), [
+        //     'attributeId' => 'invalidRange',
+        //     'required' => false,
+        //     'min' => 4,
+        //     'max' => 3,
+        // ]);
+
+        $this->assertEquals(201, $email['headers']['status-code']);
+        $this->assertEquals(201, $ip['headers']['status-code']);
+        $this->assertEquals(201, $url['headers']['status-code']);
+        $this->assertEquals(201, $range['headers']['status-code']);
+        $this->assertEquals(201, $floatRange['headers']['status-code']);
+        $this->assertEquals(201, $upperBound['headers']['status-code']);
+        $this->assertEquals(201, $lowerBound['headers']['status-code']);
+        // $this->assertEquals(400, $invalidRange['headers']['status-code']);
+        // $this->assertEquals('Minimum value must be lesser than maximum value', $invalidRange['body']['message']);
+
+        // wait for worker to add attributes
+        sleep(10);
+
+        $collection = $this->client->call(Client::METHOD_GET, '/database/collections/' . $collectionId, array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+            'x-appwrite-key' => $this->getProject()['apiKey'],
+        ]), []); 
+
+        $this->assertCount(7, $collection['body']['attributes']);
+        $this->assertCount(0, $collection['body']['attributesInQueue']);
+
+        /**
+         * Test for successful validation
+         */
+
+        $goodEmail = $this->client->call(Client::METHOD_POST, '/database/collections/' . $collectionId . '/documents', array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+        ], $this->getHeaders()), [
+            'data' => [
+                'email' => 'user@example.com',
+            ],
+            'read' => ['user:'.$this->getUser()['$id']],
+            'write' => ['user:'.$this->getUser()['$id']],
+        ]);
+
+        $goodIp = $this->client->call(Client::METHOD_POST, '/database/collections/' . $collectionId . '/documents', array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+        ], $this->getHeaders()), [
+            'data' => [
+                'ip' => '1.1.1.1',
+            ],
+            'read' => ['user:'.$this->getUser()['$id']],
+            'write' => ['user:'.$this->getUser()['$id']],
+        ]);
+
+        $goodUrl = $this->client->call(Client::METHOD_POST, '/database/collections/' . $collectionId . '/documents', array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+        ], $this->getHeaders()), [
+            'data' => [
+                'url' => 'http://www.example.com',
+            ],
+            'read' => ['user:'.$this->getUser()['$id']],
+            'write' => ['user:'.$this->getUser()['$id']],
+        ]);
+
+        $goodRange = $this->client->call(Client::METHOD_POST, '/database/collections/' . $collectionId . '/documents', array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+        ], $this->getHeaders()), [
+            'data' => [
+                'range' => 3,
+            ],
+            'read' => ['user:'.$this->getUser()['$id']],
+            'write' => ['user:'.$this->getUser()['$id']],
+        ]);
+
+        $goodFloatRange = $this->client->call(Client::METHOD_POST, '/database/collections/' . $collectionId . '/documents', array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+        ], $this->getHeaders()), [
+            'data' => [
+                'floatRange' => 1.4, 
+            ],
+            'read' => ['user:'.$this->getUser()['$id']],
+            'write' => ['user:'.$this->getUser()['$id']],
+        ]);
+
+        $notTooHigh = $this->client->call(Client::METHOD_POST, '/database/collections/' . $collectionId . '/documents', array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+        ], $this->getHeaders()), [
+            'data' => [
+                'upperBound' => 8, 
+            ],
+            'read' => ['user:'.$this->getUser()['$id']],
+            'write' => ['user:'.$this->getUser()['$id']],
+        ]);
+
+        $notTooLow = $this->client->call(Client::METHOD_POST, '/database/collections/' . $collectionId . '/documents', array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+        ], $this->getHeaders()), [
+            'data' => [
+                'lowerBound' => 8, 
+            ],
+            'read' => ['user:'.$this->getUser()['$id']],
+            'write' => ['user:'.$this->getUser()['$id']],
+        ]);
+
+        // var_dump($notTooLow);
+
+        $this->assertEquals(201, $goodEmail['headers']['status-code']);
+        $this->assertEquals(201, $goodIp['headers']['status-code']);
+        $this->assertEquals(201, $goodUrl['headers']['status-code']);
+        $this->assertEquals(201, $goodRange['headers']['status-code']);
+        $this->assertEquals(201, $goodFloatRange['headers']['status-code']);
+        $this->assertEquals(201, $notTooHigh['headers']['status-code']);
+        $this->assertEquals(201, $notTooLow['headers']['status-code']);
+
+        /*
+         * Test that custom validators reject documents
+         */
+
+        $badEmail = $this->client->call(Client::METHOD_POST, '/database/collections/' . $collectionId . '/documents', array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+        ], $this->getHeaders()), [
+            'data' => [
+                'email' => 'user@@example.com',
+            ],
+            'read' => ['user:'.$this->getUser()['$id']],
+            'write' => ['user:'.$this->getUser()['$id']],
+        ]);
+
+        $badIp = $this->client->call(Client::METHOD_POST, '/database/collections/' . $collectionId . '/documents', array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+        ], $this->getHeaders()), [
+            'data' => [
+                'ip' => '1.1.1.1.1',
+            ],
+            'read' => ['user:'.$this->getUser()['$id']],
+            'write' => ['user:'.$this->getUser()['$id']],
+        ]);
+
+        $badUrl = $this->client->call(Client::METHOD_POST, '/database/collections/' . $collectionId . '/documents', array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+        ], $this->getHeaders()), [
+            'data' => [
+                'url' => 'example...com',
+            ],
+            'read' => ['user:'.$this->getUser()['$id']],
+            'write' => ['user:'.$this->getUser()['$id']],
+        ]);
+
+        $badRange = $this->client->call(Client::METHOD_POST, '/database/collections/' . $collectionId . '/documents', array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+        ], $this->getHeaders()), [
+            'data' => [
+                'range' => 11,
+            ],
+            'read' => ['user:'.$this->getUser()['$id']],
+            'write' => ['user:'.$this->getUser()['$id']],
+        ]);
+
+        $badFloatRange = $this->client->call(Client::METHOD_POST, '/database/collections/' . $collectionId . '/documents', array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+        ], $this->getHeaders()), [
+            'data' => [
+                'floatRange' => 2.5,
+            ],
+            'read' => ['user:'.$this->getUser()['$id']],
+            'write' => ['user:'.$this->getUser()['$id']],
+        ]);
+
+        $tooHigh = $this->client->call(Client::METHOD_POST, '/database/collections/' . $collectionId . '/documents', array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+        ], $this->getHeaders()), [
+            'data' => [
+                'upperBound' => 11,
+            ],
+            'read' => ['user:'.$this->getUser()['$id']],
+            'write' => ['user:'.$this->getUser()['$id']],
+        ]);
+
+        $tooLow = $this->client->call(Client::METHOD_POST, '/database/collections/' . $collectionId . '/documents', array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+        ], $this->getHeaders()), [
+            'data' => [
+                'lowerBound' => 3,
+            ],
+            'read' => ['user:'.$this->getUser()['$id']],
+            'write' => ['user:'.$this->getUser()['$id']],
+        ]);
+
+
+        $this->assertEquals(400, $badEmail['headers']['status-code']);
+        $this->assertEquals(400, $badIp['headers']['status-code']);
+        $this->assertEquals(400, $badUrl['headers']['status-code']);
+        $this->assertEquals(400, $badRange['headers']['status-code']);
+        $this->assertEquals(400, $badFloatRange['headers']['status-code']);
+        $this->assertEquals(400, $tooHigh['headers']['status-code']);
+        $this->assertEquals(400, $tooLow['headers']['status-code']);
+        $this->assertEquals('Invalid document structure: Attribute "email" has invalid format. Value must be a valid email address', $badEmail['body']['message']);
+        $this->assertEquals('Invalid document structure: Attribute "ip" has invalid format. Value must be a valid IP address', $badIp['body']['message']);
+        $this->assertEquals('Invalid document structure: Attribute "url" has invalid format. Value must be a valid URL', $badUrl['body']['message']);
+        $this->assertEquals('Invalid document structure: Attribute "range" has invalid format. Value must be a valid range between 1 and 10', $badRange['body']['message']);
+        $this->assertEquals('Invalid document structure: Attribute "floatRange" has invalid format. Value must be a valid range between 1 and 1', $badFloatRange['body']['message']);
+        $this->assertEquals('Invalid document structure: Attribute "upperBound" has invalid format. Value must be a valid range between inf and 10', $tooHigh['body']['message']);
+        $this->assertEquals('Invalid document structure: Attribute "lowerBound" has invalid format. Value must be a valid range between 5 and inf', $tooLow['body']['message']);
+    }
+
     /**
      * @depends testDeleteDocument
      */
diff --git a/tests/e2e/Services/Database/DatabaseCustomServerTest.php b/tests/e2e/Services/Database/DatabaseCustomServerTest.php
index 9be5bcbf3b..4b63a03df6 100644
--- a/tests/e2e/Services/Database/DatabaseCustomServerTest.php
+++ b/tests/e2e/Services/Database/DatabaseCustomServerTest.php
@@ -33,24 +33,22 @@ class DatabaseCustomServerTest extends Scope
         $this->assertEquals($actors['headers']['status-code'], 201);
         $this->assertEquals($actors['body']['name'], 'Actors');
 
-        $firstName = $this->client->call(Client::METHOD_POST, '/database/collections/' . $actors['body']['$id'] . '/attributes', array_merge([
+        $firstName = $this->client->call(Client::METHOD_POST, '/database/collections/' . $actors['body']['$id'] . '/attributes/string', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
         ]), [
-            'id' => 'firstName',
-            'type' => 'string',
+            'attributeId' => 'firstName',
             'size' => 256,
             'required' => true,
         ]);
 
-        $lastName = $this->client->call(Client::METHOD_POST, '/database/collections/' . $actors['body']['$id'] . '/attributes', array_merge([
+        $lastName = $this->client->call(Client::METHOD_POST, '/database/collections/' . $actors['body']['$id'] . '/attributes/string', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
         ]), [
-            'id' => 'lastName',
-            'type' => 'string',
+            'attributeId' => 'lastName',
             'size' => 256,
             'required' => true,
         ]);
diff --git a/tests/e2e/Services/Webhooks/WebhooksBase.php b/tests/e2e/Services/Webhooks/WebhooksBase.php
index bda83bb06c..9a2db5d9f4 100644
--- a/tests/e2e/Services/Webhooks/WebhooksBase.php
+++ b/tests/e2e/Services/Webhooks/WebhooksBase.php
@@ -50,24 +50,22 @@ trait WebhooksBase
      */
     public function testCreateAttributes(array $data): array
     {
-        $firstName = $this->client->call(Client::METHOD_POST, '/database/collections/' . $data['actorsId'] . '/attributes', array_merge([
+        $firstName = $this->client->call(Client::METHOD_POST, '/database/collections/' . $data['actorsId'] . '/attributes/string', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
         ]), [
-            'id' => 'firstName',
-            'type' => 'string',
+            'attributeId' => 'firstName',
             'size' => 256,
             'required' => true,
         ]);
 
-        $lastName = $this->client->call(Client::METHOD_POST, '/database/collections/' . $data['actorsId'] . '/attributes', array_merge([
+        $lastName = $this->client->call(Client::METHOD_POST, '/database/collections/' . $data['actorsId'] . '/attributes/string', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
         ]), [
-            'id' => 'lastName',
-            'type' => 'string',
+            'attributeId' => 'lastName',
             'size' => 256,
             'required' => true,
         ]);