diff --git a/app/controllers/api/databases.php b/app/controllers/api/databases.php
index 593373bc83..e2acb30772 100644
--- a/app/controllers/api/databases.php
+++ b/app/controllers/api/databases.php
@@ -1941,7 +1941,8 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/documents')
 
         try {
             $document = $dbForProject->createDocument('database_' . $database->getInternalId() . '_collection_' . $collection->getInternalId(), new Document($data));
-            $document->setAttribute('$collection', $collectionId);
+            $document->setAttribute('$collectionId', $collectionId);
+            $document->setAttribute('$databaseId', $databaseId);
         } catch (StructureException $exception) {
             throw new Exception(Exception::DOCUMENT_INVALID_STRUCTURE, $exception->getMessage());
         } catch (DuplicateException $exception) {
@@ -2046,7 +2047,11 @@ App::get('/v1/databases/:databaseId/collections/:collectionId/documents')
         /**
          * Reset $collection attribute to remove prefix.
          */
-        $documents = array_map(fn(Document $document) => $document->setAttribute('$collection', $collectionId), $documents);
+        $documents = array_map(function (Document $document) use ($collectionId, $databaseId) {
+            $document->setAttribute('$collectionId', $collectionId);
+            $document->setAttribute('$databaseId', $databaseId);
+            return $document;
+        }, $documents);
 
         $response->dynamic(new Document([
             'total' => $total,
@@ -2110,7 +2115,8 @@ App::get('/v1/databases/:databaseId/collections/:collectionId/documents/:documen
         /**
          * Reset $collection attribute to remove prefix.
          */
-        $document->setAttribute('$collection', $collectionId);
+        $document->setAttribute('$collectionId', $collectionId);
+        $document->setAttribute('$databaseId', $databaseId);
 
         $response->dynamic($document, Response::MODEL_DOCUMENT);
     });
@@ -2329,7 +2335,8 @@ App::patch('/v1/databases/:databaseId/collections/:collectionId/documents/:docum
             /**
              * Reset $collection attribute to remove prefix.
              */
-            $document->setAttribute('$collection', $collectionId);
+            $document->setAttribute('$collectionId', $collectionId);
+            $document->setAttribute('$databaseId', $databaseId);
         } catch (AuthorizationException) {
             throw new Exception(Exception::USER_UNAUTHORIZED);
         } catch (DuplicateException) {
@@ -2421,7 +2428,8 @@ App::delete('/v1/databases/:databaseId/collections/:collectionId/documents/:docu
         /**
          * Reset $collection attribute to remove prefix.
          */
-        $document->setAttribute('$collection', $collectionId);
+        $document->setAttribute('$collectionId', $collectionId);
+        $document->setAttribute('$databaseId', $databaseId);
 
         $deletes
             ->setType(DELETE_TYPE_AUDIT)
diff --git a/app/controllers/web/console.php b/app/controllers/web/console.php
index 864ed535f2..f049b2a6ba 100644
--- a/app/controllers/web/console.php
+++ b/app/controllers/web/console.php
@@ -325,9 +325,9 @@ App::get('/console/databases/document')
     ->label('permission', 'public')
     ->label('scope', 'console')
     ->param('databaseId', '', new UID(), 'Database unique ID.')
-    ->param('collection', '', new UID(), 'Collection unique ID.')
+    ->param('collectionId', '', new UID(), 'Collection unique ID.')
     ->inject('layout')
-    ->action(function (string $databaseId, string $collection, View $layout) {
+    ->action(function (string $databaseId, string $collectionId, View $layout) {
 
         $logs = new View(__DIR__ . '/../../views/console/comps/logs.phtml');
         $logs
@@ -335,7 +335,7 @@ App::get('/console/databases/document')
             ->setParam('method', 'databases.listDocumentLogs')
             ->setParam('params', [
                 'database-id' => '{{router.params.databaseId}}',
-                'collection-id' => '{{router.params.collection}}',
+                'collection-id' => '{{router.params.collectionId}}',
                 'document-id' => '{{router.params.id}}',
             ])
         ;
@@ -352,7 +352,7 @@ App::get('/console/databases/document')
                 Database::PERMISSION_DELETE,
             ])
             ->setParam('params', [
-                'collection-id' => '{{router.params.collection}}',
+                'collection-id' => '{{router.params.collectionId}}',
                 'database-id' => '{{router.params.databaseId}}',
                 'document-id' => '{{router.params.id}}',
             ]);
@@ -362,7 +362,7 @@ App::get('/console/databases/document')
         $page
             ->setParam('new', false)
             ->setParam('database', $databaseId)
-            ->setParam('collection', $collection)
+            ->setParam('collection', $collectionId)
             ->setParam('permissions', $permissions)
             ->setParam('logs', $logs)
         ;
@@ -377,9 +377,9 @@ App::get('/console/databases/document/new')
     ->label('permission', 'public')
     ->label('scope', 'console')
     ->param('databaseId', '', new UID(), 'Database unique ID.')
-    ->param('collection', '', new UID(), 'Collection unique ID.')
+    ->param('collectionId', '', new UID(), 'Collection unique ID.')
     ->inject('layout')
-    ->action(function (string $databaseId, string $collection, View $layout) {
+    ->action(function (string $databaseId, string $collectionId, View $layout) {
 
         $permissions = new View(__DIR__ . '/../../views/console/comps/permissions-matrix.phtml');
 
@@ -392,7 +392,7 @@ App::get('/console/databases/document/new')
                 Database::PERMISSION_DELETE,
             ])
             ->setParam('params', [
-                'collection-id' => '{{router.params.collection}}',
+                'collection-id' => '{{router.params.collectionId}}',
                 'database-id' => '{{router.params.databaseId}}',
                 'document-id' => '{{router.params.id}}',
             ]);
@@ -402,7 +402,7 @@ App::get('/console/databases/document/new')
         $page
             ->setParam('new', true)
             ->setParam('database', $databaseId)
-            ->setParam('collection', $collection)
+            ->setParam('collection', $collectionId)
             ->setParam('permissions', $permissions)
             ->setParam('logs', new View())
         ;
diff --git a/app/views/console/databases/collection.phtml b/app/views/console/databases/collection.phtml
index 652439857a..3921c5cbe6 100644
--- a/app/views/console/databases/collection.phtml
+++ b/app/views/console/databases/collection.phtml
@@ -89,11 +89,11 @@ $permissions = $this->getParam('permissions', null);
                                     <template x-for="doc in documents">
                                         <tr>
                                             <td data-title="$id: ">
-                                                <a :href="`/console/databases/document?id=${doc.$id}&collection=${doc.$collection}&databaseId=${databaseId}&project=${project}`" x-text="doc.$id"></a>
+                                                <a :href="`/console/databases/document?id=${doc.$id}&collectionId=${doc.$collectionId}&databaseId=${databaseId}&project=${project}`" x-text="doc.$id"></a>
                                             </td>
                                             <template x-for="attr in attributes">
                                                 <td x-show="attr.status === 'available'" :data-title="attr.key + ':'">
-                                                    <a :href="`/console/databases/document?id=${doc.$id}&collection=${doc.$collection}&databaseId=${databaseId}&project=${project}`">
+                                                    <a :href="`/console/databases/document?id=${doc.$id}&collectionId=${doc.$collectionId}&databaseId=${databaseId}&project=${project}`">
                                                         <span x-text="doc[attr.key] ?? 'n/a'"></span>
                                                     </a>
                                                 </td>
@@ -136,7 +136,7 @@ $permissions = $this->getParam('permissions', null);
                         </form>
                     </div>
 
-                    <a data-ls-if="0 < {{project-collection.attributes.length}}" data-ls-attrs="href=/console/databases/document/new?collection={{router.params.id}}&databaseId={{router.params.databaseId}}&project={{router.params.project}}" class="button">
+                    <a data-ls-if="0 < {{project-collection.attributes.length}}" data-ls-attrs="href=/console/databases/document/new?collectionId={{router.params.id}}&databaseId={{router.params.databaseId}}&project={{router.params.project}}" class="button">
                         Add Document
                     </a>
                     <a data-ls-if="!{{project-collection.attributes.length}}" data-ls-attrs="href=/console/databases/collection/attributes?id={{router.params.id}}&databaseId={{router.params.databaseId}}&project={{router.params.project}}" class="button">
diff --git a/app/views/console/databases/document.phtml b/app/views/console/databases/document.phtml
index 36b9a1f099..84fa632aef 100644
--- a/app/views/console/databases/document.phtml
+++ b/app/views/console/databases/document.phtml
@@ -7,7 +7,7 @@ $permissions = $this->getParam('permissions', null);
 ?>
 <div
     data-service="databases.getCollection"
-    data-param-collection-id="{{router.params.collection}}"
+    data-param-collection-id="{{router.params.collectionId}}"
     data-param-database-id="{{router.params.databaseId}}"
     data-scope="sdk"
     data-event="load,databases.updateDocument"
@@ -15,7 +15,7 @@ $permissions = $this->getParam('permissions', null);
 
     <div
         data-service="databases.getDocument"
-        data-param-collection-id="{{router.params.collection}}"
+        data-param-collection-id="{{router.params.collectionId}}"
         data-param-database-id="{{router.params.databaseId}}"
         data-param-document-id="{{router.params.id}}"
         data-scope="sdk"
@@ -25,7 +25,7 @@ $permissions = $this->getParam('permissions', null);
 
         <div class="cover">
             <h1 class="zone xl margin-bottom-large">
-                <a data-ls-attrs="href=/console/databases/collection?id={{router.params.collection}}&databaseId={{router.params.databaseId}}&project={{router.params.project}}" class="back text-size-small link-return-animation--start"><i class="icon-left-open"></i> <span data-ls-bind="{{project-collection.name}}"></span></a>
+                <a data-ls-attrs="href=/console/databases/collection?id={{router.params.collectionId}}&databaseId={{router.params.databaseId}}&project={{router.params.project}}" class="back text-size-small link-return-animation--start"><i class="icon-left-open"></i> <span data-ls-bind="{{project-collection.name}}"></span></a>
 
                 <br />
 
@@ -48,7 +48,7 @@ $permissions = $this->getParam('permissions', null);
 
         <div class="zone xl margin-bottom-no">
             <ul class="phases clear" data-ui-phases data-selected="{{router.params.tab}}">
-                <li data-state="/console/databases/document?id={{router.params.id}}&collection={{router.params.collection}}&databaseId={{router.params.databaseId}}&project={{router.params.project}}">
+                <li data-state="/console/databases/document?id={{router.params.id}}&collectionId={{router.params.collectionId}}&databaseId={{router.params.databaseId}}&project={{router.params.project}}">
                     <h2 class="margin-bottom">Overview</h2>
 
                     <div class="row responsive">
@@ -362,7 +362,7 @@ $permissions = $this->getParam('permissions', null);
 
                             <label>Collection ID</label>
                             <div class="input-copy margin-bottom">
-                                <input type="text" autocomplete="off" placeholder="" data-ls-bind="{{router.params.collection}}" disabled data-forms-copy class="margin-bottom-no" />
+                                <input type="text" autocomplete="off" placeholder="" data-ls-bind="{{router.params.collectionId}}" disabled data-forms-copy class="margin-bottom-no" />
                             </div>
 
                             <label>Database ID</label>
@@ -395,13 +395,13 @@ $permissions = $this->getParam('permissions', null);
                                     data-service="databases.deleteDocument"
                                     data-event="submit"
                                     data-param-database-id="{{router.params.databaseId}}"
-                                    data-param-collection-id="{{router.params.collection}}"
+                                    data-param-collection-id="{{router.params.collectionId}}"
                                     data-param-document-id="{{project-document.$id}}"
                                     data-confirm="Are you sure you want to delete this document?"
                                     data-success="alert,trigger,redirect"
                                     data-success-param-alert-text="Document deleted successfully"
                                     data-success-param-trigger-events="databases.deleteDocument"
-                                    data-success-param-redirect-url="/console/databases/collection?id={{router.params.collection}}&project={{router.params.project}}&databaseId={{router.params.databaseId}}"
+                                    data-success-param-redirect-url="/console/databases/collection?id={{router.params.collectionId}}&project={{router.params.project}}&databaseId={{router.params.databaseId}}"
                                     data-failure="alert"
                                     data-failure-param-alert-text="Failed to delete collection"
                                     data-failure-param-alert-classname="error">
@@ -413,7 +413,7 @@ $permissions = $this->getParam('permissions', null);
                     </div>
                 </li>
                 <?php if(!$new): ?>
-                    <li data-state="/console/databases/document/activity?id={{router.params.id}}&collection={{router.params.collection}}&project={{router.params.project}}&databaseId={{router.params.databaseId}}">
+                    <li data-state="/console/databases/document/activity?id={{router.params.id}}&collectionId={{router.params.collectionId}}&project={{router.params.project}}&databaseId={{router.params.databaseId}}">
                         <h2>Activity</h2>
 
                         <?php echo $logs->render(); ?>
diff --git a/app/views/console/databases/form.phtml b/app/views/console/databases/form.phtml
index 4012679024..963950e881 100644
--- a/app/views/console/databases/form.phtml
+++ b/app/views/console/databases/form.phtml
@@ -15,7 +15,7 @@ $array = $this->getParam('array', false);
 
 <?php if($parent): ?>
 <input name="documentId" type="hidden" data-ls-bind="{{router.params.id}}" />
-<input name="collectionId" type="hidden" data-ls-bind="{{router.params.collection}}" />
+<input name="collectionId" type="hidden" data-ls-bind="{{router.params.collectionId}}" />
 <?php else: ?>
 <?php  /*<div class="margin-bottom-small text-size-small" data-ls-if="({{<?php echo $this->escape($namespace); ?>.$id}})">
     <span data-ls-bind="Document #{{<?php echo $this->escape($namespace); ?>.$id}}"></span> &nbsp;
diff --git a/src/Appwrite/Messaging/Adapter/Realtime.php b/src/Appwrite/Messaging/Adapter/Realtime.php
index 2f663c682f..9151a5c0b5 100644
--- a/src/Appwrite/Messaging/Adapter/Realtime.php
+++ b/src/Appwrite/Messaging/Adapter/Realtime.php
@@ -286,8 +286,8 @@ class Realtime extends Adapter
                     }
 
                     $channels[] = 'documents';
-                    $channels[] = 'databases.' . $database->getId() .  '.collections.' . $payload->getCollection() . '.documents';
-                    $channels[] = 'databases.' . $database->getId() . '.collections.' . $payload->getCollection() . '.documents.' . $payload->getId();
+                    $channels[] = 'databases.' . $database->getId() .  '.collections.' . $payload->getAttribute('$collectionId') . '.documents';
+                    $channels[] = 'databases.' . $database->getId() . '.collections.' . $payload->getAttribute('$collectionId') . '.documents.' . $payload->getId();
 
                     $roles = $collection->getAttribute('documentSecurity', false)
                         ? \array_merge($collection->getRead(), $payload->getRead())
diff --git a/src/Appwrite/Utopia/Response/Model/Document.php b/src/Appwrite/Utopia/Response/Model/Document.php
index c845c27a48..e1d393587c 100644
--- a/src/Appwrite/Utopia/Response/Model/Document.php
+++ b/src/Appwrite/Utopia/Response/Model/Document.php
@@ -36,12 +36,18 @@ class Document extends Any
                 'default' => '',
                 'example' => '5e5ea5c16897e',
             ])
-            ->addRule('$collection', [
+            ->addRule('$collectionId', [
                 'type' => self::TYPE_STRING,
                 'description' => 'Collection ID.',
                 'default' => '',
                 'example' => '5e5ea5c15117e',
             ])
+            ->addRule('$databaseId', [
+                'type' => self::TYPE_STRING,
+                'description' => 'Database ID.',
+                'default' => '',
+                'example' => '5e5ea5c15117e',
+            ])
             ->addRule('$createdAt', [
                 'type' => self::TYPE_DATETIME,
                 'description' => 'Document creation date in ISO 8601 format.',
@@ -60,13 +66,13 @@ class Document extends Any
                 'default' => '',
                 'example' => ['read("any")'],
                 'array' => true,
-            ])
-        ;
+            ]);
     }
 
     public function filter(DatabaseDocument $document): DatabaseDocument
     {
         $document->removeAttribute('$internalId');
+        $document->removeAttribute('$collection'); // $collection is the internal collection ID
 
         return $document;
     }
diff --git a/tests/e2e/Services/Databases/DatabasesBase.php b/tests/e2e/Services/Databases/DatabasesBase.php
index bcf8168131..fc3cf161e8 100644
--- a/tests/e2e/Services/Databases/DatabasesBase.php
+++ b/tests/e2e/Services/Databases/DatabasesBase.php
@@ -938,6 +938,9 @@ trait DatabasesBase
         ]);
 
         $this->assertEquals(201, $document1['headers']['status-code']);
+        $this->assertEquals($data['moviesId'], $document1['body']['$collectionId']);
+        $this->assertArrayNotHasKey('$collection', $document1['body']);
+        $this->assertEquals($databaseId, $document1['body']['$databaseId']);
         $this->assertEquals($document1['body']['title'], 'Captain America');
         $this->assertEquals($document1['body']['releaseYear'], 1944);
         $this->assertIsArray($document1['body']['$permissions']);
@@ -948,6 +951,9 @@ trait DatabasesBase
         $this->assertEquals($document1['body']['birthDay'], '1975-06-12T12:12:55.000+00:00');
 
         $this->assertEquals(201, $document2['headers']['status-code']);
+        $this->assertEquals($data['moviesId'], $document2['body']['$collectionId']);
+        $this->assertArrayNotHasKey('$collection', $document2['body']);
+        $this->assertEquals($databaseId, $document2['body']['$databaseId']);
         $this->assertEquals($document2['body']['title'], 'Spider-Man: Far From Home');
         $this->assertEquals($document2['body']['releaseYear'], 2019);
         $this->assertEquals($document2['body']['duration'], null);
@@ -960,6 +966,9 @@ trait DatabasesBase
         $this->assertEquals($document2['body']['birthDay'], null);
 
         $this->assertEquals(201, $document3['headers']['status-code']);
+        $this->assertEquals($data['moviesId'], $document3['body']['$collectionId']);
+        $this->assertArrayNotHasKey('$collection', $document3['body']);
+        $this->assertEquals($databaseId, $document3['body']['$databaseId']);
         $this->assertEquals($document3['body']['title'], 'Spider-Man: Homecoming');
         $this->assertEquals($document3['body']['releaseYear'], 2017);
         $this->assertEquals($document3['body']['duration'], 0);
@@ -968,7 +977,7 @@ trait DatabasesBase
         $this->assertCount(2, $document3['body']['actors']);
         $this->assertEquals($document3['body']['actors'][0], 'Tom Holland');
         $this->assertEquals($document3['body']['actors'][1], 'Zendaya Maree Stoermer');
-        $this->assertEquals($document3['body']['birthDay'], '1975-06-12T18:12:55.000+00:00');// UTC for NY
+        $this->assertEquals($document3['body']['birthDay'], '1975-06-12T18:12:55.000+00:00'); // UTC for NY
 
         $this->assertEquals(400, $document4['headers']['status-code']);
 
@@ -985,7 +994,7 @@ trait DatabasesBase
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
-            'queries' => [ 'orderAsc("releaseYear")' ],
+            'queries' => ['orderAsc("releaseYear")'],
         ]);
 
         $this->assertEquals(200, $documents['headers']['status-code']);
@@ -998,14 +1007,16 @@ trait DatabasesBase
         $this->assertCount(3, $documents['body']['documents']);
 
         foreach ($documents['body']['documents'] as $document) {
-            $this->assertEquals($data['moviesId'], $document['$collection']);
+            $this->assertEquals($data['moviesId'], $document['$collectionId']);
+            $this->assertArrayNotHasKey('$collection', $document);
+            $this->assertEquals($databaseId, $document['$databaseId']);
         }
 
         $documents = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/collections/' . $data['moviesId'] . '/documents', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
-            'queries' => [ 'orderDesc("releaseYear")' ],
+            'queries' => ['orderDesc("releaseYear")'],
         ]);
 
         $this->assertEquals(200, $documents['headers']['status-code']);
@@ -1080,14 +1091,16 @@ trait DatabasesBase
     {
         $databaseId = $data['databaseId'];
         foreach ($data['documents'] as $document) {
-            $response = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/collections/' . $document['$collection'] . '/documents/' . $document['$id'], array_merge([
+            $response = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/collections/' . $document['$collectionId'] . '/documents/' . $document['$id'], array_merge([
                 'content-type' => 'application/json',
                 'x-appwrite-project' => $this->getProject()['$id'],
             ], $this->getHeaders()));
 
             $this->assertEquals(200, $response['headers']['status-code']);
             $this->assertEquals($response['body']['$id'], $document['$id']);
-            $this->assertEquals($response['body']['$collection'], $document['$collection']);
+            $this->assertEquals($document['$collectionId'], $response['body']['$collectionId']);
+            $this->assertArrayNotHasKey('$collection', $response['body']);
+            $this->assertEquals($document['$databaseId'], $response['body']['$databaseId']);
             $this->assertEquals($response['body']['title'], $document['title']);
             $this->assertEquals($response['body']['releaseYear'], $document['releaseYear']);
             $this->assertEquals($response['body']['$permissions'], $document['$permissions']);
@@ -1120,7 +1133,7 @@ trait DatabasesBase
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
-            'queries' => [ 'cursorAfter("' . $base['body']['documents'][0]['$id'] . '")' ],
+            'queries' => ['cursorAfter("' . $base['body']['documents'][0]['$id'] . '")'],
         ]);
 
         $this->assertEquals(200, $documents['headers']['status-code']);
@@ -1132,7 +1145,7 @@ trait DatabasesBase
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
-            'queries' => [ 'cursorAfter("' . $base['body']['documents'][2]['$id'] . '")' ],
+            'queries' => ['cursorAfter("' . $base['body']['documents'][2]['$id'] . '")'],
         ]);
 
         $this->assertEquals(200, $documents['headers']['status-code']);
@@ -1145,7 +1158,7 @@ trait DatabasesBase
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
-            'queries' => [ 'orderAsc("releaseYear")' ],
+            'queries' => ['orderAsc("releaseYear")'],
         ]);
 
         $this->assertEquals(200, $base['headers']['status-code']);
@@ -1158,7 +1171,7 @@ trait DatabasesBase
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
-            'queries' => [ 'cursorAfter("' . $base['body']['documents'][1]['$id'] . '")', 'orderAsc("releaseYear")' ],
+            'queries' => ['cursorAfter("' . $base['body']['documents'][1]['$id'] . '")', 'orderAsc("releaseYear")'],
         ]);
 
         $this->assertEquals(200, $documents['headers']['status-code']);
@@ -1172,7 +1185,7 @@ trait DatabasesBase
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
-            'queries' => [ 'orderDesc("releaseYear")' ],
+            'queries' => ['orderDesc("releaseYear")'],
         ]);
 
         $this->assertEquals(200, $base['headers']['status-code']);
@@ -1185,7 +1198,7 @@ trait DatabasesBase
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
-            'queries' => [ 'cursorAfter("' . $base['body']['documents'][1]['$id'] . '")', 'orderDesc("releaseYear")' ],
+            'queries' => ['cursorAfter("' . $base['body']['documents'][1]['$id'] . '")', 'orderDesc("releaseYear")'],
         ]);
 
         $this->assertEquals(200, $documents['headers']['status-code']);
@@ -1199,7 +1212,7 @@ trait DatabasesBase
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
-            'queries' => [ 'cursorAfter("unknown")' ],
+            'queries' => ['cursorAfter("unknown")'],
         ]);
 
         $this->assertEquals(400, $documents['headers']['status-code']);
@@ -1231,7 +1244,7 @@ trait DatabasesBase
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
-            'queries' => [ 'cursorBefore("' . $base['body']['documents'][2]['$id'] . '")' ],
+            'queries' => ['cursorBefore("' . $base['body']['documents'][2]['$id'] . '")'],
         ]);
 
         $this->assertEquals(200, $documents['headers']['status-code']);
@@ -1243,7 +1256,7 @@ trait DatabasesBase
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
-            'queries' => [ 'cursorBefore("' . $base['body']['documents'][0]['$id'] . '")' ],
+            'queries' => ['cursorBefore("' . $base['body']['documents'][0]['$id'] . '")'],
         ]);
 
         $this->assertEquals(200, $documents['headers']['status-code']);
@@ -1256,7 +1269,7 @@ trait DatabasesBase
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
-            'queries' => [ 'orderAsc("releaseYear")' ],
+            'queries' => ['orderAsc("releaseYear")'],
         ]);
 
         $this->assertEquals(200, $base['headers']['status-code']);
@@ -1269,7 +1282,7 @@ trait DatabasesBase
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
-            'queries' => [ 'cursorBefore("' . $base['body']['documents'][1]['$id'] . '")', 'orderAsc("releaseYear")' ],
+            'queries' => ['cursorBefore("' . $base['body']['documents'][1]['$id'] . '")', 'orderAsc("releaseYear")'],
         ]);
 
         $this->assertEquals(200, $documents['headers']['status-code']);
@@ -1283,7 +1296,7 @@ trait DatabasesBase
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
-            'queries' => [ 'orderDesc("releaseYear")' ],
+            'queries' => ['orderDesc("releaseYear")'],
         ]);
 
         $this->assertEquals(200, $base['headers']['status-code']);
@@ -1296,7 +1309,7 @@ trait DatabasesBase
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
-            'queries' => [ 'cursorBefore("' . $base['body']['documents'][1]['$id'] . '")', 'orderDesc("releaseYear")' ],
+            'queries' => ['cursorBefore("' . $base['body']['documents'][1]['$id'] . '")', 'orderDesc("releaseYear")'],
         ]);
 
         $this->assertEquals(200, $documents['headers']['status-code']);
@@ -1316,7 +1329,7 @@ trait DatabasesBase
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
-            'queries' => [ 'limit(1)', 'orderAsc("releaseYear")' ],
+            'queries' => ['limit(1)', 'orderAsc("releaseYear")'],
         ]);
 
         $this->assertEquals(200, $documents['headers']['status-code']);
@@ -1327,7 +1340,7 @@ trait DatabasesBase
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
-            'queries' => [ 'limit(2)', 'offset(1)', 'orderAsc("releaseYear")' ],
+            'queries' => ['limit(2)', 'offset(1)', 'orderAsc("releaseYear")'],
         ]);
 
         $this->assertEquals(200, $documents['headers']['status-code']);
@@ -1514,6 +1527,9 @@ trait DatabasesBase
         $id = $document['body']['$id'];
 
         $this->assertEquals(201, $document['headers']['status-code']);
+        $this->assertEquals($data['moviesId'], $document['body']['$collectionId']);
+        $this->assertArrayNotHasKey('$collection', $document['body']);
+        $this->assertEquals($databaseId, $document['body']['$databaseId']);
         $this->assertEquals($document['body']['title'], 'Thor: Ragnaroc');
         $this->assertEquals($document['body']['releaseYear'], 2017);
         $this->assertEquals(true, DateTime::isValid($document['body']['$createdAt']));
@@ -1538,7 +1554,9 @@ trait DatabasesBase
 
         $this->assertEquals(200, $document['headers']['status-code']);
         $this->assertEquals($document['body']['$id'], $id);
-        $this->assertEquals($document['body']['$collection'], $data['moviesId']);
+        $this->assertEquals($data['moviesId'], $document['body']['$collectionId']);
+        $this->assertArrayNotHasKey('$collection', $document['body']);
+        $this->assertEquals($databaseId, $document['body']['$databaseId']);
         $this->assertEquals($document['body']['title'], 'Thor: Ragnarok');
         $this->assertEquals($document['body']['releaseYear'], 2017);
         $this->assertContains(Permission::read(Role::users()), $document['body']['$permissions']);
@@ -1553,6 +1571,9 @@ trait DatabasesBase
         $id = $document['body']['$id'];
 
         $this->assertEquals(200, $document['headers']['status-code']);
+        $this->assertEquals($data['moviesId'], $document['body']['$collectionId']);
+        $this->assertArrayNotHasKey('$collection', $document['body']);
+        $this->assertEquals($databaseId, $document['body']['$databaseId']);
         $this->assertEquals($document['body']['title'], 'Thor: Ragnarok');
         $this->assertEquals($document['body']['releaseYear'], 2017);