diff --git a/package.json b/package.json
index 7b00655cd0..68bf769dc1 100644
--- a/package.json
+++ b/package.json
@@ -22,7 +22,7 @@
     },
     "dependencies": {
         "@ai-sdk/svelte": "^1.1.24",
-        "@appwrite.io/console": "https://pkg.vc/-/@appwrite/@appwrite.io/console@9c55755",
+        "@appwrite.io/console": "https://pkg.vc/-/@appwrite/@appwrite.io/console@e621876",
         "@appwrite.io/pink-icons": "0.25.0",
         "@appwrite.io/pink-icons-svelte": "https://pkg.vc/-/@appwrite/@appwrite.io/pink-icons-svelte@bbad65f",
         "@appwrite.io/pink-legacy": "^1.0.3",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 23cbb7f832..906920bf00 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -12,8 +12,8 @@ importers:
         specifier: ^1.1.24
         version: 1.1.24(svelte@5.25.3)(zod@3.24.3)
       '@appwrite.io/console':
-        specifier: https://pkg.vc/-/@appwrite/@appwrite.io/console@9c55755
-        version: https://pkg.vc/-/@appwrite/@appwrite.io/console@9c55755
+        specifier: https://pkg.vc/-/@appwrite/@appwrite.io/console@e621876
+        version: https://pkg.vc/-/@appwrite/@appwrite.io/console@e621876
       '@appwrite.io/pink-icons':
         specifier: 0.25.0
         version: 0.25.0
@@ -272,8 +272,8 @@ packages:
   '@analytics/type-utils@0.6.2':
     resolution: {integrity: sha512-TD+xbmsBLyYy/IxFimW/YL/9L2IEnM7/EoV9Aeh56U64Ify8o27HJcKjo38XY9Tcn0uOq1AX3thkKgvtWvwFQg==}
 
-  '@appwrite.io/console@https://pkg.vc/-/@appwrite/@appwrite.io/console@9c55755':
-    resolution: {tarball: https://pkg.vc/-/@appwrite/@appwrite.io/console@9c55755}
+  '@appwrite.io/console@https://pkg.vc/-/@appwrite/@appwrite.io/console@e621876':
+    resolution: {tarball: https://pkg.vc/-/@appwrite/@appwrite.io/console@e621876}
     version: 2.1.0
 
   '@appwrite.io/pink-icons-svelte@2.0.0-RC.1':
@@ -3822,7 +3822,7 @@ snapshots:
 
   '@analytics/type-utils@0.6.2': {}
 
-  '@appwrite.io/console@https://pkg.vc/-/@appwrite/@appwrite.io/console@9c55755': {}
+  '@appwrite.io/console@https://pkg.vc/-/@appwrite/@appwrite.io/console@e621876': {}
 
   '@appwrite.io/pink-icons-svelte@2.0.0-RC.1(svelte@5.25.3)':
     dependencies:
diff --git a/src/lib/actions/analytics.ts b/src/lib/actions/analytics.ts
index cfd42ae8f2..584a533fcf 100644
--- a/src/lib/actions/analytics.ts
+++ b/src/lib/actions/analytics.ts
@@ -52,7 +52,7 @@ const analytics = Analytics({
 });
 
 export function trackEvent(name: string, data: object = null): void {
-    if (!isTrackingAllowed()) {
+    if (!name || !isTrackingAllowed()) {
         return;
     }
 
@@ -76,7 +76,7 @@ export function trackEvent(name: string, data: object = null): void {
 }
 
 export function trackError(exception: Error, event: Submit): void {
-    if (exception instanceof AppwriteException && exception.type) {
+    if (exception instanceof AppwriteException && exception.type && event) {
         trackEvent(Submit.Error, {
             type: exception.type,
             form: event
@@ -148,11 +148,14 @@ export enum Click {
     ConnectRepositoryClick = 'click_connect_repository',
     CreditsRedeemClick = 'click_credits_redeem',
     CloudSignupClick = 'click_cloud_signup',
+
     DatabaseColumnDelete = 'click_column_delete',
     DatabaseIndexDelete = 'click_index_delete',
     DatabaseTableDelete = 'click_table_delete',
+    DatabaseRowDelete = 'click_row_delete',
     DatabaseDatabaseDelete = 'click_database_delete',
     DatabaseImportCsv = 'click_database_import_csv',
+
     DomainCreateClick = 'click_domain_create',
     DomainDeleteClick = 'click_domain_delete',
     DomainRetryDomainVerificationClick = 'click_domain_retry_domain_verification',
@@ -279,6 +282,7 @@ export enum Submit {
     DatabaseUpdateName = 'submit_database_update_name',
     DatabaseImportCsv = 'submit_database_import_csv',
     DatabaseBackupDelete = 'submit_database_backup_delete',
+    DatabaseBackupPolicyCreate = 'submit_database_backup_policy_create',
 
     ColumnCreate = 'submit_column_create',
     ColumnUpdate = 'submit_column_update',
@@ -289,15 +293,18 @@ export enum Submit {
     RowDelete = 'submit_row_delete',
     RowUpdate = 'submit_row_update',
     RowUpdatePermissions = 'submit_row_update_permissions',
+
     IndexCreate = 'submit_index_create',
     IndexDelete = 'submit_index_delete',
-    TableCreate = 'submit_row_create',
-    TableDelete = 'submit_row_delete',
-    TableUpdateName = 'submit_row_update_name',
-    TableUpdatePermissions = 'submit_row_update_permissions',
-    TableUpdateSecurity = 'submit_row_update_security',
-    TableUpdateEnabled = 'submit_row_update_enabled',
-    TableUpdateDisplayNames = 'submit_row_update_display_names',
+
+    TableCreate = 'submit_table_create',
+    TableDelete = 'submit_table_delete',
+    TableUpdateName = 'submit_table_update_name',
+    TableUpdatePermissions = 'submit_table_update_permissions',
+    TableUpdateSecurity = 'submit_table_update_security',
+    TableUpdateEnabled = 'submit_table_update_enabled',
+    TableUpdateDisplayNames = 'submit_table_update_display_names',
+
     FunctionCreate = 'submit_function_create',
     FunctionDelete = 'submit_function_delete',
     FunctionUpdateName = 'submit_function_update_name',
diff --git a/src/lib/components/backupRestoreBox.svelte b/src/lib/components/backupRestoreBox.svelte
index 05cb96e8f1..8c4ac61af9 100644
--- a/src/lib/components/backupRestoreBox.svelte
+++ b/src/lib/components/backupRestoreBox.svelte
@@ -57,21 +57,22 @@
     }
 
     function updateOrAddItem(payload: Payload) {
-        // todo: @itznotabug - might need a change to $table?
-        const { $id, status, $collection, policyId } = payload;
-        if ($collection === 'archives' && policyId !== null) {
+        // the internal structure still uses `$collection`,
+        // and is basically an identifier of the op. type here!
+        const { $id, status, $collection: type, policyId } = payload;
+        if (type === 'archives' && policyId !== null) {
             return;
         }
 
-        if ($collection in backupRestoreItems) {
-            const collectionMap = backupRestoreItems[$collection];
+        if (type in backupRestoreItems) {
+            const collectionMap = backupRestoreItems[type];
 
             if (collectionMap.has($id)) {
                 collectionMap.get($id).status = status;
                 if (status === 'completed') {
                     invalidate(Dependencies.BACKUPS);
 
-                    if ($collection === 'restorations') {
+                    if (type === 'restorations') {
                         const { newId, newName } =
                             collectionMap.get($id).options?.['databases']?.['database'][0] || {};
 
@@ -81,7 +82,7 @@
             } else if (status === 'pending' || status === 'processing' || status === 'uploading') {
                 collectionMap.set($id, payload);
             }
-            backupRestoreItems[$collection] = collectionMap;
+            backupRestoreItems[type] = collectionMap;
         }
     }
 
diff --git a/src/lib/helpers/faker.ts b/src/lib/helpers/faker.ts
index 421288bb3b..99444f81e3 100644
--- a/src/lib/helpers/faker.ts
+++ b/src/lib/helpers/faker.ts
@@ -1,71 +1,88 @@
+import { sdk } from '$lib/stores/sdk';
 import { faker } from '@faker-js/faker';
-import type { Columns } from '$routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/store';
+import type { NestedNumberArray } from './types';
 import { ID, type Models } from '@appwrite.io/console';
-import { sdk } from '$lib/stores/sdk';
 import { isWithinSafeRange } from '$lib/helpers/numbers';
-import type { NestedNumberArray } from './types';
+import type { DatabaseType, Field } from '$database/(entity)';
 
-export async function generateColumns(
+export async function generateFields(
     project: Models.Project,
     databaseId: string,
-    tableId: string
-): Promise<Columns[]> {
+    tableId: string,
+    databaseType: DatabaseType
+): Promise<Field[]> {
     const client = sdk.forProject(project.region, project.$id);
 
-    return await Promise.all([
-        client.tablesDB.createStringColumn({
-            databaseId,
-            tableId,
-            key: 'name',
-            size: 255,
-            required: false
-        }),
-        client.tablesDB.createEmailColumn({ databaseId, tableId, key: 'email', required: false }),
-        client.tablesDB.createIntegerColumn({
-            databaseId,
-            tableId,
-            key: 'age',
-            required: false,
-            min: 18,
-            max: 80
-        }),
-        client.tablesDB.createStringColumn({
-            databaseId,
-            tableId,
-            key: 'city',
-            size: 100,
-            required: false
-        }),
-        client.tablesDB.createStringColumn({
-            databaseId,
-            tableId,
-            key: 'description',
-            size: 1000,
-            required: false
-        }),
-        client.tablesDB.createBooleanColumn({
-            databaseId,
-            tableId,
-            key: 'active',
-            required: false
-        }),
-        client.tablesDB.createPointColumn({
-            databaseId,
-            tableId,
-            key: 'location',
-            required: false
-        }),
-        client.tablesDB.createLineColumn({
-            databaseId,
-            tableId,
-            key: 'route',
-            required: false
-        })
-    ]);
+    switch (databaseType) {
+        case 'legacy':
+        case 'tablesdb': {
+            return await Promise.all([
+                client.tablesDB.createStringColumn({
+                    databaseId,
+                    tableId,
+                    key: 'name',
+                    size: 255,
+                    required: false
+                }),
+                client.tablesDB.createEmailColumn({
+                    databaseId,
+                    tableId,
+                    key: 'email',
+                    required: false
+                }),
+                client.tablesDB.createIntegerColumn({
+                    databaseId,
+                    tableId,
+                    key: 'age',
+                    required: false,
+                    min: 18,
+                    max: 80
+                }),
+                client.tablesDB.createStringColumn({
+                    databaseId,
+                    tableId,
+                    key: 'city',
+                    size: 100,
+                    required: false
+                }),
+                client.tablesDB.createStringColumn({
+                    databaseId,
+                    tableId,
+                    key: 'description',
+                    size: 1000,
+                    required: false
+                }),
+                client.tablesDB.createBooleanColumn({
+                    databaseId,
+                    tableId,
+                    key: 'active',
+                    required: false
+                }),
+                client.tablesDB.createPointColumn({
+                    databaseId,
+                    tableId,
+                    key: 'location',
+                    required: false
+                }),
+                client.tablesDB.createLineColumn({
+                    databaseId,
+                    tableId,
+                    key: 'route',
+                    required: false
+                })
+            ]);
+        }
+
+        case 'documentsdb': /* doesn't need any fields */
+        case 'vectordb': /* vector embeddings + metadata defined at collection creation */ {
+            /* no individual field creation needed */
+            return [];
+        }
+    }
 }
 
 export function generateFakeRecords(
-    columns: Columns[],
+    fields: Field[],
     count: number
 ): {
     ids: string[];
@@ -73,7 +90,7 @@ export function generateFakeRecords(
 } {
     if (count <= 0) return { ids: [], rows: [] };
 
-    const filteredColumns = columns.filter(
+    const filteredColumns = fields.filter(
         (col) => col.type !== 'relationship' && col.status === 'available'
     );
 
@@ -108,7 +125,7 @@ export function generateFakeRecords(
             };
         } else {
             for (const column of filteredColumns) {
-                row[column.key] = generateValueForColumn(column);
+                row[column.key] = generateValueForField(column);
             }
         }
 
@@ -140,15 +157,15 @@ function generateStringValue(key: string, maxLength: number): string {
     return text.length <= maxLength ? text : text.substring(0, maxLength);
 }
 
-function generateValueForColumn(
-    column: Columns
+function generateValueForField(
+    field: Field
 ): string | number | boolean | null | Array<string | number | boolean | NestedNumberArray> {
-    if (column.array) {
+    if (field.array) {
         const arraySize = faker.number.int({ min: 1, max: 5 });
         const items: Array<string | number | NestedNumberArray | boolean> = [];
 
         for (let i = 0; i < arraySize; i++) {
-            const itemAttribute = { ...column, array: false };
+            const itemAttribute = { ...field, array: false };
             const item = generateSingleValue(itemAttribute);
             if (item !== null) {
                 items.push(item);
@@ -158,16 +175,14 @@ function generateValueForColumn(
         return items;
     }
 
-    return generateSingleValue(column);
+    return generateSingleValue(field);
 }
 
-function generateSingleValue(
-    column: Columns
-): string | number | boolean | NestedNumberArray | null {
-    switch (column.type) {
+function generateSingleValue(field: Field): string | number | boolean | NestedNumberArray | null {
+    switch (field.type) {
         case 'string': {
-            if ('format' in column && column.format) {
-                switch (column.format) {
+            if ('format' in field && field.format) {
+                switch (field.format) {
                     case 'email': {
                         return faker.internet.email();
                     }
@@ -181,7 +196,7 @@ function generateSingleValue(
                     }
 
                     case 'enum': {
-                        const enumAttr = column as Models.ColumnEnum;
+                        const enumAttr = field as Models.ColumnEnum;
                         if (enumAttr.elements?.length > 0) {
                             return faker.helpers.arrayElement(enumAttr.elements);
                         }
@@ -190,14 +205,14 @@ function generateSingleValue(
                 }
                 return '';
             } else {
-                const stringAttr = column as Models.ColumnString;
+                const stringAttr = field as Models.ColumnString;
                 const maxLength = Math.min(stringAttr.size ?? 255, 1000);
-                return generateStringValue(column.key, maxLength);
+                return generateStringValue(field.key, maxLength);
             }
         }
 
         case 'integer': {
-            const intAttr = column as Models.ColumnInteger;
+            const intAttr = field as Models.ColumnInteger;
             const min = isWithinSafeRange(intAttr.min) ? intAttr.min : 0;
             const fallbackMax = Math.max(min + 100, 100);
             const max = isWithinSafeRange(intAttr.max)
@@ -207,7 +222,7 @@ function generateSingleValue(
         }
 
         case 'double': {
-            const floatAttr = column as Models.ColumnFloat;
+            const floatAttr = field as Models.ColumnFloat;
             const min = isWithinSafeRange(floatAttr.min) ? floatAttr.min : 0;
             const fallbackMax = Math.max(min + 100, 100);
             const max = isWithinSafeRange(floatAttr.max)
diff --git a/src/lib/helpers/string.ts b/src/lib/helpers/string.ts
index 6f867f86ce..b013f2b152 100644
--- a/src/lib/helpers/string.ts
+++ b/src/lib/helpers/string.ts
@@ -23,6 +23,49 @@ export function singular(str: string): string {
     return str.replace(/s$/, '');
 }
 
+/**
+ * Given a string, returns the plural version of it.
+ *
+ * Handles common English pluralization rules:
+ * - Words ending in consonant + y → ies
+ * - Words ending in vowel + y → s
+ * - Words ending in sibilants (s, sh, ch, x, z) → es
+ * - Regular words → s
+ *
+ * @export
+ * @param {string} str
+ * @returns {string}
+ */
+export function plural(str: string): string {
+    if (!str) return str;
+
+    const lower = str.toLowerCase();
+
+    // Words ending in sibilants: s, sh, ch, x, z
+    if (
+        lower.endsWith('s') ||
+        lower.endsWith('x') ||
+        lower.endsWith('z') ||
+        lower.endsWith('ch') ||
+        lower.endsWith('sh')
+    ) {
+        return str + 'es';
+    }
+
+    // Words ending in consonant + y → ies
+    // Words ending in vowel + y → s
+    if (str.endsWith('y')) {
+        const beforeY = str.slice(-2, -1).toLowerCase();
+        if (beforeY && !['a', 'e', 'i', 'o', 'u'].includes(beforeY)) {
+            return str.slice(0, -1) + 'ies';
+        }
+        return str + 's';
+    }
+
+    // Default: add 's'
+    return str + 's';
+}
+
 /**
  * Convert a dash/underscore/space separated string to camelCase.
  *
diff --git a/src/lib/stores/navigation.ts b/src/lib/stores/navigation.ts
new file mode 100644
index 0000000000..00d165a87e
--- /dev/null
+++ b/src/lib/stores/navigation.ts
@@ -0,0 +1,36 @@
+import { resolve } from '$app/paths';
+import { goto } from '$app/navigation';
+import type { Pathname, RouteId, RouteParams } from '$app/types';
+
+// taken directly from svelte's source!
+type ResolveArgs<T extends RouteId | Pathname> = T extends RouteId
+    ? RouteParams<T> extends Record<string, never>
+        ? [route: T]
+        : [route: T, params: RouteParams<T>]
+    : [route: T];
+
+export function withPath(base: string, ...parts: string[]) {
+    // remove slashes at the end if any
+    const normalizedBase = base.replace(/\/+$/, '');
+
+    // remove slashes at the start of each part if any
+    const normalizedParts = parts.map((part) => part.replace(/^\/+/, ''));
+
+    // join em with slashes
+    return [normalizedBase, ...normalizedParts].join('/');
+}
+
+export function resolveRoute<T extends RouteId>(route: T, params?: Record<string, string>) {
+    // type cast is necessary here!
+    const resolveArgs = params ? ([route, params] as [T, RouteParams<T>]) : [route];
+
+    return resolve(...(resolveArgs as ResolveArgs<T>));
+}
+
+export function navigate<T extends RouteId>(
+    route: T,
+    params?: Record<string, string>
+): Promise<void> {
+    // type cast is necessary here!
+    return goto(resolveRoute(route, params));
+}
diff --git a/src/lib/stores/sdk.ts b/src/lib/stores/sdk.ts
index d7e0cc7b9d..bfe73f6080 100644
--- a/src/lib/stores/sdk.ts
+++ b/src/lib/stores/sdk.ts
@@ -23,6 +23,7 @@ import {
     Tokens,
     TablesDB,
     Domains,
+    DocumentsDB,
     Realtime,
     Organizations
 } from '@appwrite.io/console';
@@ -137,6 +138,7 @@ const sdkForProject = {
     migrations: new Migrations(clientProject),
     sites: new Sites(clientProject),
     tablesDB: new TablesDB(clientProject),
+    documentsDB: new DocumentsDB(clientProject),
     console: new Console(clientProject) // for suggestions API
 };
 
diff --git a/src/routes/(console)/project-[region]-[project]/databases/+page.svelte b/src/routes/(console)/project-[region]-[project]/databases/+page.svelte
index adba24b050..08f06a6ad0 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/+page.svelte
@@ -1,52 +1,59 @@
 <script lang="ts">
     import { goto } from '$app/navigation';
-    import { base } from '$app/paths';
     import { page } from '$app/state';
     import { Empty, PaginationWithLimit } from '$lib/components';
     import { Button } from '$lib/elements/forms';
     import { Container, ResponsiveContainerHeader } from '$lib/layout';
     import type { Models } from '@appwrite.io/console';
 
-    import type { PageData } from './$types';
     import Create from './create.svelte';
     import Grid from './grid.svelte';
     import { columns } from './store';
     import Table from './table.svelte';
+    import type { PageProps } from './$types';
+    import { Icon, Tooltip } from '@appwrite.io/pink-svelte';
     import { registerCommands } from '$lib/commandCenter';
     import { canWriteDatabases } from '$lib/stores/roles';
-    import { Icon, Tooltip } from '@appwrite.io/pink-svelte';
     import { IconPlus } from '@appwrite.io/pink-icons-svelte';
     import EmptySearch from '$lib/components/emptySearch.svelte';
     import { isServiceLimited } from '$lib/stores/billing';
     import { organization } from '$lib/stores/organization';
 
-    export let data: PageData;
+    import { resolveRoute } from '$lib/stores/navigation';
+
+    const { data }: PageProps = $props();
 
-    let showCreate = false;
-    const project = page.params.project;
+    let showCreate = $state(false);
+
+    const isLimited = $derived(
+        isServiceLimited('databases', $organization?.billingPlan, data.databases.total)
+    );
 
     async function handleCreate(event: CustomEvent<Models.Database>) {
         showCreate = false;
         await goto(
-            `${base}/project-${page.params.region}-${project}/databases/database-${event.detail.$id}`
+            resolveRoute('/(console)/project-[region]-[project]/databases/database-[database]', {
+                ...page.params,
+                database: event.detail.$id
+            })
         );
     }
 
-    $: isLimited = isServiceLimited('databases', $organization?.billingPlan, data.databases.total);
-
-    $: $registerCommands([
-        {
-            label: 'Create database',
-            callback: () => {
-                showCreate = true;
-            },
-            keys: ['c'],
-            disabled: showCreate || !$canWriteDatabases || isLimited,
-            icon: IconPlus,
-            group: 'databases',
-            rank: 10
-        }
-    ]);
+    $effect(() => {
+        $registerCommands([
+            {
+                label: 'Create database',
+                callback: () => {
+                    showCreate = true;
+                },
+                keys: ['c'],
+                disabled: showCreate || !$canWriteDatabases || isLimited,
+                icon: IconPlus,
+                group: 'databases',
+                rank: 10
+            }
+        ]);
+    });
 </script>
 
 <Container>
@@ -78,7 +85,7 @@
             <Grid {data} bind:showCreate />
         {:else}
             <Table
-                tables={data.tables}
+                entities={data.entities}
                 policies={data.policies}
                 databases={data.databases}
                 lastBackups={data.lastBackups} />
@@ -92,7 +99,7 @@
     {:else if data.search}
         <EmptySearch target="databases" hidePagination>
             <Button
-                href={`${base}/project-${page.params.region}-${page.params.project}/databases`}
+                href={resolveRoute('/(console)/project-[region]-[project]/databases', page.params)}
                 size="s"
                 secondary>Clear Search</Button>
         </EmptySearch>
diff --git a/src/routes/(console)/project-[region]-[project]/databases/+page.ts b/src/routes/(console)/project-[region]-[project]/databases/+page.ts
index cec0eda648..7b823fa466 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/databases/+page.ts
@@ -7,6 +7,7 @@ import type { PageLoad, RouteParams } from './$types';
 import { isSelfHosted } from '$lib/system';
 import { isCloud } from '$lib/system';
 import type { Plan } from '$lib/sdk/billing';
+import { useDatabaseSdk } from '$database/(entity)';
 
 export const load: PageLoad = async ({ url, route, depends, params, parent }) => {
     depends(Dependencies.DATABASES);
@@ -20,7 +21,7 @@ export const load: PageLoad = async ({ url, route, depends, params, parent }) =>
     // already loaded by parent.
     const { currentPlan } = await parent();
 
-    const { databases, tables, policies, lastBackups } = await fetchDatabasesAndBackups(
+    const { databases, entities, policies, lastBackups } = await fetchDatabasesAndBackups(
         limit,
         offset,
         params,
@@ -33,7 +34,7 @@ export const load: PageLoad = async ({ url, route, depends, params, parent }) =>
         limit,
         view,
         search,
-        tables,
+        entities,
         policies,
         databases,
         lastBackups
@@ -49,24 +50,24 @@ async function fetchDatabasesAndBackups(
 ) {
     const backupsEnabled = currentPlan?.backupsEnabled ?? true;
 
-    const projectSDK = sdk.forProject(params.region, params.project);
-
-    const databases = await projectSDK.tablesDB.list({
+    const databaseSdk = useDatabaseSdk(params.region, params.project);
+    const databases = await databaseSdk.list({
         queries: [Query.limit(limit), Query.offset(offset), Query.orderDesc('$createdAt')],
         search: search || undefined
     });
 
-    const tables: Record<string, string | null> = {};
+    const entities: Record<string, string | null> = {};
 
     await Promise.all(
         // TODO: backend should allow `Query.select` for perf!
-        databases.databases.map(async ({ $id }) => {
-            const res = await projectSDK.tablesDB.listTables({
+        databases.databases.map(async ({ $id, type }) => {
+            const res = await databaseSdk.listEntities({
                 databaseId: $id,
+                databaseType: type,
                 queries: [Query.limit(1), Query.orderDesc('')]
             });
 
-            tables[$id] = res.tables?.[0]?.$id ?? null;
+            entities[$id] = res.entities?.[0]?.$id ?? null;
         })
     );
 
@@ -80,7 +81,7 @@ async function fetchDatabasesAndBackups(
         ]);
     }
 
-    return { databases, tables, policies, lastBackups };
+    return { databases, entities, policies, lastBackups };
 }
 
 async function fetchPolicies(databases: Models.DatabaseList, params: RouteParams) {
diff --git a/src/routes/(console)/project-[region]-[project]/databases/breadcrumbs.svelte b/src/routes/(console)/project-[region]-[project]/databases/breadcrumbs.svelte
index 056141e765..4202af6079 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/breadcrumbs.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/breadcrumbs.svelte
@@ -1,24 +1,30 @@
 <script lang="ts">
-    import { base } from '$app/paths';
     import { page } from '$app/state';
     import { Breadcrumbs } from '$lib/layout';
-    import { organization } from '$lib/stores/organization';
-    import { project } from '../store';
+    import { resolveRoute } from '$lib/stores/navigation';
 
-    $: breadcrumbs = [
-        {
-            href: `${base}/organization-${page.data.organization?.$id}`,
-            title: $organization?.name
-        },
-        {
-            href: `${base}/project-${page.params.region}-${page.params.project}`,
-            title: $project?.name
-        },
-        {
-            href: `${base}/project-${page.params.region}-${page.params.project}/databases`,
-            title: 'Databases'
-        }
-    ];
+    const breadcrumbs = $derived.by(() => {
+        const project = page.data.project;
+        const organization = page.data.organization;
+        const organizationId = organization?.$id ?? project.teamId;
+
+        return [
+            {
+                href: resolveRoute('/(console)/organization-[organization]', {
+                    organization: organizationId
+                }),
+                title: organization?.name
+            },
+            {
+                href: resolveRoute('/(console)/project-[region]-[project]', page.params),
+                title: project?.name
+            },
+            {
+                href: resolveRoute('/(console)/project-[region]-[project]/databases', page.params),
+                title: 'Databases'
+            }
+        ];
+    });
 </script>
 
 <Breadcrumbs {breadcrumbs} />
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(entity)/helpers/analytics.ts b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(entity)/helpers/analytics.ts
new file mode 100644
index 0000000000..1999b2505f
--- /dev/null
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(entity)/helpers/analytics.ts
@@ -0,0 +1,51 @@
+import type { Page } from '@sveltejs/kit';
+
+import { useTerminology } from './terminology';
+import { Submit, Click } from '$lib/actions/analytics';
+import type { AnalyticsResult, TerminologyResult, TerminologyShape } from './types';
+
+export function useAnalytics(pageOrTerms: Page | TerminologyResult): AnalyticsResult {
+    // source is in `TerminologyResult`.
+    const terminology = 'source' in pageOrTerms ? pageOrTerms : useTerminology(pageOrTerms);
+
+    const createSubmitHandler = <TAction extends string>(termType: keyof TerminologyShape) => {
+        return (action: TAction) => {
+            const term = terminology.source[termType];
+            if (!term) {
+                throw new Error(`No ${termType} terminology found`);
+            }
+            const enumKey = `${term.title.singular}${action}`;
+            return Submit[enumKey as keyof typeof Submit];
+        };
+    };
+
+    const createClickHandler = <TAction extends string>(termType: keyof TerminologyShape) => {
+        return (action: TAction) => {
+            const term = terminology.source[termType];
+            if (!term) {
+                throw new Error(`No ${termType} terminology found`);
+            }
+            const enumKey = `Database${term.title.singular}${action}`;
+            return Click[enumKey as keyof typeof Click];
+        };
+    };
+
+    const result: AnalyticsResult = { submit: {}, click: {} };
+
+    if (terminology.entity) {
+        result.click.entity = createClickHandler('entity');
+        result.submit.entity = createSubmitHandler('entity');
+    }
+
+    if (terminology.field) {
+        result.click.field = createClickHandler('field');
+        result.submit.field = createSubmitHandler('field');
+    }
+
+    if (terminology.record) {
+        result.click.record = createClickHandler('record');
+        result.submit.record = createSubmitHandler('record');
+    }
+
+    return result;
+}
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(entity)/helpers/dependencies.ts b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(entity)/helpers/dependencies.ts
new file mode 100644
index 0000000000..b8467dde1a
--- /dev/null
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(entity)/helpers/dependencies.ts
@@ -0,0 +1,21 @@
+import type { Page } from '@sveltejs/kit';
+
+import { useTerminology } from './terminology';
+import { Dependencies } from '$lib/constants';
+import type { DependenciesResult, Term, TerminologyResult } from './types';
+
+export function useDependencies(pageOrTerms: Page | TerminologyResult): DependenciesResult {
+    // source is in `TerminologyResult`.
+    const terminology = 'source' in pageOrTerms ? pageOrTerms : useTerminology(pageOrTerms);
+
+    const getDependencies = (term: { title: Term }) => ({
+        singular: Dependencies[term.title.singular.toUpperCase() as keyof typeof Dependencies],
+        plural: Dependencies[term.title.plural.toUpperCase() as keyof typeof Dependencies]
+    });
+
+    return {
+        entity: terminology.entity ? getDependencies(terminology.entity) : undefined,
+        field: terminology.field ? getDependencies(terminology.field) : undefined,
+        record: terminology.record ? getDependencies(terminology.record) : undefined
+    };
+}
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(entity)/helpers/index.ts b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(entity)/helpers/index.ts
new file mode 100644
index 0000000000..b930cd9b8e
--- /dev/null
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(entity)/helpers/index.ts
@@ -0,0 +1,6 @@
+export * from './sdk';
+export * from './init';
+export * from './types';
+export * from './analytics';
+export * from './terminology';
+export * from './dependencies';
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(entity)/helpers/init.ts b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(entity)/helpers/init.ts
new file mode 100644
index 0000000000..bae5ea68f7
--- /dev/null
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(entity)/helpers/init.ts
@@ -0,0 +1,39 @@
+import type { Page } from '@sveltejs/kit';
+import { getContext, setContext } from 'svelte';
+import {
+    type AnalyticsResult,
+    type DatabaseSdkResult,
+    type DependenciesResult,
+    type TerminologyResult,
+    useAnalytics,
+    useDependencies,
+    useTerminology,
+    useDatabaseSdk
+} from '$database/(entity)';
+
+const TERMINOLOGIES_KEY = Symbol('terminologies');
+
+export type Terminologies = {
+    analytics: AnalyticsResult;
+    terminology: TerminologyResult;
+    dependencies: DependenciesResult;
+    databaseSdk: DatabaseSdkResult;
+};
+
+export function getTerminologies(): Terminologies {
+    return getContext<Terminologies>(TERMINOLOGIES_KEY);
+}
+
+export function setTerminologies(page: Page) {
+    setContext(TERMINOLOGIES_KEY, buildTerminologies(page));
+}
+
+function buildTerminologies(page: Page): Terminologies {
+    const terminology = useTerminology(page);
+    return {
+        terminology,
+        analytics: useAnalytics(terminology),
+        dependencies: useDependencies(terminology),
+        databaseSdk: useDatabaseSdk(page, terminology)
+    };
+}
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(entity)/helpers/sdk.ts b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(entity)/helpers/sdk.ts
new file mode 100644
index 0000000000..f062a13e74
--- /dev/null
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(entity)/helpers/sdk.ts
@@ -0,0 +1,119 @@
+import { sdk } from '$lib/stores/sdk';
+import type { Page } from '@sveltejs/kit';
+import type { TerminologyResult } from './types';
+import { type DatabaseType, type Entity, type EntityList, toSupportiveEntity } from './terminology';
+import type { Models } from '@appwrite.io/console';
+
+export type DatabaseSdkResult = {
+    list: (params: { queries?: string[]; search?: string }) => Promise<Models.DatabaseList>;
+    getEntity: (params: {
+        databaseId: string;
+        entityId: string;
+        databaseType?: DatabaseType;
+    }) => Promise<Entity>;
+    listEntities: (params: {
+        databaseId: string;
+        queries?: string[];
+        search?: string;
+        databaseType?: DatabaseType;
+    }) => Promise<EntityList>;
+    delete: (params: { databaseId: string; databaseType?: DatabaseType }) => Promise<{}>;
+};
+
+export function useDatabaseSdk(
+    regionOrPage: string | Page,
+    projectOrTerminology: string | TerminologyResult,
+    databaseType?: DatabaseType /* nullable for use at top `databases` level */
+): DatabaseSdkResult {
+    let region: string;
+    let project: string;
+    let type: DatabaseType;
+
+    if (typeof regionOrPage === 'object' && typeof projectOrTerminology === 'object') {
+        type = projectOrTerminology.type;
+        region = regionOrPage?.params?.region || '';
+        project = regionOrPage?.params?.project || '';
+    } else {
+        type = databaseType!;
+        region = regionOrPage as string;
+        project = projectOrTerminology as string;
+    }
+
+    const baseSdk = sdk.forProject(region, project);
+
+    return {
+        async list(params): Promise<Models.DatabaseList> {
+            const results = await Promise.all([
+                baseSdk.tablesDB.list(params)
+
+                // not available just yet!
+                // baseSdk.documentsDB.list(params),
+            ]);
+
+            return results.reduce(
+                (acc, curr) => ({
+                    total: acc.total + curr.total,
+                    databases: [...acc.databases, ...curr.databases]
+                }),
+                { total: 0, databases: [] as Models.Database[] }
+            );
+        },
+
+        async listEntities(params) {
+            switch (type ?? params.databaseType) {
+                case 'legacy': /* databases api */
+                case 'tablesdb': {
+                    const { total, tables } = await baseSdk.tablesDB.listTables(params);
+                    return { total, entities: tables.map(toSupportiveEntity) };
+                }
+                case 'documentsdb': {
+                    const { total, collections } =
+                        await baseSdk.documentsDB.listCollections(params);
+                    return { total, entities: collections.map(toSupportiveEntity) };
+                }
+                case 'vectordb':
+                    throw new Error(`Database type not supported yet`);
+                default:
+                    throw new Error(`Unknown database type`);
+            }
+        },
+
+        async getEntity(params) {
+            switch (type ?? params.databaseType) {
+                case 'legacy': /* databases api */
+                case 'tablesdb': {
+                    const table = await baseSdk.tablesDB.getTable({
+                        databaseId: params.databaseId,
+                        tableId: params.entityId
+                    });
+                    return toSupportiveEntity(table);
+                }
+                case 'documentsdb': {
+                    const table = await baseSdk.documentsDB.getCollection({
+                        databaseId: params.databaseId,
+                        collectionId: params.entityId
+                    });
+                    return toSupportiveEntity(table);
+                }
+                case 'vectordb':
+                    throw new Error(`Database type not supported yet`);
+                default:
+                    throw new Error(`Unknown database type`);
+            }
+        },
+
+        async delete(params) {
+            switch (type ?? params.databaseType) {
+                case 'legacy': /* databases api */
+                case 'tablesdb':
+                    return await baseSdk.tablesDB.delete(params);
+                case 'documentsdb':
+                    return await baseSdk.documentsDB.delete(params);
+                case 'vectordb':
+                    throw new Error(`Database type not supported yet`);
+                default:
+                    throw new Error(`Unknown database type`);
+            }
+        }
+    };
+}
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(entity)/helpers/terminology.ts b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(entity)/helpers/terminology.ts
new file mode 100644
index 0000000000..6fff779c4e
--- /dev/null
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(entity)/helpers/terminology.ts
@@ -0,0 +1,127 @@
+import type { Page } from '@sveltejs/kit';
+
+import { capitalize, plural } from '$lib/helpers/string';
+import { AppwriteException, type Models } from '@appwrite.io/console';
+import type { Attributes, Columns, Table } from '$database/table-[table]/store';
+import type { Term, TerminologyResult, TerminologyShape } from '$database/(entity)/helpers/types';
+
+export type DatabaseType = 'legacy' | 'tablesdb' | 'documentsdb' | 'vectordb';
+
+export type Entity = Partial<Models.Collection | Table> & {
+    indexes?: Index[];
+    fields?: (Attributes | Columns)[];
+    recordSecurity?: Models.Collection['documentSecurity'] | Models.Table['rowSecurity'];
+};
+
+export type Field = Partial<Attributes> | Partial<Columns>;
+
+export type Index = Partial<Models.Index | Models.ColumnIndex> & {
+    fields: Models.Index['attributes'] | Models.ColumnIndex['columns'];
+};
+
+export type EntityList = {
+    total: number;
+    entities: Entity[];
+};
+
+export const baseTerminology = {
+    /**
+     * this is no longer used on console so
+     * we don't really show old terminology for older databases and,
+     * therefore we use the new routes, terms and sdk for these databases.
+     */
+    legacy: {
+        entity: 'table',
+        field: 'column',
+        record: 'row'
+    },
+    tablesdb: {
+        entity: 'table',
+        field: 'column',
+        record: 'row'
+    },
+    documentsdb: {
+        entity: 'collection',
+        field: 'attribute',
+        record: 'document'
+    },
+    vectordb: {}
+} as const;
+
+const createTerm = (singular: string, pluralForm: string): Term => {
+    return { singular, plural: pluralForm };
+};
+
+// transforms a base into lower/title variants
+const createTermVariants = (baseTerm: string) => ({
+    lower: createTerm(baseTerm, plural(baseTerm)),
+    title: createTerm(capitalize(baseTerm), plural(capitalize(baseTerm)))
+});
+
+// transforms terminology for a database type
+const transformDatabaseTerms = (terms: Partial<TerminologyShape>) =>
+    Object.fromEntries(
+        Object.entries(terms).map(([key, term]) => [
+            key,
+            term ? createTermVariants(term) : undefined
+        ])
+    );
+
+// build the terminology data
+const terminologyData = Object.fromEntries(
+    Object.entries(baseTerminology).map(([dbType, terms]) => [
+        dbType,
+        transformDatabaseTerms(terms)
+    ])
+);
+
+const toIndex = (index: Models.Index | Models.ColumnIndex): Index => ({
+    ...index,
+    fields: (index as Models.Index).attributes ?? (index as Models.ColumnIndex).columns ?? []
+});
+
+/**
+ * Transforms a raw `Collection` / `Table` model to normalized `Entity`.
+ */
+export function toSupportiveEntity(raw: Models.Collection | Models.Table): Entity {
+    const isTable = 'columns' in raw;
+    const indexes = raw.indexes?.map(toIndex) ?? [];
+
+    const fields = isTable ? raw.columns : raw.attributes;
+    const recordSecurity = isTable ? raw.rowSecurity : raw.documentSecurity;
+
+    return {
+        ...raw,
+        fields,
+        recordSecurity,
+        indexes
+    } as Entity;
+}
+
+export function toRelationalField(raw: Field): Columns {
+    return raw as Columns;
+}
+
+/**
+ * @internal
+ * Use `getTerminologies()` instead when in `database-[database]` routes where context is available.
+ */
+export function useTerminology(pageOrType: Page | DatabaseType): TerminologyResult {
+    const type =
+        typeof pageOrType === 'object'
+            ? (pageOrType.data?.database?.type as DatabaseType)
+            : pageOrType;
+    if (!type) {
+        // strict check because this should always be available!
+        throw new AppwriteException('Database type is required', 500);
+    }
+
+    const dbTerminologies = terminologyData[type] || {};
+    return {
+        type,
+        source: dbTerminologies,
+        field: dbTerminologies.field,
+        record: dbTerminologies.record,
+        entity: dbTerminologies.entity
+    };
+}
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(entity)/helpers/types.ts b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(entity)/helpers/types.ts
new file mode 100644
index 0000000000..639c7412d7
--- /dev/null
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(entity)/helpers/types.ts
@@ -0,0 +1,67 @@
+import { Dependencies } from '$lib/constants';
+import { Click, Submit } from '$lib/actions/analytics';
+import { baseTerminology, type DatabaseType } from './terminology';
+
+export type TerminologyShape = {
+    entity: string;
+    field?: string;
+    record?: string;
+};
+
+export type Term = { singular: string; plural: string };
+
+export type TerminologyResult = {
+    type: DatabaseType;
+    source: {
+        entity?: { lower: Term; title: Term };
+        field?: { lower: Term; title: Term };
+        record?: { lower: Term; title: Term };
+    };
+    entity: { lower: Term; title: Term };
+    field?: { lower: Term; title: Term };
+    record?: { lower: Term; title: Term };
+};
+
+// for derived analytics!
+type ExtractActionsForPrefix<TPrefix extends string> = {
+    [K in keyof typeof Submit]: K extends `${TPrefix}${infer Action}` ? Action : never;
+}[keyof typeof Submit];
+
+type ExtractClickActionsForPrefix<TPrefix extends string> = {
+    [K in keyof typeof Click]: K extends `Database${TPrefix}${infer Action}` ? Action : never;
+}[keyof typeof Click];
+
+type TermValuesForKey<TKey extends keyof TerminologyShape> = {
+    [K in keyof typeof baseTerminology]: TKey extends keyof (typeof baseTerminology)[K]
+        ? (typeof baseTerminology)[K][TKey]
+        : never;
+}[keyof typeof baseTerminology];
+
+type SubmitActionsFor<TKey extends keyof TerminologyShape> = ExtractActionsForPrefix<
+    Capitalize<TermValuesForKey<TKey>>
+>;
+
+type ClickActionsFor<TKey extends keyof TerminologyShape> = ExtractClickActionsForPrefix<
+    Capitalize<TermValuesForKey<TKey>>
+>;
+
+export type AnalyticsResult = {
+    submit: {
+        entity?: (action: SubmitActionsFor<'entity'>) => Submit;
+        field?: (action: SubmitActionsFor<'field'>) => Submit;
+        record?: (action: SubmitActionsFor<'record'>) => Submit;
+    };
+    click: {
+        entity?: (action: ClickActionsFor<'entity'>) => Click;
+        field?: (action: ClickActionsFor<'field'>) => Click;
+        record?: (action: ClickActionsFor<'record'>) => Click;
+    };
+};
+
+// for derived dependencies!
+export type DependenciesResult = {
+    [K in keyof Omit<TerminologyResult, 'source' | 'type'>]: {
+        singular: Dependencies;
+        plural: Dependencies;
+    };
+};
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(entity)/index.ts b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(entity)/index.ts
new file mode 100644
index 0000000000..8437673d36
--- /dev/null
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(entity)/index.ts
@@ -0,0 +1,12 @@
+export * from './helpers';
+export * from './views/field';
+export * from './views/indexes';
+export * from './views/layouts';
+export * from './views/settings';
+
+export { default as Header } from './views/header.svelte';
+export { default as Breadcrumbs } from './views/breadcrumbs.svelte';
+
+export { default as Usage } from './views/usage/view.svelte';
+export { default as CreateEntity } from './views/create.svelte';
+export { default as FailedModal } from './views/failedModal.svelte';
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(entity)/views/breadcrumbs.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(entity)/views/breadcrumbs.svelte
new file mode 100644
index 0000000000..234482f610
--- /dev/null
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(entity)/views/breadcrumbs.svelte
@@ -0,0 +1,44 @@
+<script lang="ts">
+    import { page } from '$app/state';
+    import { Breadcrumbs } from '$lib/layout';
+    import { getTerminologies } from '$database/(entity)';
+    import { resolveRoute, withPath } from '$lib/stores/navigation';
+
+    const { terminology } = getTerminologies();
+
+    const entity = terminology.entity;
+    const entityType = terminology.entity.lower.singular;
+
+    const database = $derived(page.data.database);
+    const entityObject = $derived(page.data[entityType]);
+
+    const breadcrumbs = $derived.by(() => {
+        const params = page.params;
+        const entityId = params[entityType];
+        const databases = resolveRoute('/(console)/project-[region]-[project]/databases', params);
+        const databasePath = resolveRoute(
+            `/(console)/project-[region]-[project]/databases/database-[database]`,
+            params
+        );
+
+        return [
+            {
+                title: '...'
+            },
+            {
+                href: databases,
+                title: 'Databases'
+            },
+            {
+                href: databasePath,
+                title: database?.name ?? 'Database'
+            },
+            {
+                href: withPath(databasePath, `/${entityType}-${entityId}`),
+                title: entityObject?.name ?? entity.title.singular
+            }
+        ];
+    });
+</script>
+
+<Breadcrumbs {breadcrumbs} />
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/createTable.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(entity)/views/create.svelte
similarity index 50%
rename from src/routes/(console)/project-[region]-[project]/databases/database-[database]/createTable.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/(entity)/views/create.svelte
index 78f6923444..c8830a36e9 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/createTable.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(entity)/views/create.svelte
@@ -1,71 +1,78 @@
 <script lang="ts">
     import { page } from '$app/state';
-    import { Submit, trackEvent, trackError } from '$lib/actions/analytics';
-
+    import { trackEvent, trackError } from '$lib/actions/analytics';
     import { Modal, CustomId } from '$lib/components';
+    import { subNavigation } from '$lib/stores/database';
+    import { ID } from '@appwrite.io/console';
     import { Button, InputText } from '$lib/elements/forms';
     import { addNotification } from '$lib/stores/notifications';
-    import { sdk } from '$lib/stores/sdk';
-    import { ID, type Models } from '@appwrite.io/console';
-    import { subNavigation } from '$lib/stores/database';
-    import { Input as SuggestionsInput, tableColumnSuggestions } from './(suggestions)/index';
+    import {
+        Input as SuggestionsInput,
+        tableColumnSuggestions
+    } from '$database/(suggestions)/index';
+
+    import { getTerminologies } from '../helpers';
 
     let {
-        showCreate = $bindable(false),
-        onTableCreated
+        show = $bindable(false),
+        useSuggestions = true,
+        onCreateEntity
     }: {
-        showCreate: boolean;
-        onTableCreated: (table: Models.Table) => void | Promise<void>;
+        show: boolean;
+        useSuggestions?: boolean;
+        onCreateEntity: (id: string, name: string) => Promise<void>;
     } = $props();
 
-    const databaseId = page.params.database;
-    const isOnTablesPage = $derived(page.route?.id.endsWith('table-[table]'));
+    const { analytics, terminology } = getTerminologies();
+
+    const lower = terminology.entity.lower.singular;
+    const title = terminology.entity.title.singular;
+    const analyticsCreateSubmit = analytics.submit.entity('Create');
+
+    // example - `table-[table]`, `collection-[collection]`
+    const isOnEntitiesPage = $derived(page.route?.id.endsWith(`${lower}-[${lower}]`));
 
     let name = $state('');
-    let id: string = $state(null);
+    let id = $state(null);
+    let error = $state(null);
     let touchedId = $state(false);
-    let error: string = $state(null);
+    let creatingEntity = $state(false);
 
-    let creatingTable = $state(false);
+    function enableThinkingModeForSuggestions(id: string, name: string) {
+        if (!useSuggestions) return;
 
-    function enableThinkingModeForSuggestions(table: Models.Table) {
         if ($tableColumnSuggestions.enabled) {
             // if enabled, trigger thinking mode!
             tableColumnSuggestions.update((store) => ({
                 ...store,
                 thinking: true,
                 table: {
-                    id: table.$id,
-                    name: table.name
+                    id,
+                    name
                 }
             }));
         }
     }
 
-    async function createTable() {
+    async function createEntity() {
         error = null;
+        creatingEntity = true;
         try {
-            const table = await sdk
-                .forProject(page.params.region, page.params.project)
-                .tablesDB.createTable({
-                    databaseId,
-                    tableId: id ? id : ID.unique(),
-                    name
-                });
-
-            updateAndCleanup();
+            const finalId = id || ID.unique();
 
-            await onTableCreated(table);
+            // early init setup!
+            enableThinkingModeForSuggestions(finalId, name);
 
-            name = id = null;
-            showCreate = false;
-            creatingTable = false;
+            // create entity.
+            await onCreateEntity(finalId, name);
 
-            // don't wait for UI to mount!
-            enableThinkingModeForSuggestions(table);
+            // cleanup
+            updateAndCleanup();
         } catch (e) {
             error = e.message;
-            trackError(e, Submit.TableCreate);
+            trackError(e, analyticsCreateSubmit);
+        } finally {
+            creatingEntity = false;
         }
     }
 
@@ -77,7 +84,11 @@
             message: `${name} has been created`
         });
 
-        trackEvent(Submit.TableCreate, { customId: !!id });
+        trackEvent(analyticsCreateSubmit, { customId: !!id });
+
+        id = null;
+        name = '';
+        show = false;
     }
 
     function toIdFormat(str: string): string {
@@ -96,8 +107,7 @@
             id = toIdFormat(name);
         }
 
-        if (!showCreate) {
-            name = '';
+        if (!show) {
             id = null;
             error = null;
             touchedId = false;
@@ -105,7 +115,8 @@
     });
 
     $effect(() => {
-        if (showCreate && isOnTablesPage && $tableColumnSuggestions.table) {
+        // reset is OK here, we don't have to check for entity type!
+        if (show && isOnEntitiesPage && $tableColumnSuggestions.table) {
             tableColumnSuggestions.update((store) => ({
                 ...store,
                 table: null
@@ -114,11 +125,11 @@
     });
 </script>
 
-<Modal title="Create table" size="m" bind:show={showCreate} onSubmit={createTable} bind:error>
+<Modal size="m" bind:show bind:error title="Create {lower}" onSubmit={createEntity}>
     <InputText
         id="name"
         label="Name"
-        placeholder="Enter table name"
+        placeholder="Enter {lower} name"
         bind:value={name}
         autofocus
         required
@@ -133,19 +144,20 @@
         bind:id
         required={false}
         autofocus={false}
-        name="Table"
+        name={title}
         on:input={() => {
             if (!touchedId) {
                 touchedId = true;
             }
         }} />
 
-    <SuggestionsInput />
+    {#if useSuggestions}
+        <SuggestionsInput />
+    {/if}
 
     <svelte:fragment slot="footer">
-        <Button secondary disabled={creatingTable} on:click={() => (showCreate = false)}
-            >Cancel</Button>
-        <Button submit disabled={creatingTable} submissionLoader forceShowLoader={creatingTable}
+        <Button secondary disabled={creatingEntity} on:click={() => (show = false)}>Cancel</Button>
+        <Button submit disabled={creatingEntity} submissionLoader forceShowLoader={creatingEntity}
             >Create</Button>
     </svelte:fragment>
 </Modal>
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(entity)/views/failedModal.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(entity)/views/failedModal.svelte
new file mode 100644
index 0000000000..44914f7bab
--- /dev/null
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(entity)/views/failedModal.svelte
@@ -0,0 +1,25 @@
+<script lang="ts">
+    import { Modal } from '$lib/components';
+    import { Alert } from '@appwrite.io/pink-svelte';
+    import Button from '$lib/elements/forms/button.svelte';
+
+    let {
+        show = $bindable(),
+        error,
+        title,
+        header
+    }: {
+        show: boolean;
+        error: string;
+        title: string;
+        header: string;
+    } = $props();
+</script>
+
+<Modal {title} bind:show size="s">
+    <Alert.Inline title={header} status="error">{error}</Alert.Inline>
+
+    <svelte:fragment slot="footer">
+        <Button secondary on:click={() => (show = false)}>Close</Button>
+    </svelte:fragment>
+</Modal>
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(entity)/views/field/csvDisabled.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(entity)/views/field/csvDisabled.svelte
new file mode 100644
index 0000000000..9a37954a8c
--- /dev/null
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(entity)/views/field/csvDisabled.svelte
@@ -0,0 +1,16 @@
+<script lang="ts">
+    import type { Snippet } from 'svelte';
+    import { Tooltip } from '@appwrite.io/pink-svelte';
+
+    const {
+        children
+    }: {
+        children: Snippet;
+    } = $props();
+</script>
+
+<Tooltip maxWidth="12rem" portal>
+    <div>{@render children()}</div>
+
+    <div slot="tooltip">This action is disabled during import.</div>
+</Tooltip>
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(entity)/views/field/index.ts b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(entity)/views/field/index.ts
new file mode 100644
index 0000000000..dfe3a26079
--- /dev/null
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(entity)/views/field/index.ts
@@ -0,0 +1 @@
+export { default as CsvDisabled } from './csvDisabled.svelte';
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(entity)/views/header.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(entity)/views/header.svelte
new file mode 100644
index 0000000000..8258a787cd
--- /dev/null
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(entity)/views/header.svelte
@@ -0,0 +1,128 @@
+<script lang="ts">
+    import { page } from '$app/state';
+    import { Cover } from '$lib/layout';
+    import { AnimatedTitle } from '$lib/layout';
+    import { Id, Tab, Tabs } from '$lib/components';
+    import { isTabSelected } from '$lib/helpers/load';
+    import { Layout } from '@appwrite.io/pink-svelte';
+    import { type Entity, useTerminology } from '$database/(entity)';
+    import { resolveRoute, withPath } from '$lib/stores/navigation';
+
+    import { preferences } from '$lib/stores/preferences';
+    import { expandTabs } from '$database/table-[table]/store';
+
+    interface EntityTab {
+        href: string;
+        title: string;
+        event: string;
+        hasChildren?: boolean;
+    }
+
+    let {
+        entity,
+        tabs
+    }: {
+        entity: Entity;
+        tabs: EntityTab[];
+    } = $props();
+
+    /**
+     * `useTerminology` is needed because -
+     * 1. headers are initialized **before** content,
+     * 2. `getTerminologies` isn't available at that point.
+     */
+    const terminology = useTerminology(page);
+
+    const parentHref = $derived(
+        resolveRoute(
+            '/(console)/project-[region]-[project]/databases/database-[database]',
+            page.params
+        )
+    );
+
+    const basePath = $derived.by(() => {
+        const entityType = terminology.entity.lower.singular;
+        return withPath(
+            resolveRoute(
+                `/(console)/project-[region]-[project]/databases/database-[database]`,
+                page.params
+            ),
+            `${entityType}-${entity.$id}`
+        );
+    });
+
+    const nonSheetPages = $derived.by(() => {
+        const field = terminology.field.lower.plural;
+        const entityType = terminology.entity.lower.singular;
+
+        const resourceSeg = `${entityType}-[${entityType}]`;
+
+        const endings = [resourceSeg, `${resourceSeg}/${field}`, `${resourceSeg}/indexes`];
+        const isSpreadsheetPage = endings.some((end) => page.route.id?.endsWith(end));
+        return !isSpreadsheetPage;
+    });
+
+    $effect(() => {
+        if (nonSheetPages) expandTabs.set(true);
+        else {
+            expandTabs.set(preferences.getKey('tableHeaderExpanded', true));
+        }
+    });
+</script>
+
+<div class:nonSheetPages>
+    <Cover animate expanded collapsed={!$expandTabs} blocksize={$expandTabs ? '152px' : '90px'}>
+        <svelte:fragment slot="header">
+            <Layout.Stack direction="row" alignContent="center" alignItems="center" inline>
+                <AnimatedTitle href={parentHref} collapsed={!$expandTabs}>
+                    {entity.name}
+                </AnimatedTitle>
+
+                {#key entity.$id}
+                    <Id value={entity.$id} tooltipPlacement={$expandTabs ? undefined : 'right'}>
+                        {entity.$id}
+                    </Id>
+                {/key}
+            </Layout.Stack>
+        </svelte:fragment>
+
+        <div class="tabs-container" class:collapsed={!$expandTabs}>
+            <Tabs>
+                {#each tabs as tab}
+                    <Tab
+                        href={tab.href}
+                        selected={isTabSelected(tab, page.url.pathname, basePath, tabs)}
+                        event={tab.event}>
+                        {tab.title}
+                    </Tab>
+                {/each}
+            </Tabs>
+        </div>
+    </Cover>
+</div>
+
+<style lang="scss">
+    .nonSheetPages :global(.cover-container) {
+        @media (min-width: 1440px) {
+            padding-inline: 7px !important;
+        }
+
+        @media (min-width: 1728px) {
+            padding-inline: 10.25rem !important;
+        }
+    }
+
+    .tabs-container {
+        opacity: 1;
+        transition: opacity 300ms cubic-bezier(0.4, 0, 0.2, 1);
+
+        &.collapsed {
+            opacity: 0;
+            pointer-events: none;
+
+            & :global([role='tab']) {
+                cursor: default;
+            }
+        }
+    }
+</style>
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/indexes/createIndex.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(entity)/views/indexes/create.svelte
similarity index 59%
rename from src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/indexes/createIndex.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/(entity)/views/indexes/create.svelte
index f706ab7395..bd8d8984a2 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/indexes/createIndex.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(entity)/views/indexes/create.svelte
@@ -1,5 +1,14 @@
+<script module lang="ts">
+    export type CreateIndexesCallbackType = {
+        key: string;
+        type: IndexType;
+        fields: string[];
+        lengths: (number | null)[];
+        orders: string[];
+    };
+</script>
+
 <script lang="ts">
-    import { base } from '$app/paths';
     import { page } from '$app/state';
     import { goto, invalidate } from '$app/navigation';
     import { Submit, trackError, trackEvent } from '$lib/actions/analytics';
@@ -7,45 +16,56 @@
     import { Button, InputNumber, InputSelect, InputText } from '$lib/elements/forms';
     import { remove } from '$lib/helpers/array';
     import { addNotification } from '$lib/stores/notifications';
-    import { sdk } from '$lib/stores/sdk';
-    import { IndexType } from '@appwrite.io/console';
-    import { isRelationship, isSpatialType } from '../rows/store';
-    import { table, indexes } from '../store';
+    import { isRelationship, isSpatialType } from '$database/table-[table]/rows/store';
     import { Icon, Layout } from '@appwrite.io/pink-svelte';
     import { IconCalendar, IconFingerPrint, IconPlus, IconX } from '@appwrite.io/pink-icons-svelte';
     import { isSmallViewport } from '$lib/stores/viewport';
-    import { columnOptions as baseColumnOptions } from '../columns/store';
+    import { type Entity, getTerminologies } from '$database/(entity)';
+    import { resolveRoute, withPath } from '$lib/stores/navigation';
+    import { IndexType } from '@appwrite.io/console';
+    import { columnOptions as baseColumnOptions } from '$database/table-[table]/columns/store';
+    import { IndexOrder } from '$database/(suggestions)';
 
     let {
+        entity,
         showCreateIndex = $bindable(false),
-        externalColumnKey = null
+        externalFieldKey = null,
+        onCreateIndex
     }: {
+        entity: Entity;
         showCreateIndex: boolean;
-        externalColumnKey?: string;
+        externalFieldKey?: string | null;
+        onCreateIndex: (index: CreateIndexesCallbackType) => Promise<void>;
     } = $props();
 
-    const databaseId = page.params.database;
-
     let key = $state('');
-
+    let initializedForOpen = $state(false);
     let selectedType = $state<IndexType>(IndexType.Key);
 
-    let columnOptions = $derived(
-        $table.columns
-            .filter((column) => {
+    const { dependencies, terminology } = getTerminologies();
+
+    const fieldOptions = $derived(
+        entity.fields
+            .filter((field) => {
                 if (selectedType === IndexType.Spatial) {
-                    return isSpatialType(column); // keep only spatial
+                    // keep only spatial
+                    return isSpatialType(field);
                 }
-                return !isRelationship(column) && !isSpatialType(column); // keep non-relationship and non-spatial
+                // keep non-relationship and non-spatial
+                return !isRelationship(field) && !isSpatialType(field);
             })
-            .map((column) => ({
-                value: column.key,
-                label: column.key,
-                leadingIcon: baseColumnOptions.find((option) => option.type === column.type)?.icon
+            .map((field) => ({
+                value: field.key,
+                label: field.key,
+                leadingIcon: baseColumnOptions.find((option) => option.type === field.type)?.icon
             }))
     );
 
-    let columnList = $state([{ value: '', order: '', length: null }]);
+    let fieldList: Array<{
+        value: string;
+        order: IndexOrder | null;
+        length: number | null;
+    }> = $state([{ value: '', order: null, length: null }]);
 
     const types = [
         { value: IndexType.Key, label: 'Key' },
@@ -68,17 +88,17 @@
               ]
     );
 
-    // spatial type selected -> reset column list to single empty column
-    // and the column already is not spatial type
+    // spatial type selected -> reset field list to single empty field
+    // and the field already is not spatial type
     $effect(() => {
-        const firstColumn = $table.columns.find((col) => col.key === columnList.at(0)?.value);
-        if (selectedType === IndexType.Spatial && firstColumn && !isSpatialType(firstColumn)) {
-            columnList = [{ value: '', order: null, length: null }];
+        const firstField = entity.fields.find((field) => field.key === fieldList.at(0)?.value);
+        if (selectedType === IndexType.Spatial && firstField && !isSpatialType(firstField)) {
+            fieldList = [{ value: '', order: null, length: null }];
         }
     });
 
     function generateIndexKey() {
-        let indexKeys = $indexes.map((index) => index.key);
+        let indexKeys = entity.indexes.map((index) => index.key);
 
         let highestIndex = indexKeys.reduce((max, key) => {
             const match = key.match(/^index_(\d+)$/);
@@ -89,62 +109,75 @@
     }
 
     function initialize() {
-        const column = $table.columns.filter((column) => externalColumnKey === column.key);
-        const isSpatial = column.length && isSpatialType(column[0]);
-        const order = isSpatial ? null : 'ASC';
+        const field = entity.fields.filter((field) => externalFieldKey === field.key);
+        const isSpatial = field.length && isSpatialType(field[0]);
+        const order = isSpatial ? null : IndexOrder.ASC;
+
         selectedType = isSpatial ? IndexType.Spatial : IndexType.Key;
-        columnList = externalColumnKey
-            ? [{ value: externalColumnKey, order, length: null }]
+
+        fieldList = externalFieldKey
+            ? [{ value: externalFieldKey, order, length: null }]
             : [{ value: '', order, length: null }];
-        key = `index_${$indexes.length + 1}`;
+
+        key = `index_${entity.indexes.length + 1}`;
     }
 
-    const addColumnDisabled = $derived(
+    const addFieldDisabled = $derived(
         selectedType === IndexType.Spatial ||
-            !columnList.at(-1)?.value ||
-            (!columnList.at(-1)?.order && columnList.at(-1)?.order !== null)
+            !fieldList.at(-1)?.value ||
+            (!fieldList.at(-1)?.order && fieldList.at(-1)?.order !== null)
     );
 
     const isOnIndexesPage = $derived(page.route.id?.endsWith('/indexes'));
-    const navigatorPathToIndexes = $derived(
-        `${base}/project-${page.params.region}-${page.params.project}/databases/database-${databaseId}/table-${$table?.$id}/indexes`
-    );
+    const navigatorPathToIndexes = $derived.by(() => {
+        const type = terminology.entity.lower.singular;
+        const base = resolveRoute(
+            '/(console)/project-[region]-[project]/databases/database-[database]',
+            page.params
+        );
+
+        return withPath(base, `${type}-${entity.$id}`, 'indexes');
+    });
 
-    let initializedForOpen = $state(false);
     $effect(() => {
         if (showCreateIndex && !initializedForOpen) {
             initialize();
             key = generateIndexKey();
             initializedForOpen = true;
         }
+
         if (!showCreateIndex && initializedForOpen) {
             initializedForOpen = false;
         }
     });
 
     export async function create() {
-        if (!key || !selectedType || (selectedType !== IndexType.Spatial && addColumnDisabled)) {
+        const fieldType = terminology.field.lower.singular;
+
+        if (!key || !selectedType || (selectedType !== IndexType.Spatial && addFieldDisabled)) {
             addNotification({
                 type: 'error',
-                message: 'Selected column key or type invalid'
+                message: `Selected ${fieldType} key or type invalid`
             });
-            throw new Error('Selected column key or type invalid');
+            throw new Error(`Selected ${fieldType} key or type invalid`);
         }
 
         try {
-            const orders = columnList.map((a) => a.order).filter((order) => order !== null);
-            await sdk.forProject(page.params.region, page.params.project).tablesDB.createIndex({
-                databaseId,
-                tableId: $table.$id,
+            const orders = fieldList
+                .map((field) => field.order)
+                .filter((order: IndexOrder) => order !== null)
+                .map((order) => String(order));
+
+            await onCreateIndex({
                 key,
                 type: selectedType,
-                columns: columnList.map((a) => a.value),
-                lengths: columnList.map((a) => (a.length ? Number(a.length) : null)),
-                ...(orders.length ? { orders } : {})
+                fields: fieldList.map((a) => a.value),
+                lengths: fieldList.map((a) => (a.length ? Number(a.length) : null)),
+                orders: orders.length ? orders : []
             });
 
             await Promise.allSettled([
-                invalidate(Dependencies.TABLE),
+                invalidate(dependencies.entity.singular),
                 invalidate(Dependencies.DATABASE)
             ]);
 
@@ -172,11 +205,11 @@
         }
     }
 
-    function addColumn() {
-        if (addColumnDisabled) return;
+    function addField() {
+        if (addFieldDisabled) return;
 
-        // We assign instead of pushing to trigger Svelte's reactivity
-        columnList = [...columnList, { value: '', order: '', length: null }];
+        // we assign instead of pushing to trigger Svelte's reactivity
+        fieldList = [...fieldList, { value: '', order: null, length: null }];
     }
 </script>
 
@@ -189,10 +222,12 @@
     bind:value={key}
     autofocus />
 
-<InputSelect required options={types} id="type" label="Index type" bind:value={selectedType} />
+<InputSelect required id="type" options={types} label="Index type" bind:value={selectedType} />
 
 <Layout.Stack gap="s">
-    {#each columnList as column, index}
+    {@const fieldType = terminology.field.title.singular}
+    {@const fieldTypeLower = terminology.field.lower.singular}
+    {#each fieldList as field, index}
         {@const direction = $isSmallViewport ? 'column' : 'row'}
         <Layout.Stack {direction}>
             <InputSelect
@@ -214,19 +249,19 @@
                                   leadingIcon: IconCalendar
                               }
                           ]),
-                    ...columnOptions
+                    ...fieldOptions
                 ]}
-                id={`column-${index}`}
-                label={index === 0 ? 'Column' : undefined}
-                placeholder="Select column"
-                bind:value={column.value} />
+                id={`field-${index}`}
+                label={index === 0 ? fieldType : undefined}
+                placeholder="Select {fieldType}"
+                bind:value={field.value} />
 
             <InputSelect
                 options={orderOptions}
                 required
                 id={`order-${index}`}
                 label={index === 0 ? 'Order' : undefined}
-                bind:value={column.order}
+                bind:value={field.order}
                 placeholder="Select order" />
 
             {#if selectedType === IndexType.Key}
@@ -234,7 +269,7 @@
                     id={`length-${index}`}
                     label={index === 0 ? 'Length' : undefined}
                     placeholder="Enter length"
-                    bind:value={column.length} />
+                    bind:value={field.length} />
             {/if}
 
             {#if $isSmallViewport}
@@ -242,9 +277,9 @@
                     <Button
                         text
                         secondary
-                        disabled={columnList.length <= 1}
+                        disabled={fieldList.length <= 1}
                         on:click={() => {
-                            columnList = remove(columnList, index);
+                            fieldList = remove(fieldList, index);
                         }}>
                         Remove
                     </Button>
@@ -255,9 +290,9 @@
                         icon
                         size="s"
                         secondary
-                        disabled={columnList.length <= 1}
+                        disabled={fieldList.length <= 1}
                         on:click={() => {
-                            columnList = remove(columnList, index);
+                            fieldList = remove(fieldList, index);
                         }}>
                         <Icon icon={IconX} size="s" />
                     </Button>
@@ -266,9 +301,9 @@
         </Layout.Stack>
     {/each}
     <div>
-        <Button compact on:click={addColumn} disabled={addColumnDisabled}>
+        <Button compact on:click={addField} disabled={addFieldDisabled}>
             <Icon icon={IconPlus} slot="start" size="s" />
-            Add column
+            Add {fieldTypeLower}
         </Button>
     </div>
 </Layout.Stack>
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/indexes/deleteIndex.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(entity)/views/indexes/delete.svelte
similarity index 53%
rename from src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/indexes/deleteIndex.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/(entity)/views/indexes/delete.svelte
index 5916d398aa..a1f0d819fe 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/indexes/deleteIndex.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(entity)/views/indexes/delete.svelte
@@ -1,53 +1,57 @@
 <script lang="ts">
     import { addNotification } from '$lib/stores/notifications';
-    import { sdk } from '$lib/stores/sdk';
-    import type { Models } from '@appwrite.io/console';
-    import { page } from '$app/state';
     import { Submit, trackEvent, trackError } from '$lib/actions/analytics';
     import { invalidate } from '$app/navigation';
-    import { Dependencies } from '$lib/constants';
     import Confirm from '$lib/components/confirm.svelte';
+    import { getTerminologies, type Index } from '$database/(entity)';
 
     let {
         showDelete = $bindable(false),
-        selectedIndex = $bindable(null)
+        selectedIndex = $bindable(null),
+        onDeleteIndexes
     }: {
         showDelete: boolean;
-        selectedIndex: Models.ColumnIndex | string[];
+        selectedIndex: Index | string[] | null;
+        onDeleteIndexes: (selectedKeys: string[]) => Promise<void>;
     } = $props();
 
     let error: string = $state(null);
     let selectedKeys = $derived(getKeys(selectedIndex));
 
-    function getKeys(selected: Models.ColumnIndex | string[]): string[] {
+    const { dependencies } = getTerminologies();
+
+    function getKeys(selected: Index | string[] | null | undefined): string[] {
+        if (!selected) return [];
         return Array.isArray(selected) ? selected : [selected.key];
     }
 
-    async function handleDelete() {
-        try {
-            await Promise.all(
-                selectedKeys.map((key) =>
-                    sdk.forProject(page.params.region, page.params.project).tablesDB.deleteIndex({
-                        databaseId: page.params.database,
-                        tableId: page.params.table,
-                        key
-                    })
-                )
-            );
-            addNotification({
-                type: 'success',
-                message:
-                    selectedKeys.length === 1
-                        ? 'Index has been deleted'
-                        : `${selectedKeys.length} indexes have been deleted`
-            });
+    async function cleanup() {
+        // capture keys before resetting!
+        const keys = getKeys(selectedIndex);
+
+        // reset selection!
+        selectedIndex = Array.isArray(selectedIndex) ? [] : null;
 
-            trackEvent(Submit.IndexDelete);
+        showDelete = false; // hide.
 
-            await invalidate(Dependencies.TABLE);
+        // events and notif!
+        trackEvent(Submit.IndexDelete);
+        addNotification({
+            type: 'success',
+            message:
+                keys.length === 1
+                    ? 'Index has been deleted'
+                    : `${keys.length} indexes have been deleted`
+        });
 
-            showDelete = false;
-            selectedIndex = Array.isArray(selectedIndex) ? [] : null;
+        // invalidate proper dependency.
+        await invalidate(dependencies.entity.singular);
+    }
+
+    async function handleDelete() {
+        try {
+            await onDeleteIndexes(selectedKeys);
+            await cleanup();
         } catch (e) {
             error = e.message;
             trackError(e, Submit.IndexDelete);
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(entity)/views/indexes/index.ts b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(entity)/views/indexes/index.ts
new file mode 100644
index 0000000000..159874aa1b
--- /dev/null
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(entity)/views/indexes/index.ts
@@ -0,0 +1,2 @@
+export { default as Indexes } from './view.svelte';
+export { default as CreateIndex, type CreateIndexesCallbackType } from './create.svelte';
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/indexes/overviewIndex.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(entity)/views/indexes/overview.svelte
similarity index 56%
rename from src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/indexes/overviewIndex.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/(entity)/views/indexes/overview.svelte
index a3f6b74478..e47be989ef 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/indexes/overviewIndex.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(entity)/views/indexes/overview.svelte
@@ -1,13 +1,16 @@
 <script lang="ts">
     import { InputText } from '$lib/elements/forms';
     import { Layout } from '@appwrite.io/pink-svelte';
-    import type { Models } from '@appwrite.io/console';
+    import { getTerminologies, type Index } from '$database/(entity)';
 
     let {
         selectedIndex = null
     }: {
-        selectedIndex: Models.ColumnIndex;
+        selectedIndex: Index | null;
     } = $props();
+
+    const { terminology } = getTerminologies();
+    const fieldLabel = terminology.field.title.singular;
 </script>
 
 <InputText
@@ -15,35 +18,36 @@
     id="key"
     label="Index key"
     placeholder="Enter key"
-    value={selectedIndex.key}
+    value={selectedIndex?.key ?? ''}
     readonly />
+
 <InputText
     required
     id="type"
     label="Index type"
     placeholder="Select type"
-    value={selectedIndex.type}
+    value={selectedIndex?.type ?? ''}
     readonly />
 
-{#if selectedIndex?.columns?.length}
-    {#each selectedIndex.columns as column, i}
+{#if selectedIndex?.fields?.length}
+    {#each selectedIndex.fields as field, i}
         <Layout.Stack direction="row">
             <InputText
                 required
-                label={i === 0 ? 'Column' : ''}
-                id={`value-${column}`}
-                value={column}
+                label={i === 0 ? fieldLabel : ''}
+                id={`value-${field}`}
+                value={field}
                 readonly />
             <InputText
                 required
                 label={i === 0 ? 'Order' : ''}
-                id={`value-${selectedIndex.orders[i]}`}
-                value={selectedIndex.orders[i]}
+                id={`value-${selectedIndex?.orders?.[i] ?? ''}`}
+                value={selectedIndex?.orders?.[i] ?? ''}
                 readonly />
             <InputText
                 required
                 label={i === 0 ? 'Length' : ''}
-                id={`value-${selectedIndex.lengths[i]}`}
+                id={`value-${selectedIndex?.lengths?.[i] ?? ''}`}
                 value={selectedIndex.lengths[i]?.toString() ?? null}
                 readonly />
         </Layout.Stack>
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(entity)/views/indexes/view.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(entity)/views/indexes/view.svelte
new file mode 100644
index 0000000000..032575c19e
--- /dev/null
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(entity)/views/indexes/view.svelte
@@ -0,0 +1,369 @@
+<script lang="ts">
+    import { Container } from '$lib/layout';
+    import Delete from './delete.svelte';
+    import { Button } from '$lib/elements/forms';
+    import Overview from './overview.svelte';
+    import CreateIndex from './create.svelte';
+    import FailedModal from '../failedModal.svelte';
+    import { canWriteTables } from '$lib/stores/roles';
+    import {
+        ActionMenu,
+        Badge,
+        Divider,
+        FloatingActionBar,
+        Icon,
+        Layout,
+        Link,
+        Popover,
+        Spreadsheet,
+        Typography
+    } from '@appwrite.io/pink-svelte';
+    import {
+        IconDotsHorizontal,
+        IconEye,
+        IconPlus,
+        IconTrash
+    } from '@appwrite.io/pink-icons-svelte';
+    import { type ComponentProps, onMount, type Snippet } from 'svelte';
+    import { Click, trackEvent } from '$lib/actions/analytics';
+    import { isSmallViewport } from '$lib/stores/viewport';
+    import {
+        type Entity,
+        type CreateIndexesCallbackType,
+        SpreadsheetContainer,
+        SideSheet,
+        type Index,
+        getTerminologies
+    } from '$database/(entity)';
+    import { preferences } from '$lib/stores/preferences';
+    import { debounce } from '$lib/helpers/debounce';
+    import { page } from '$app/state';
+    import { realtime } from '$lib/stores/sdk';
+    import type { ColumnsWidth } from '$database/table-[table]/store';
+    import { invalidate } from '$app/navigation';
+
+    let {
+        entity,
+        onCreateIndex,
+        onDeleteIndexes,
+        emptyIndexesSheetView,
+        emptyEntitiesSheetView
+    }: {
+        entity: Entity;
+        onCreateIndex: (index: CreateIndexesCallbackType) => Promise<void>;
+        onDeleteIndexes: (indexKeys: string[]) => Promise<void>;
+        emptyIndexesSheetView: Snippet<[() => void]>;
+        emptyEntitiesSheetView?: Snippet;
+    } = $props();
+
+    let showCreateIndex = $state(false);
+    let selectedIndex: Index | null = $state(null);
+
+    let createIndex: CreateIndex;
+    let selectedIndexes = $state([]);
+
+    let error = $state('');
+    let showFailed = $state(false);
+    let showDelete = $state(false);
+    let showOverview = $state(false);
+
+    let columnsWidth: ColumnsWidth | null = $state(null);
+
+    const organizationId = $derived(page.data.organization?.$id ?? page.data.project?.teamId);
+
+    const spreadsheetColumns = $derived([
+        {
+            id: 'key',
+            width: getColumnWidth('key', $isSmallViewport ? 250 : 200),
+            minimumWidth: $isSmallViewport ? 250 : 200,
+            resizable: true
+        },
+        {
+            id: 'type',
+            width: getColumnWidth('type', 120),
+            minimumWidth: 120,
+            resizable: true
+        },
+        {
+            id: 'columns',
+            width: getColumnWidth('columns', 200),
+            minimumWidth: 200,
+            resizable: true
+        },
+        // { id: 'orders' }, // design doesn't have orders atm
+        {
+            id: 'lengths',
+            width: getColumnWidth('lengths', 180),
+            minimumWidth: 180,
+            resizable: true
+        },
+        {
+            id: 'actions',
+            width: 40,
+            isAction: true,
+            resizable: false
+        }
+    ]);
+
+    const emptyCellsLimit = $derived($isSmallViewport ? 14 : 17);
+    const emptyCellsCount = $derived(
+        entity.indexes.length >= emptyCellsLimit ? 0 : emptyCellsLimit - entity.indexes.length
+    );
+
+    const { dependencies, terminology } = getTerminologies();
+
+    onMount(() => {
+        columnsWidth = preferences.getColumnWidths(entity.$id + '#indexes');
+
+        // example: databases.*.tables.*.indexes.*
+        // example: documentsdb.*.collections.indexes.*
+        // this is needed because `documentsdb` doesn't use `database` prefix don't exist
+        const derivedEventsForIndex = `${terminology.type}.*.${terminology.entity.lower.plural}.*.indexes.*`;
+
+        return realtime.forProject(page.params.region, ['project', 'console'], (response) => {
+            if (response.events.includes(derivedEventsForIndex)) {
+                invalidate(dependencies.entity.singular);
+            }
+        });
+    });
+
+    function getEntityStatusBadge(status: string): ComponentProps<Badge>['type'] {
+        switch (status) {
+            case 'processing':
+                return 'warning';
+            case 'deleting':
+            case 'stuck':
+            case 'failed':
+                return 'error';
+            default:
+                return undefined;
+        }
+    }
+
+    function getColumnWidth(columnId: string, defaultWidth: number): number {
+        const savedWidth = columnsWidth?.[columnId];
+        if (!savedWidth) return defaultWidth;
+
+        return savedWidth.resized;
+    }
+
+    function saveColumnsWidth({ columnId, newWidth }: { columnId: string; newWidth: number }) {
+        const existing = columnsWidth?.[columnId];
+        const fixed = existing
+            ? typeof existing?.fixed === 'number'
+                ? existing.fixed
+                : existing?.fixed?.min
+            : newWidth;
+
+        columnsWidth = {
+            ...(columnsWidth ?? {}),
+            [columnId]: {
+                fixed,
+                resized: Math.ceil(newWidth)
+            }
+        };
+
+        saveColumnWidthsToPreferences({ columnId, newWidth, fixedWidth: fixed });
+    }
+
+    const saveColumnWidthsToPreferences = debounce(
+        (column: { columnId: string; newWidth: number; fixedWidth: number }) => {
+            if (!organizationId) return;
+
+            preferences.saveColumnWidths(organizationId, entity.$id + '#indexes', {
+                [column.columnId]: {
+                    fixed: column.fixedWidth,
+                    resized: Math.ceil(column.newWidth)
+                }
+            });
+        },
+        1000
+    );
+</script>
+
+<Container
+    expanded
+    expandHeightButton={$isSmallViewport}
+    style="background: var(--bgcolor-neutral-primary)">
+    <Layout.Stack direction="row" justifyContent="flex-end">
+        {#if $canWriteTables}
+            <Button
+                secondary
+                event="create_index"
+                disabled={!entity.fields?.length}
+                on:click={() => (showCreateIndex = true)}>
+                <Icon icon={IconPlus} slot="start" size="s" />
+                Create index
+            </Button>
+        {/if}
+    </Layout.Stack>
+</Container>
+
+<div class="databases-spreadsheet">
+    {#if entity.fields?.length}
+        {#if entity.indexes.length}
+            <SpreadsheetContainer>
+                <Spreadsheet.Root
+                    let:root
+                    height="100%"
+                    allowSelection
+                    columns={spreadsheetColumns}
+                    emptyCells={emptyCellsCount}
+                    bind:selectedRows={selectedIndexes}
+                    bottomActionClick={() => (showCreateIndex = true)}
+                    on:columnsResize={(resize) => saveColumnsWidth(resize.detail)}>
+                    <svelte:fragment slot="header" let:root>
+                        <Spreadsheet.Header.Cell column="key" {root}>Key</Spreadsheet.Header.Cell>
+                        <Spreadsheet.Header.Cell column="type" {root}>Type</Spreadsheet.Header.Cell>
+                        <Spreadsheet.Header.Cell column="columns" {root}
+                            >{terminology.field.title.singular}</Spreadsheet.Header.Cell>
+                        <!--<Spreadsheet.Header.Cell column="orders" {root}
+                            >Orders</Spreadsheet.Header.Cell>-->
+                        <Spreadsheet.Header.Cell column="lengths" {root}
+                            >Lengths</Spreadsheet.Header.Cell>
+                        <Spreadsheet.Header.Cell column="actions" {root} />
+                    </svelte:fragment>
+
+                    {#each entity.indexes as index (index.key)}
+                        <Spreadsheet.Row.Base {root} id={index.key}>
+                            <Spreadsheet.Cell column="key" {root} isEditable={false}>
+                                <Layout.Stack direction="row" alignItems="center">
+                                    {index.key}
+                                    {#if index.status !== 'available'}
+                                        <Badge
+                                            size="s"
+                                            variant="secondary"
+                                            content={index.status}
+                                            type={getEntityStatusBadge(index.status)} />
+                                        {#if index.error}
+                                            <Link.Button
+                                                variant="muted"
+                                                on:click={(e) => {
+                                                    e.preventDefault();
+                                                    error = index.error;
+                                                    showFailed = true;
+                                                }}>Details</Link.Button>
+                                        {/if}
+                                    {/if}
+                                </Layout.Stack>
+                            </Spreadsheet.Cell>
+                            <Spreadsheet.Cell column="type" {root} isEditable={false}
+                                >{index.type}</Spreadsheet.Cell>
+                            <Spreadsheet.Cell column="columns" {root} isEditable={false}>
+                                {index.fields.join(', ')}
+                            </Spreadsheet.Cell>
+                            <!--<Spreadsheet.Cell column="orders" {root} isEditable={false}>
+                                {index.orders}
+                            </Spreadsheet.Cell>-->
+                            <Spreadsheet.Cell column="lengths" {root} isEditable={false}>
+                                {index.lengths}
+                            </Spreadsheet.Cell>
+                            <Spreadsheet.Cell column="actions" {root}>
+                                <Popover let:toggle padding="none" placement="bottom-end" portal>
+                                    <Button text icon ariaLabel="more options" on:click={toggle}>
+                                        <Icon icon={IconDotsHorizontal} size="s" />
+                                    </Button>
+                                    <ActionMenu.Root slot="tooltip" let:toggle>
+                                        <ActionMenu.Item.Button
+                                            leadingIcon={IconEye}
+                                            on:click={() => {
+                                                toggle();
+                                                selectedIndex = index;
+                                                showOverview = true;
+                                            }}>Overview</ActionMenu.Item.Button>
+
+                                        <div style:padding-block="0.25rem">
+                                            <Divider />
+                                        </div>
+
+                                        <ActionMenu.Item.Button
+                                            status="danger"
+                                            leadingIcon={IconTrash}
+                                            on:click={() => {
+                                                toggle();
+                                                showDelete = true;
+                                                selectedIndex = index;
+                                                trackEvent(Click.DatabaseIndexDelete);
+                                            }}>Delete</ActionMenu.Item.Button>
+                                    </ActionMenu.Root>
+                                </Popover>
+                            </Spreadsheet.Cell>
+                        </Spreadsheet.Row.Base>
+                    {/each}
+
+                    <svelte:fragment slot="footer">
+                        <Layout.Stack
+                            direction="row"
+                            alignContent="center"
+                            alignItems="center"
+                            justifyContent="space-between">
+                            <Typography.Text variant="m-400" color="--fgcolor-neutral-secondary">
+                                {@const length = entity.indexes.length}
+                                {length}
+                                {length === 1 ? 'index' : 'indexes'}
+                            </Typography.Text>
+                        </Layout.Stack>
+                    </svelte:fragment>
+                </Spreadsheet.Root>
+            </SpreadsheetContainer>
+        {:else}
+            {@render emptyIndexesSheetView(() => (showCreateIndex = true))}
+        {/if}
+    {:else}
+        {@render emptyEntitiesSheetView?.()}
+    {/if}
+
+    {#if selectedIndexes.length > 0}
+        <div class="floating-action-bar">
+            <FloatingActionBar>
+                <svelte:fragment slot="start">
+                    <div style:width="max-content">
+                        <Layout.Stack direction="row" alignItems="center" gap="m">
+                            <Badge content={selectedIndexes.length.toString()} />
+                            <span style:font-size="14px">
+                                {selectedIndexes.length > 1 ? 'indexes' : 'index'}
+                                selected
+                            </span>
+                        </Layout.Stack>
+                    </div>
+                </svelte:fragment>
+                <svelte:fragment slot="end">
+                    <Button text on:click={() => (selectedIndexes = [])}>Cancel</Button>
+                    <Button secondary on:click={() => (showDelete = true)}>Delete</Button>
+                </svelte:fragment>
+            </FloatingActionBar>
+        </div>
+    {/if}
+</div>
+
+<SideSheet
+    title="Create index"
+    bind:show={showCreateIndex}
+    submit={{
+        text: 'Create',
+        onClick: async () => await createIndex.create()
+    }}>
+    <CreateIndex {entity} {onCreateIndex} {showCreateIndex} bind:this={createIndex} />
+</SideSheet>
+
+{#if selectedIndex}
+    <Delete bind:showDelete {onDeleteIndexes} bind:selectedIndex />
+{:else if selectedIndexes && selectedIndexes.length}
+    <Delete bind:showDelete {onDeleteIndexes} bind:selectedIndex={selectedIndexes} />
+{/if}
+
+<SideSheet title="Preview index" bind:show={showOverview}>
+    <Overview {selectedIndex} />
+</SideSheet>
+
+<FailedModal {error} bind:show={showFailed} title="Create index" header="Creation failed" />
+
+<style lang="scss">
+    .floating-action-bar {
+        left: 50%;
+        width: 100%;
+        z-index: 14;
+        position: absolute;
+        transform: translateX(-50%);
+    }
+</style>
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/layout/emptySheet.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(entity)/views/layouts/empty.svelte
similarity index 95%
rename from src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/layout/emptySheet.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/(entity)/views/layouts/empty.svelte
index c77dd08d82..640bb39351 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/layout/emptySheet.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(entity)/views/layouts/empty.svelte
@@ -11,27 +11,21 @@
     import { isSmallViewport, isTabletViewport } from '$lib/stores/viewport';
     import { SortButton } from '$lib/components';
     import type { Column } from '$lib/helpers/types';
-    import {
-        tableColumns,
-        columnsOrder,
-        showCreateColumnSheet,
-        spreadsheetLoading,
-        expandTabs
-    } from '../store';
-    import SpreadsheetContainer from './spreadsheet.svelte';
+    import { SpreadsheetContainer } from '$database/(entity)';
     import { onDestroy, onMount, type Snippet } from 'svelte';
     import { debounce } from '$lib/helpers/debounce';
-    import { columnOptions } from '../columns/store';
+    import { expandTabs, spreadsheetLoading } from '$database/table-[table]/store';
 
     type Mode = 'rows' | 'rows-filtered' | 'indexes';
 
     const {
         mode,
-        customColumns = [],
         title,
-        subtitle,
         actions,
-        showActions
+        subtitle,
+        showActions = true,
+        customColumns = [],
+        onOpenCreateColumn
     } = $props<{
         mode: Mode;
         customColumns?: Column[];
@@ -39,6 +33,7 @@
         subtitle?: Snippet;
         actions?: Snippet;
         showActions?: boolean;
+        onOpenCreateColumn?: () => Promise<void> | void;
     }>();
 
     let spreadsheetContainer: HTMLElement;
@@ -116,7 +111,6 @@
         customColumns.map((col: Column) => ({
             ...col,
             hide: false,
-            icon: columnOptions.find((colOpt) => colOpt.type === col?.type)?.icon,
             ...baseColProps
         }));
 
@@ -272,10 +266,7 @@
                                 variant="extra-compact"
                                 onclick={() => {
                                     if (mode === 'rows') {
-                                        $showCreateColumnSheet.show = true;
-                                        $showCreateColumnSheet.title = 'Create column';
-                                        $showCreateColumnSheet.columns = $tableColumns;
-                                        $showCreateColumnSheet.columnsOrder = $columnsOrder;
+                                        onOpenCreateColumn?.();
                                     }
                                 }}>
                                 <Icon icon={IconPlus} color="--fgcolor-neutral-primary" />
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/layout/emptySheetCards.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(entity)/views/layouts/emptySheetCards.svelte
similarity index 100%
rename from src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/layout/emptySheetCards.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/(entity)/views/layouts/emptySheetCards.svelte
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(entity)/views/layouts/index.ts b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(entity)/views/layouts/index.ts
new file mode 100644
index 0000000000..36dbcca040
--- /dev/null
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(entity)/views/layouts/index.ts
@@ -0,0 +1,4 @@
+export { default as EmptySheet } from './empty.svelte';
+export { default as SideSheet } from './sidesheet.svelte';
+export { default as EmptySheetCards } from './emptySheetCards.svelte';
+export { default as SpreadsheetContainer } from './spreadsheet.svelte';
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/layout/sidesheet.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(entity)/views/layouts/sidesheet.svelte
similarity index 98%
rename from src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/layout/sidesheet.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/(entity)/views/layouts/sidesheet.svelte
index afe51be679..c0b525c612 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/layout/sidesheet.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(entity)/views/layouts/sidesheet.svelte
@@ -57,9 +57,9 @@
     let submitting = $state(writable(false));
 
     let copyText = $state(undefined);
-    beforeNavigate(() => {
-        show = false;
-    });
+
+    // hide on a nav trigger!
+    beforeNavigate(() => (show = false));
 </script>
 
 <div class="sheet-container" data-side-sheet-visible={show} {...restProps}>
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/layout/spreadsheet.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(entity)/views/layouts/spreadsheet.svelte
similarity index 98%
rename from src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/layout/spreadsheet.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/(entity)/views/layouts/spreadsheet.svelte
index 185f2aec78..30483eb680 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/layout/spreadsheet.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(entity)/views/layouts/spreadsheet.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
     import { debounce } from '$lib/helpers/debounce';
-    import { scrollStore, sheetHeightStore } from '../store';
+    import { scrollStore, sheetHeightStore } from './store';
     import { onMount, onDestroy, type Snippet, tick } from 'svelte';
 
     let {
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(entity)/views/layouts/store.ts b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(entity)/views/layouts/store.ts
new file mode 100644
index 0000000000..b1d1ca96f5
--- /dev/null
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(entity)/views/layouts/store.ts
@@ -0,0 +1,5 @@
+import { writable } from 'svelte/store';
+
+export const scrollStore = writable(null);
+
+export const sheetHeightStore = writable('74.5vh');
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(entity)/views/settings/danger.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(entity)/views/settings/danger.svelte
new file mode 100644
index 0000000000..e55d6c604e
--- /dev/null
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(entity)/views/settings/danger.svelte
@@ -0,0 +1,98 @@
+<script lang="ts">
+    import { Button } from '$lib/elements/forms';
+    import { toLocaleDateTime } from '$lib/helpers/date';
+    import { getTerminologies } from '$database/(entity)';
+    import { Typography } from '@appwrite.io/pink-svelte';
+    import { trackError, trackEvent } from '$lib/actions/analytics';
+    import { BoxAvatar, CardGrid, Confirm } from '$lib/components';
+    import { subNavigation } from '$lib/stores/database';
+    import { addNotification } from '$lib/stores/notifications';
+    import { preferences } from '$lib/stores/preferences';
+    import { navigate } from '$lib/stores/navigation';
+    import { page } from '$app/state';
+    import { organization } from '$lib/stores/organization';
+    import type { Entity } from '$database/(entity)/helpers';
+    import { invalidate } from '$app/navigation';
+
+    let {
+        entity,
+        onDelete
+    }: {
+        entity: Entity;
+        onDelete: () => Promise<void>;
+    } = $props();
+
+    let show: boolean = $state(false);
+    let error: string | null = $state(null);
+
+    const { analytics, dependencies, terminology } = getTerminologies();
+
+    const type = terminology.entity.lower.singular;
+    const records = terminology.record.lower.plural;
+
+    async function cleanup() {
+        show = false; // hide.
+        subNavigation.update(); // update the side entity table.
+
+        // events and notif!
+        trackEvent(analytics.submit.entity('Delete'));
+        addNotification({ type: 'success', message: `${entity.name} has been deleted` });
+
+        // clear out!
+        await Promise.all([
+            preferences.deleteTableDetails($organization.$id, entity.$id),
+            navigate(
+                '/(console)/project-[region]-[project]/databases/database-[database]',
+                page.params
+            )
+        ]);
+
+        // invalidate proper dependency.
+        await invalidate(dependencies.entity.singular);
+    }
+
+    async function deleteEntity() {
+        try {
+            await onDelete();
+            await cleanup();
+        } catch (e) {
+            error = e.message;
+            trackError(e, analytics.submit.entity('Delete'));
+        }
+    }
+</script>
+
+<CardGrid>
+    <svelte:fragment slot="title">Delete {type}</svelte:fragment>
+    The {type} will be permanently deleted, including all the {records} within it. This action is irreversible.
+    <svelte:fragment slot="aside">
+        <BoxAvatar>
+            <svelte:fragment slot="title">
+                <h6 class="u-bold u-trim-1">{entity.name}</h6>
+            </svelte:fragment>
+            <p>Last updated: {toLocaleDateTime(entity.$updatedAt)}</p>
+        </BoxAvatar>
+    </svelte:fragment>
+
+    <svelte:fragment slot="actions">
+        <Button
+            secondary
+            on:click={() => {
+                show = true;
+                trackEvent(analytics.click.entity('Delete'));
+            }}>Delete</Button>
+    </svelte:fragment>
+</CardGrid>
+
+{#if show}
+    <Confirm
+        confirmDeletion
+        onSubmit={deleteEntity}
+        title="Delete {type}"
+        bind:open={show}
+        bind:error>
+        <Typography.Text>
+            Are you sure you want to delete <b>{entity.name}</b>?
+        </Typography.Text>
+    </Confirm>
+{/if}
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(entity)/views/settings/index.ts b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(entity)/views/settings/index.ts
new file mode 100644
index 0000000000..24fe556518
--- /dev/null
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(entity)/views/settings/index.ts
@@ -0,0 +1,5 @@
+export { default as DangerZone } from './danger.svelte';
+export { default as UpdateName } from './name.svelte';
+export { default as UpdatePermissions } from './permissions.svelte';
+export { default as UpdateSecurity } from './security.svelte';
+export { default as UpdateStatus } from './status.svelte';
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(entity)/views/settings/name.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(entity)/views/settings/name.svelte
new file mode 100644
index 0000000000..ac96aee5df
--- /dev/null
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(entity)/views/settings/name.svelte
@@ -0,0 +1,60 @@
+<script lang="ts">
+    import { trackError, trackEvent } from '$lib/actions/analytics';
+    import { CardGrid } from '$lib/components';
+    import { Button, Form, InputText } from '$lib/elements/forms';
+    import { addNotification } from '$lib/stores/notifications';
+    import { subNavigation } from '$lib/stores/database';
+    import { type Entity, getTerminologies } from '$database/(entity)';
+    import { invalidate } from '$app/navigation';
+
+    let {
+        entity,
+        onChangeName
+    }: {
+        entity: Entity;
+        onChangeName: (updatedName: string) => Promise<void>;
+    } = $props();
+
+    let entityName: string = $state(entity.name);
+    const { analytics, dependencies } = getTerminologies();
+
+    async function cleanup() {
+        subNavigation.update(); // update the side entity table.
+
+        // events and notif!
+        trackEvent(analytics.submit.entity('UpdateName'));
+        addNotification({ message: 'Name has been updated', type: 'success' });
+
+        // invalidate proper dependency.
+        await invalidate(dependencies.entity.singular);
+    }
+
+    async function updateName() {
+        try {
+            await onChangeName(entityName);
+            await cleanup();
+        } catch (error) {
+            addNotification({ message: error.message, type: 'error' });
+            trackError(error, analytics.submit.entity('UpdateName'));
+        }
+    }
+</script>
+
+<Form onSubmit={updateName}>
+    <CardGrid>
+        <svelte:fragment slot="title">Name</svelte:fragment>
+        <svelte:fragment slot="aside">
+            <InputText
+                required
+                id="name"
+                label="Name"
+                placeholder="Enter name"
+                autocomplete={false}
+                bind:value={entityName} />
+        </svelte:fragment>
+
+        <svelte:fragment slot="actions">
+            <Button disabled={entityName === entity.name || !entityName} submit>Update</Button>
+        </svelte:fragment>
+    </CardGrid>
+</Form>
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(entity)/views/settings/permissions.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(entity)/views/settings/permissions.svelte
new file mode 100644
index 0000000000..90534375c8
--- /dev/null
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(entity)/views/settings/permissions.svelte
@@ -0,0 +1,67 @@
+<script lang="ts">
+    import { invalidate } from '$app/navigation';
+    import { trackEvent, trackError } from '$lib/actions/analytics';
+    import { CardGrid } from '$lib/components';
+    import { Permissions } from '$lib/components/permissions';
+    import { Button } from '$lib/elements/forms';
+    import { symmetricDifference } from '$lib/helpers/array';
+    import { addNotification } from '$lib/stores/notifications';
+    import { Link } from '@appwrite.io/pink-svelte';
+    import { type Entity, getTerminologies } from '$database/(entity)';
+
+    let {
+        entity,
+        onChangePermissions
+    }: {
+        entity: Entity;
+        onChangePermissions: (permissions: string[]) => Promise<void>;
+    } = $props();
+
+    let entityPermissions: string[] = $state(entity.$permissions);
+
+    const { analytics, dependencies, terminology } = getTerminologies();
+
+    const type = terminology.entity.lower.singular;
+    const records = terminology.record.lower.plural;
+
+    async function cleanup() {
+        // events and notif!
+        trackEvent(analytics.submit.entity('UpdatePermissions'));
+        addNotification({ message: `${entity.name} has been updated`, type: 'success' });
+
+        // invalidate proper dependency.
+        await invalidate(dependencies.entity.singular);
+    }
+
+    async function updatePermissions() {
+        try {
+            await onChangePermissions(entityPermissions);
+            await cleanup();
+        } catch (error) {
+            addNotification({ message: error.message, type: 'error' });
+            trackError(error, analytics.submit.entity('UpdatePermissions'));
+        }
+    }
+
+    const arePermsDisabled = $derived(
+        !(entityPermissions && symmetricDifference(entityPermissions, entity.$permissions).length)
+    );
+</script>
+
+<CardGrid>
+    <svelte:fragment slot="title">Permissions</svelte:fragment>
+    Choose who can access your {type} and {records}. <Link.Anchor
+        href="https://appwrite.io/docs/products/databases/permissions"
+        target="_blank"
+        rel="noopener noreferrer">
+        Learn more
+    </Link.Anchor>.
+    <svelte:fragment slot="aside">
+        {#if entityPermissions}
+            <Permissions bind:permissions={entityPermissions} withCreate />
+        {/if}
+    </svelte:fragment>
+    <svelte:fragment slot="actions">
+        <Button disabled={arePermsDisabled} on:click={updatePermissions}>Update</Button>
+    </svelte:fragment>
+</CardGrid>
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(entity)/views/settings/security.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(entity)/views/settings/security.svelte
new file mode 100644
index 0000000000..112aa6deb3
--- /dev/null
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(entity)/views/settings/security.svelte
@@ -0,0 +1,66 @@
+<script lang="ts">
+    import { invalidate } from '$app/navigation';
+    import { trackEvent, trackError } from '$lib/actions/analytics';
+    import { CardGrid } from '$lib/components';
+    import { Button, InputSwitch } from '$lib/elements/forms';
+    import { addNotification } from '$lib/stores/notifications';
+    import { type Entity, getTerminologies } from '$database/(entity)';
+
+    let {
+        entity,
+        onChangeSecurity
+    }: {
+        entity: Entity;
+        onChangeSecurity: (updatedSecurity: boolean) => Promise<void>;
+    } = $props();
+
+    let recordSecurity: boolean = $state(entity.recordSecurity);
+
+    const hasChanges = $derived(recordSecurity !== entity.recordSecurity);
+
+    async function cleanup() {
+        // events and notif!
+        trackEvent(analytics.submit.entity('UpdateSecurity'));
+        addNotification({ message: `${entity.name} has been updated`, type: 'success' });
+
+        // invalidate proper dependency.
+        await invalidate(dependencies.entity.singular);
+    }
+
+    async function updateSecurity() {
+        try {
+            await onChangeSecurity(recordSecurity);
+            await cleanup();
+        } catch (error) {
+            addNotification({ message: error.message, type: 'error' });
+            trackError(error, analytics.submit.entity('UpdateSecurity'));
+        }
+    }
+
+    const { analytics, dependencies, terminology } = getTerminologies();
+
+    const title = terminology.record.title.singular;
+    const recordLower = terminology.record.lower.singular;
+    const recordsLower = terminology.record.lower.plural;
+    const entityLower = terminology.entity.lower.singular;
+</script>
+
+<CardGrid>
+    <svelte:fragment slot="title">{title} security</svelte:fragment>
+    <svelte:fragment slot="aside">
+        <InputSwitch bind:value={recordSecurity} id="security" label="{title} security" />
+
+        <p class="text">
+            When {recordLower} security is enabled, users will be able to access {recordsLower}
+            for which they have been granted
+            <b>either {recordLower} or {entityLower} permissions</b>.
+        </p>
+        <p class="text">
+            If {recordLower} security is disabled, users can access {recordsLower}
+            <b>only if they have {entityLower} permissions</b>. {title} permissions will be ignored.
+        </p>
+    </svelte:fragment>
+    <svelte:fragment slot="actions">
+        <Button disabled={!hasChanges} on:click={updateSecurity}>Update</Button>
+    </svelte:fragment>
+</CardGrid>
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(entity)/views/settings/status.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(entity)/views/settings/status.svelte
new file mode 100644
index 0000000000..44cae7b7d7
--- /dev/null
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(entity)/views/settings/status.svelte
@@ -0,0 +1,60 @@
+<script lang="ts">
+    import { invalidate } from '$app/navigation';
+    import { CardGrid } from '$lib/components';
+    import { toLocaleDateTime } from '$lib/helpers/date';
+    import { Button, InputSwitch } from '$lib/elements/forms';
+    import { addNotification } from '$lib/stores/notifications';
+    import { trackEvent, trackError } from '$lib/actions/analytics';
+    import { type Entity, getTerminologies } from '$database/(entity)';
+
+    let {
+        entity,
+        onChangeStatus
+    }: {
+        entity: Entity;
+        onChangeStatus: (updatedStatus: boolean) => Promise<void>;
+    } = $props();
+
+    let enabled: boolean = $state(entity.enabled);
+
+    const { analytics, dependencies } = getTerminologies();
+
+    async function cleanup() {
+        // events and notif!
+        trackEvent(analytics.submit.entity('UpdateEnabled'));
+        addNotification({ message: `${entity.name} has been updated`, type: 'success' });
+
+        // invalidate proper dependency.
+        await invalidate(dependencies.entity.singular);
+    }
+
+    async function updateStatus() {
+        try {
+            await onChangeStatus(enabled);
+            await cleanup();
+        } catch (error) {
+            addNotification({ message: error.message, type: 'error' });
+            trackError(error, analytics.submit.entity('UpdateEnabled'));
+        }
+    }
+</script>
+
+<CardGrid>
+    <svelte:fragment slot="title">{entity.name}</svelte:fragment>
+    <svelte:fragment slot="aside">
+        <ul>
+            <InputSwitch
+                id="toggle"
+                label={enabled ? 'Enabled' : 'Disabled'}
+                bind:value={enabled} />
+        </ul>
+        <div>
+            <p>Created: {toLocaleDateTime(entity.$createdAt)}</p>
+            <p>Last updated: {toLocaleDateTime(entity.$updatedAt)}</p>
+        </div>
+    </svelte:fragment>
+
+    <svelte:fragment slot="actions">
+        <Button disabled={enabled === entity.enabled} on:click={updateStatus}>Update</Button>
+    </svelte:fragment>
+</CardGrid>
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(entity)/views/usage/view.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(entity)/views/usage/view.svelte
new file mode 100644
index 0000000000..c47c8da008
--- /dev/null
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(entity)/views/usage/view.svelte
@@ -0,0 +1,47 @@
+<script lang="ts">
+    import { page } from '$app/state';
+    import { Usage } from '$lib/layout';
+    import type { Metric } from '$lib/sdk/usage';
+    import Container from '$lib/layout/container.svelte';
+    import { resolveRoute, withPath } from '$lib/stores/navigation';
+    import { getTerminologies } from '$database/(entity)';
+
+    let {
+        total,
+        count
+    }: {
+        total: number;
+        count: Metric[];
+    } = $props();
+
+    const { terminology } = getTerminologies();
+
+    const records = terminology.record.lower.plural;
+    const entity = terminology.entity.lower.singular;
+
+    const usagePath = $derived(
+        withPath(
+            // base path
+            resolveRoute(
+                '/(console)/project-[region]-[project]/databases/database-[database]',
+                page.params
+            ),
+
+            // append dynamic path
+            `${entity}-${page.params[entity]}/usage`
+        )
+    );
+</script>
+
+<div class="wide-screen-wrapper databases-spreadsheet">
+    <Container expanded slotSpacing paddingInlineEnd databasesScreen>
+        <Usage
+            {total}
+            {count}
+            path={usagePath}
+            countMetadata={{
+                legend: records,
+                title: `Total ${records}`
+            }} />
+    </Container>
+</div>
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(suggestions)/empty.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(suggestions)/empty.svelte
index 00347261ff..b7b90e70c6 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(suggestions)/empty.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(suggestions)/empty.svelte
@@ -17,7 +17,7 @@
     import { SortButton } from '$lib/components';
     import { expandTabs, columnsOrder, columnsWidth, reorderItems } from '../table-[table]/store';
     import { preferences } from '$lib/stores/preferences';
-    import SpreadsheetContainer from '../table-[table]/layout/spreadsheet.svelte';
+    import { SpreadsheetContainer } from '$database/(entity)';
     import { onDestroy, onMount, tick } from 'svelte';
     import { sdk, realtime, type RealtimeResponse } from '$lib/stores/sdk';
     import { page } from '$app/state';
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(suggestions)/indexes.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(suggestions)/indexes.svelte
index 85158b884d..836ea3b9c1 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(suggestions)/indexes.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(suggestions)/indexes.svelte
@@ -9,11 +9,11 @@
         type SuggestedIndexSchema
     } from './store';
     import { Modal } from '$lib/components';
-    import SideSheet from '../table-[table]/layout/sidesheet.svelte';
+    import { type Entity, SideSheet } from '$database/(entity)';
     import { isSmallViewport } from '$lib/stores/viewport';
-    import { IndexType, type Models } from '@appwrite.io/console';
+    import { IndexType } from '@appwrite.io/console';
     import { capitalize } from '$lib/helpers/string';
-    import { type Columns, table } from '../table-[table]/store';
+    import { type Columns } from '../table-[table]/store';
     import { isRelationship } from '../table-[table]/rows/store';
     import { VARS } from '$lib/system';
     import { sleep } from '$lib/helpers/promises';
@@ -26,6 +26,12 @@
     import { type ComponentType, onDestroy, onMount } from 'svelte';
     import { columnOptions as baseColumnOptions } from '../table-[table]/columns/store';
 
+    const {
+        table
+    }: {
+        table: Entity;
+    } = $props();
+
     const MAX_INDEXES = 5;
 
     let modalError = $state(null);
@@ -38,9 +44,6 @@
         leadingIcon?: ComponentType;
     }> = $state();
 
-    const tableId = page.params.table;
-    const databaseId = page.params.database;
-
     function makeColumnOptions() {
         if (VARS.MOCK_AI_SUGGESTIONS) {
             columnOptions = mockSuggestions.columns.map((column) => ({
@@ -49,8 +52,8 @@
                 leadingIcon: baseColumnOptions.find((option) => option.type === column.type)?.icon
             }));
         } else {
-            columnOptions = $table.columns
-                .filter((column) => !isRelationship(column))
+            columnOptions = table.fields
+                .filter((column: Columns) => !isRelationship(column))
                 .map((column) => ({
                     value: column.key,
                     label: column.key,
@@ -70,7 +73,7 @@
             indexes = mockSuggestions.columns.slice(0, 3).map((column, index) => ({
                 key: column.name,
                 type: IndexType.Key,
-                columns: [column.name],
+                fields: [column.name],
                 orders: index === 2 ? IndexOrder.DESC : IndexOrder.ASC,
                 lengths: []
             }));
@@ -79,8 +82,8 @@
                 const suggestions = await sdk
                     .forProject(page.params.region, page.params.project)
                     .console.suggestIndexes({
-                        databaseId,
-                        tableId: $table.$id
+                        databaseId: table.databaseId,
+                        tableId: table.$id
                     });
 
                 indexes = suggestions.indexes.map((index) => {
@@ -88,7 +91,7 @@
                         key: index.columns[0],
                         type: index.type as IndexType,
                         orders: (index.orders?.[0] as IndexOrder) || IndexOrder.ASC,
-                        columns: index.columns,
+                        fields: index.columns,
                         lengths: index.lengths ?? []
                     };
                 });
@@ -116,7 +119,7 @@
                 key: '',
                 type: IndexType.Key,
                 orders: IndexOrder.ASC,
-                columns: [],
+                fields: [],
                 lengths: null
             });
         }
@@ -129,9 +132,9 @@
     function syncIndexState(event: CustomEvent, index: SuggestedIndexSchema) {
         const selected = event.detail;
         index.key = selected;
-        index.columns = selected ? [selected] : [];
+        index.fields = selected ? [selected] : [];
         if (index.lengths) {
-            index.lengths = index.lengths.slice(0, index.columns.length);
+            index.lengths = index.lengths.slice(0, index.fields.length);
         }
     }
 
@@ -146,8 +149,8 @@
     }
 
     function generateUniqueIndexKey(index: SuggestedIndexSchema, usedKeys: Set<string>): string {
-        const existingKeys = $table.indexes.map((idx) => idx.key);
-        let suggestedKey = `${index.key || index.columns[0]}_${index.type.toLowerCase()}`;
+        const existingKeys = table.indexes.map((idx) => idx.key);
+        let suggestedKey = `${index.key || index.fields[0]}_${index.type.toLowerCase()}`;
         let uniqueKey = suggestedKey;
         let counter = 1;
 
@@ -160,25 +163,20 @@
         return uniqueKey;
     }
 
-    function prepareIndexForCreation(index: SuggestedIndexSchema, columnMap: Map<string, Columns>) {
+    function prepareIndexForCreation(index: SuggestedIndexSchema, columnMap: Map<string, number>) {
         // prepare orders array
-        const orders = index.orders !== null ? index.columns.map(() => String(index.orders)) : [];
+        const orders = index.orders !== null ? index.fields.map(() => String(index.orders)) : [];
 
         // prepare lengths array
         let lengths: (number | null)[];
         if (index.type === IndexType.Key) {
             // only validate if it's a key index
-            lengths = index.columns.map((columnKey, i) => {
-                const column = columnMap.get(columnKey);
-                if (column?.type === 'string') {
-                    const stringColumn = column as Models.ColumnString;
+            lengths = index.fields.map((columnKey, i) => {
+                const maxSize = columnMap.get(columnKey);
+                if (maxSize) {
                     const requestedLength = index.lengths?.[i];
-                    if (
-                        requestedLength &&
-                        stringColumn.size &&
-                        requestedLength > stringColumn.size
-                    ) {
-                        return stringColumn.size;
+                    if (requestedLength && requestedLength > maxSize) {
+                        return maxSize;
                     }
                     return requestedLength || null;
                 }
@@ -186,7 +184,7 @@
             });
         } else {
             // non-key indexes, lengths are null!
-            lengths = Array(index.columns.length).fill(null);
+            lengths = Array(index.fields.length).fill(null);
         }
 
         return { orders, lengths };
@@ -213,7 +211,7 @@
         creatingIndexes = true;
 
         for (const [i, index] of indexes.entries()) {
-            if (!index.key || !index.type || !index.columns || index.columns.length === 0) {
+            if (!index.key || !index.type || !index.fields || index.fields.length === 0) {
                 modalError = `Index ${i + 1}: Selected column or type invalid`;
                 creatingIndexes = false;
                 return true; // keep sheet open!
@@ -222,7 +220,12 @@
 
         let successCount = 0;
         const usedKeys = new Set<string>();
-        const columnMap = new Map($table.columns.map((col) => [col.key, col]));
+        const columnMap: Map<string, number> = new Map(
+            table.fields
+                .filter((field) => field.type === 'string' && 'size' in field)
+                .map((field) => [field.key, field['size']])
+        );
+
         const sdkClient = sdk.forProject(page.params.region, page.params.project);
 
         for (const [_, index] of indexes.entries()) {
@@ -234,11 +237,11 @@
                 const uniqueIndexKey = generateUniqueIndexKey(index, usedKeys);
 
                 await sdkClient.tablesDB.createIndex({
-                    databaseId,
-                    tableId,
+                    databaseId: table.databaseId,
+                    tableId: table.$id,
                     key: uniqueIndexKey,
                     type: index.type,
-                    columns: index.columns,
+                    columns: index.fields,
                     lengths,
                     ...(orders.length ? { orders } : {})
                 });
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(suggestions)/input.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(suggestions)/input.svelte
index 70dec29632..1ec1f395bf 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(suggestions)/input.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(suggestions)/input.svelte
@@ -4,6 +4,7 @@
     import IconAI from './icon/ai.svelte';
     import { slide } from 'svelte/transition';
     import { tableColumnSuggestions } from './store';
+    import { getTerminologies } from '$database/(entity)';
     import { Button, InputTextarea } from '$lib/elements/forms';
     import { Card, Layout, Selector, Typography } from '@appwrite.io/pink-svelte';
 
@@ -20,19 +21,22 @@
     });
 
     const featureActive = $derived(isCloud);
+    const { terminology } = getTerminologies();
+    const field = terminology.field.lower;
+    const entity = terminology.entity.lower.singular;
 
     const title = $derived.by(() => {
         return featureActive
-            ? 'Smart column suggestions'
-            : 'Smart column suggestions available on Cloud';
+            ? `Smart ${field.singular} suggestions`
+            : `Smart ${field.singular} suggestions available on Cloud`;
     });
 
     const subtitle = $derived.by(() => {
         return featureActive
             ? isModal
-                ? 'Use AI to suggest useful columns'
-                : 'Enable AI to suggest useful columns based on your table name'
-            : 'Sign up for Cloud to generate columns based on your table name';
+                ? `Use AI to suggest useful ${field.plural}`
+                : `Enable AI to suggest useful ${field.plural} based on your ${entity} name`
+            : `Sign up for Cloud to generate ${field.plural} based on your ${entity} name`;
     });
 </script>
 
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(suggestions)/options.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(suggestions)/options.svelte
index 48ae977ce0..cce941a2ef 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(suggestions)/options.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(suggestions)/options.svelte
@@ -2,7 +2,7 @@
     import type { Snippet } from 'svelte';
     import { Popover, Tooltip } from '@appwrite.io/pink-svelte';
     import { isSmallViewport } from '$lib/stores/viewport';
-    import SideSheet from '../table-[table]/layout/sidesheet.svelte';
+    import { SideSheet } from '$database/(entity)';
 
     let {
         children,
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(suggestions)/store.ts b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(suggestions)/store.ts
index c27e09eaeb..0e8daa0362 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(suggestions)/store.ts
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(suggestions)/store.ts
@@ -40,7 +40,7 @@ export type SuggestedIndexSchema = {
     key: string;
     type: IndexType;
     orders: IndexOrder;
-    columns: string[];
+    fields: string[];
     lengths?: number[] | undefined;
 };
 
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/+layout.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/+layout.svelte
index fe77a776bd..b11e83f6ef 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/+layout.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/+layout.svelte
@@ -10,8 +10,7 @@
     } from '$lib/commandCenter';
     import { tablesSearcher } from '$lib/commandCenter/searchers';
     import { Dependencies } from '$lib/constants';
-    import CreateTable from './createTable.svelte';
-    import { showCreateTable } from './store';
+    import { showCreateEntity } from './store';
     import { TablesPanel } from '$lib/commandCenter/panels';
     import { canWriteTables, canWriteDatabases } from '$lib/stores/roles';
     import { showCreateBackup, showCreatePolicy } from './backups/store';
@@ -19,6 +18,8 @@
     import { currentPlan } from '$lib/stores/organization';
     import { isCloud } from '$lib/system';
     import { noWidthTransition } from '$lib/stores/sidebar';
+    import { CreateEntity, setTerminologies } from '$database/(entity)';
+    import { sdk } from '$lib/stores/sdk';
 
     const project = page.params.project;
     const databaseId = page.params.database;
@@ -27,7 +28,7 @@
         {
             label: 'Create table',
             callback() {
-                $showCreateTable = true;
+                $showCreateEntity = true;
                 if (!page.url.pathname.endsWith(databaseId)) {
                     goto(
                         `${base}/project-${page.params.region}-${project}/databases/database-${databaseId}`
@@ -135,6 +136,23 @@
     $: $updateCommandGroupRanks({ tables: 10 });
 
     $noWidthTransition = true;
+
+    async function createEntity(tableId: string, name: string) {
+        const table = await sdk
+            .forProject(page.params.region, page.params.project)
+            .tablesDB.createTable({
+                databaseId,
+                tableId,
+                name
+            });
+
+        await invalidate(Dependencies.DATABASE);
+        await goto(
+            `${base}/project-${page.params.region}-${project}/databases/database-${databaseId}/table-${table.$id}`
+        );
+    }
+
+    $: setTerminologies(page);
 </script>
 
 <svelte:head>
@@ -146,11 +164,4 @@
 
 <slot />
 
-<CreateTable
-    bind:showCreate={$showCreateTable}
-    onTableCreated={async (table) => {
-        await invalidate(Dependencies.DATABASE);
-        await goto(
-            `${base}/project-${page.params.region}-${project}/databases/database-${databaseId}/table-${table.$id}`
-        );
-    }} />
+<CreateEntity bind:show={$showCreateEntity} onCreateEntity={createEntity} />
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/+layout.ts b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/+layout.ts
index ac97110f0e..49b60c099b 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/+layout.ts
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/+layout.ts
@@ -13,9 +13,9 @@ export const load: LayoutLoad = async ({ params, depends }) => {
     });
 
     return {
+        database,
         header: Header,
         breadcrumbs: Breadcrumbs,
-        subNavigation: SubNavigation,
-        database
+        subNavigation: SubNavigation
     };
 };
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/+page.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/+page.svelte
index 8234805e3a..90066c9f96 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/+page.svelte
@@ -2,20 +2,38 @@
     import { EmptySearch, PaginationWithLimit, SearchQuery, ViewSelector } from '$lib/components';
     import { Button } from '$lib/elements/forms';
     import { Container } from '$lib/layout';
-    import { showCreateTable, tableViewColumns } from './store';
+    import { showCreateEntity, tableViewColumns } from './store';
     import Table from './table.svelte';
     import Grid from './grid.svelte';
-    import type { PageData } from './$types';
+    import type { PageProps } from './$types';
     import { Card, Empty, Icon, Layout } from '@appwrite.io/pink-svelte';
-    import { base } from '$app/paths';
     import { app } from '$lib/stores/app';
     import { canWriteTables } from '$lib/stores/roles';
     import { IconPlus } from '@appwrite.io/pink-icons-svelte';
     import { page } from '$app/state';
+    import { resolveRoute } from '$lib/stores/navigation';
+    import { getTerminologies } from '$database/(entity)';
+    import { withPath } from '$lib/stores/navigation.js';
 
-    export let data: PageData;
+    const { data }: PageProps = $props();
 
-    const databaseId = page.params.database;
+    const { terminology } = getTerminologies();
+    const entityTitle = terminology.entity.title;
+    const entityLower = terminology.entity.lower;
+
+    /**
+     * init update because `getContext`
+     * doesn't work on typescript context!
+     */
+    tableViewColumns.update((columns) => {
+        /* $id */
+        columns[0].title = `${entityTitle.singular} ID`;
+        return columns;
+    });
+
+    function getImageRoute(type: 'light' | 'dark'): string {
+        return withPath(resolveRoute('/'), `/images/empty-database-${type}.svg`);
+    }
 </script>
 
 <Container databasesMainScreen>
@@ -29,11 +47,11 @@
                 ui="new"
                 view={data.view}
                 columns={tableViewColumns}
-                hideColumns={!data.tables.total}
-                hideView={!data.tables.total} />
+                hideColumns={!data.entities.total}
+                hideView={!data.entities.total} />
 
             {#if $canWriteTables}
-                <Button event="create_table" on:click={() => ($showCreateTable = true)}>
+                <Button event="create_table" on:click={() => ($showCreateEntity = true)}>
                     <Icon icon={IconPlus} slot="start" size="s" />
                     Create table
                 </Button>
@@ -41,51 +59,48 @@
         </Layout.Stack>
     </Layout.Stack>
 
-    {#if data.tables.total}
+    {#if data.entities.total}
         {#if data.view === 'grid'}
-            <Grid {data} bind:showCreate={$showCreateTable} />
+            <Grid {data} {terminology} bind:showCreate={$showCreateEntity} />
         {:else}
-            <Table {data} />
+            <Table {data} {terminology} />
         {/if}
 
         <PaginationWithLimit
-            name="Tables"
             limit={data.limit}
             offset={data.offset}
-            total={data.tables.total} />
+            total={data.entities.total}
+            name={entityTitle.plural} />
     {:else if data.search}
-        <EmptySearch target="tables" hidePagination>
+        <EmptySearch target={entityLower.singular} hidePagination>
             <Button
                 size="s"
                 secondary
-                href={`${base}/project-${page.params.region}-${page.params.project}/databases/database-${databaseId}`}
-                >Clear Search</Button>
+                href={resolveRoute(
+                    '/(console)/project-[region]-[project]/databases/database-[database]',
+                    page.params
+                )}>Clear Search</Button>
         </EmptySearch>
     {:else}
         <Card.Base padding="none">
             <Empty
-                title="Create your first table"
-                src={$app.themeInUse === 'dark'
-                    ? `${base}/images/empty-database-dark.svg`
-                    : `${base}/images/empty-database-light.svg`}>
+                src={getImageRoute($app.themeInUse)}
+                title="Create your first {entityLower.singular}">
                 <span slot="description">
-                    Create, organize, and query structured data with Tables.
+                    Create, organize, and query structured data with {entityTitle.plural}.
                 </span>
+
                 <span slot="actions">
                     <Button
                         external
                         href="https://appwrite.io/docs/products/databases/databases"
                         text
                         event="empty_documentation"
-                        ariaLabel="create table">Documentation</Button>
+                        ariaLabel="create {entityLower.singular}">Documentation</Button>
 
                     {#if $canWriteTables}
-                        <Button
-                            secondary
-                            on:click={() => {
-                                $showCreateTable = true;
-                            }}>
-                            Create table
+                        <Button secondary on:click={() => ($showCreateEntity = true)}>
+                            Create {entityLower.singular}
                         </Button>
                     {/if}
                 </span>
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/+page.ts b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/+page.ts
index 475ed13fee..358f8d97ee 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/+page.ts
@@ -1,10 +1,11 @@
 import { Query } from '@appwrite.io/console';
-import { sdk } from '$lib/stores/sdk';
 import { getLimit, getPage, getSearch, getView, pageToOffset, View } from '$lib/helpers/load';
 import type { PageLoad } from './$types';
 import { CARD_LIMIT, Dependencies } from '$lib/constants';
+import { type DatabaseType, useDatabaseSdk } from '$database/(entity)';
 
-export const load: PageLoad = async ({ params, url, route, depends }) => {
+export const load: PageLoad = async ({ params, url, route, depends, parent }) => {
+    const { database } = await parent();
     depends(Dependencies.TABLES);
 
     const page = getPage(url);
@@ -13,10 +14,13 @@ export const load: PageLoad = async ({ params, url, route, depends }) => {
     const view = getView(url, route, View.Grid);
     const offset = pageToOffset(page, limit);
 
-    const tables = await sdk.forProject(params.region, params.project).tablesDB.listTables({
-        databaseId: params.database,
-        queries: [Query.limit(limit), Query.offset(offset), Query.orderDesc('')],
-        search: search || undefined
+    const databaseType = database.type as DatabaseType;
+
+    const databaseSdk = useDatabaseSdk(params.region, params.project, databaseType);
+    const entities = await databaseSdk.listEntities({
+        databaseId: database.$id,
+        search: search || undefined,
+        queries: [Query.limit(limit), Query.offset(offset), Query.orderDesc('')]
     });
 
     return {
@@ -24,6 +28,6 @@ export const load: PageLoad = async ({ params, url, route, depends }) => {
         limit,
         search,
         view,
-        tables
+        entities
     };
 };
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/backups/+page.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/backups/+page.svelte
index e644905413..63946ac700 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/backups/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/backups/+page.svelte
@@ -5,7 +5,7 @@
     import BackupPolicy from './policy.svelte';
     import LockedCard from './locked.svelte';
     import Table from './table.svelte';
-    import type { PageData } from './$types';
+    import type { PageProps } from './$types';
     import CreatePolicy from './createPolicy.svelte';
     import { Button } from '$lib/elements/forms';
     import { addNotification, dismissAllNotifications } from '$lib/stores/notifications';
@@ -20,16 +20,17 @@
     import { ID } from '@appwrite.io/console';
     import { showCreateBackup, showCreatePolicy } from './store';
     import { getProjectId } from '$lib/helpers/project';
-    import { trackEvent } from '$lib/actions/analytics';
+    import { Submit, trackError, trackEvent } from '$lib/actions/analytics';
     import { Layout, Typography } from '@appwrite.io/pink-svelte';
     import { page } from '$app/state';
     import IconQuestionMarkCircle from './components/questionIcon.svelte';
 
-    let policyCreateError: string;
-    let totalPolicies: UserBackupPolicy[] = [];
-    let isDisabled = isSelfHosted || (isCloud && !$currentPlan.backupsEnabled);
+    const { data }: PageProps = $props();
 
-    export let data: PageData;
+    let policyCreateError: string | null = $state(null);
+    let totalPolicies: UserBackupPolicy[] = $state([]);
+
+    const isDisabled = $derived(isSelfHosted || (isCloud && !$currentPlan.backupsEnabled));
 
     const showFeedbackNotification = () => {
         let counter = localStorage.getItem('createBackupsCounter');
@@ -112,7 +113,7 @@
 
             if (actualDay) message['monthlyInterval'] = actualDay;
 
-            trackEvent('submit_policy_submit', message);
+            trackEvent(Submit.DatabaseBackupPolicyCreate, message);
         });
     };
 
@@ -148,14 +149,12 @@
 
             await invalidate(Dependencies.BACKUPS);
             showFeedbackNotification();
-        } catch (err) {
-            addNotification({
-                type: 'error',
-                message: err.message
-            });
-        } finally {
+
             totalPolicies = [];
             $showCreatePolicy = false;
+        } catch (err) {
+            policyCreateError = err.message;
+            trackError(err, Submit.DatabaseBackupPolicyCreate);
         }
     };
 
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/backups/table.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/backups/table.svelte
index 5cd8075920..d1c29d7126 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/backups/table.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/backups/table.svelte
@@ -17,7 +17,6 @@
     import { calculateSize } from '$lib/helpers/sizeConvertion';
     import { ID, type Models } from '@appwrite.io/console';
     import { columns } from './store';
-    import { database } from '../store';
     import { Click, Submit, trackError, trackEvent } from '$lib/actions/analytics';
     import { copy } from '$lib/helpers/copy';
     import { LabelCard } from '$lib/components/index.js';
@@ -51,10 +50,12 @@
         data: PageData;
     } = $props();
 
+    const database = $derived(data.database);
+
     let showDelete = $state(false);
     let selectedBackup: Models.BackupArchive | null = $state(null);
 
-    let showDropdown = [];
+    let showDropdown = $state([]);
 
     let showRestore = $state(false);
     let showCustomId = $state(false);
@@ -65,6 +66,7 @@
 
     let confirmSameDbRestore = $state(false);
     let selectedRestoreOption = $state('new');
+
     const restoreOptions = [
         {
             id: 'new',
@@ -78,14 +80,6 @@
         }
     ];
 
-    const disableRestoreButton = $derived.by(() => {
-        return (
-            (selectedRestoreOption === 'new' &&
-                (!newDatabaseInfo.name || $database.$id === newDatabaseInfo.id)) ||
-            (selectedRestoreOption === 'same' && !confirmSameDbRestore)
-        );
-    });
-
     function getPolicyDetails(policyId: string | null): Models.BackupPolicy | null {
         return data.policies.policies.find((policy) => policy.$id === policyId);
     }
@@ -154,8 +148,8 @@
 
     async function restoreBackup() {
         if (selectedRestoreOption === 'same') {
-            newDatabaseInfo.id = $database.$id;
-            newDatabaseInfo.name = $database.name;
+            newDatabaseInfo.id = database.$id;
+            newDatabaseInfo.name = database.name;
         }
 
         try {
@@ -184,6 +178,14 @@
         }
     }
 
+    const disableRestoreButton = $derived.by(() => {
+        return (
+            (selectedRestoreOption === 'new' &&
+                (!newDatabaseInfo.name || database.$id === newDatabaseInfo.id)) ||
+            (selectedRestoreOption === 'same' && !confirmSameDbRestore)
+        );
+    });
+
     $effect(() => {
         if (!showRestore && !showDelete) {
             showCustomId = false;
@@ -373,7 +375,7 @@
                     autofocus={false}
                     name="Database"
                     bind:show={showCustomId}
-                    databaseId={$database.$id}
+                    databaseId={database.$id}
                     bind:id={newDatabaseInfo.id} />
             {/if}
         </Layout.Stack>
@@ -383,7 +385,7 @@
             size="s"
             id="delete_policy"
             bind:checked={confirmSameDbRestore}
-            label="Overwrite '{$database.name}' with the selected backup version">
+            label="Overwrite '{database.name}' with the selected backup version">
         </InputCheckbox>
     {/if}
 
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/breadcrumbs.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/breadcrumbs.svelte
index e1f0459d41..2da3c51b03 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/breadcrumbs.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/breadcrumbs.svelte
@@ -1,28 +1,37 @@
 <script lang="ts">
-    import { base } from '$app/paths';
     import { page } from '$app/state';
     import { Breadcrumbs } from '$lib/layout';
-    import { organization } from '$lib/stores/organization';
-    import { database } from './store';
+    import { resolveRoute } from '$lib/stores/navigation';
+    import { type Organization } from '$lib/stores/organization';
 
-    $: breadcrumbs = [
+    const params = $derived(page.params);
+    const project = $derived(page.data.project);
+    const database = $derived(page.data.database);
+    const organization = $derived(page.data.organization) as Organization;
+
+    const breadcrumbs = $derived([
         {
-            href: `${base}/organization-${$organization.$id}`,
-            title: $organization.name
+            href: resolveRoute('/(console)/organization-[organization]', {
+                organization: organization?.$id ?? project.teamId
+            }),
+            title: organization.name
         },
         {
-            href: `${base}/project-${page.params.region}-${page.params.project}`,
-            title: page.data.project.name
+            href: resolveRoute('/(console)/project-[region]-[project]', params),
+            title: project.name
         },
         {
-            href: `${base}/project-${page.params.region}-${page.params.project}/databases`,
+            href: resolveRoute('/(console)/project-[region]-[project]/databases', params),
             title: 'Databases'
         },
         {
-            href: `${base}/project-${page.params.region}-${page.params.project}/databases/database-${$database.$id}`,
-            title: $database.name
+            href: resolveRoute(
+                '/(console)/project-[region]-[project]/databases/database-[database]',
+                params
+            ),
+            title: database.name
         }
-    ];
+    ]);
 </script>
 
 <Breadcrumbs {breadcrumbs} />
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/delete.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/delete.svelte
index be59aa9ab8..2ab3fa80da 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/delete.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/delete.svelte
@@ -1,34 +1,38 @@
 <script lang="ts">
     import { goto } from '$app/navigation';
-    import { base } from '$app/paths';
     import { page } from '$app/state';
     import { Submit, trackError, trackEvent } from '$lib/actions/analytics';
     import { Modal } from '$lib/components';
     import { Button, InputCheckbox } from '$lib/elements/forms';
     import { addNotification } from '$lib/stores/notifications';
-    import { sdk } from '$lib/stores/sdk';
-    import { database } from './store';
     import DualTimeView from '$lib/components/dualTimeView.svelte';
-    import { type Models, Query } from '@appwrite.io/console';
+    import { Query } from '@appwrite.io/console';
     import { Spinner, Table } from '@appwrite.io/pink-svelte';
+    import { resolveRoute } from '$lib/stores/navigation';
+    import { type EntityList, getTerminologies } from '$database/(entity)';
 
-    const databaseId = page.params.database;
+    let {
+        showDelete = $bindable(false)
+    }: {
+        showDelete: boolean;
+    } = $props();
 
-    export let showDelete = false;
-    let confirmedDeletion = false;
+    let error = $state(null);
+    let confirmedDeletion = $state(false);
+    let isLoadingRowsCount = $state(false);
 
-    let error = null;
-    let isLoadingRowsCount = false;
+    let entityItems = $state([]);
+    let entities: EntityList | null = $state(null);
 
-    $: tableItems = [];
-    let tables: Models.TableList = null;
+    const { databaseSdk } = getTerminologies();
+    const database = $derived(page.data.database);
 
     function buildQueries(): string[] {
         const queries = [Query.orderDesc('$updatedAt')];
 
-        if (tableItems.length > 0) {
+        if (entityItems.length > 0) {
             queries.push(Query.limit(25));
-            queries.push(Query.offset(tableItems.length));
+            queries.push(Query.offset(entityItems.length));
         } else {
             queries.push(Query.limit(3));
         }
@@ -36,7 +40,7 @@
         return queries;
     }
 
-    async function listTables() {
+    async function listEntities() {
         // let's just wait...
         if (isLoadingRowsCount) return;
 
@@ -44,23 +48,20 @@
 
         try {
             const queries = buildQueries();
+            entities = await databaseSdk.listEntities({
+                databaseId: page.params.database,
+                queries
+            });
 
-            tables = await sdk
-                .forProject(page.params.region, page.params.project)
-                .tablesDB.listTables({
-                    databaseId,
-                    queries
-                });
-
-            const tablePromises = tables.tables.map(async (table) => {
+            const entityInfo = entities.entities.map((entity) => {
                 return {
-                    id: table.$id,
-                    name: table.name,
-                    updatedAt: table.$updatedAt
+                    id: entity.$id,
+                    name: entity.name,
+                    updatedAt: entity.$updatedAt
                 };
             });
 
-            tableItems = [...tableItems, ...(await Promise.all(tablePromises))];
+            entityItems = [...entityItems, ...entityInfo];
         } catch (err) {
             error = true;
         } finally {
@@ -70,16 +71,22 @@
 
     const handleDelete = async () => {
         try {
-            await sdk
-                .forProject(page.params.region, page.params.project)
-                .tablesDB.delete({ databaseId });
+            await databaseSdk.delete({
+                databaseId: page.params.database
+            });
+
             showDelete = false;
+
             addNotification({
                 type: 'success',
-                message: `${$database.name} has been deleted`
+                message: `${database.name} has been deleted`
             });
-            await goto(`${base}/project-${page.params.region}-${page.params.project}/databases`);
+
             trackEvent(Submit.DatabaseDelete);
+
+            await goto(
+                resolveRoute('/(console)/project-[region]-[project]/databases', page.params)
+            );
         } catch (error) {
             addNotification({
                 type: 'error',
@@ -90,21 +97,28 @@
     };
 
     /* reset data on modal close */
-    $: if (!showDelete) {
-        tables = null;
-        tableItems = [];
-    } else {
-        listTables();
-    }
+    $effect(() => {
+        if (showDelete) {
+            if (entityItems.length === 0 && !entities) {
+                listEntities();
+            }
+        } else {
+            entities = null;
+            entityItems = [];
+
+            error = false;
+            confirmedDeletion = false;
+        }
+    });
 </script>
 
 <Modal title="Delete database" bind:show={showDelete} onSubmit={handleDelete}>
     <p class="text" slot="description">
-        {#if tableItems.length > 0}
-            The following tables and all data associated with <b>{$database.name}</b>, will be
+        {#if entityItems.length > 0}
+            The following tables and all data associated with <b>{database.name}</b>, will be
             permanently deleted.
         {:else}
-            Are you sure you want to delete <b>{$database.name}</b>?
+            Are you sure you want to delete <b>{database.name}</b>?
         {/if}
     </p>
 
@@ -114,16 +128,16 @@
         </div>
     {:else if error}
         <p class="text">
-            Are you sure you want to delete <b>{$database.name}</b>?
+            Are you sure you want to delete <b>{database.name}</b>?
         </p>
-    {:else if tableItems.length > 0}
+    {:else if entityItems.length > 0}
         <div class="u-flex-vertical u-gap-16">
             <Table.Root columns={2} let:root>
                 <svelte:fragment slot="header" let:root>
                     <Table.Header.Cell {root}>Table</Table.Header.Cell>
                     <Table.Header.Cell {root}>Last Updated</Table.Header.Cell>
                 </svelte:fragment>
-                {#each tableItems as table}
+                {#each entityItems as table}
                     <Table.Row.Base {root}>
                         <Table.Cell {root}>{table.name}</Table.Cell>
                         <Table.Cell {root}>
@@ -133,9 +147,9 @@
                 {/each}
             </Table.Root>
 
-            {#if tableItems.length < tables.total}
+            {#if entityItems.length < entities.total}
                 <div class="u-flex u-gap-16 u-cross-center">
-                    <button class="u-underline" on:click={listTables} type="button">
+                    <button class="u-underline" onclick={listEntities} type="button">
                         Show more
                     </button>
 
@@ -143,11 +157,11 @@
                         <div class="loader is-small"></div>
                     {/if}
                 </div>
-            {:else if tableItems.length > 25}
+            {:else if entityItems.length > 25}
                 <button
                     class="u-underline"
-                    on:click={() => {
-                        tableItems = tableItems.slice(0, 3);
+                    onclick={() => {
+                        entityItems = entityItems.slice(0, 3);
                     }}
                     type="button">
                     Show less
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/grid.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/grid.svelte
index 15fbb6c797..c2fad84f00 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/grid.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/grid.svelte
@@ -1,24 +1,36 @@
 <script lang="ts">
-    import { base } from '$app/paths';
     import { page } from '$app/state';
     import { CardContainer, GridItem1, Id } from '$lib/components';
     import { canWriteTables } from '$lib/stores/roles';
     import type { PageData } from './$types';
     import { Badge } from '@appwrite.io/pink-svelte';
-    export let data: PageData;
-    export let showCreate = false;
-    const projectId = page.params.project;
-    const databaseId = page.params.database;
+    import type { TerminologyResult } from '$database/(entity)';
+    import { buildEntityRoute } from '$database/store';
+    import { onMount } from 'svelte';
+
+    let {
+        data,
+        showCreate = $bindable(false),
+        terminology
+    }: {
+        data: PageData;
+        showCreate: boolean;
+        terminology: TerminologyResult;
+    } = $props();
+
+    onMount(() => {
+        /* silences `declared but its value is never read` warning. */
+        showCreate;
+    });
 </script>
 
 <CardContainer
     disableEmpty={!$canWriteTables}
-    total={data.tables.total}
+    total={data.entities.total}
     on:click={() => (showCreate = true)}
-    event="table">
-    {#each data.tables.tables as table}
-        <GridItem1
-            href={`${base}/project-${page.params.region}-${projectId}/databases/database-${databaseId}/table-${table.$id}`}>
+    event={terminology.entity.lower.singular}>
+    {#each data.entities.entities as table}
+        <GridItem1 href={buildEntityRoute(page, terminology.entity.lower.singular, table.$id)}>
             <svelte:fragment slot="title">{table.name}</svelte:fragment>
             <svelte:fragment slot="status">
                 {#if !table.enabled}
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/header.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/header.svelte
index 591955ca35..37671efad9 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/header.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/header.svelte
@@ -1,60 +1,69 @@
 <script lang="ts">
-    import { base } from '$app/paths';
     import { page } from '$app/state';
+    import { Cover, CoverTitle } from '$lib/layout';
     import { Id, Tab, Tabs } from '$lib/components';
     import { isTabSelected } from '$lib/helpers/load';
-    import { Cover, CoverTitle } from '$lib/layout';
     import { canWriteDatabases } from '$lib/stores/roles';
-    import { database } from './store';
+    import { resolveRoute, withPath } from '$lib/stores/navigation';
+    import { useTerminology } from '$database/(entity)';
+
+    const terminology = useTerminology(page);
+    const baseDatabasePath = resolveRoute(
+        '/(console)/project-[region]-[project]/databases/database-[database]',
+        page.params
+    );
+
+    const database = $derived(page.data.database);
+    const baseDatabasesPath = resolveRoute(
+        '/(console)/project-[region]-[project]/databases',
+        page.params
+    );
 
-    const projectId = page.params.project;
-    const databaseId = page.params.database;
-    const path = `${base}/project-${page.params.region}-${page.params.project}/databases/database-${databaseId}`;
-    const tabs = [
-        {
-            href: path,
-            title: 'Tables',
-            event: 'tables',
-            hasChildren: true
-        },
-        {
-            href: `${path}/backups`,
-            title: 'Backups',
-            event: 'backups',
-            hasChildren: true
-        },
-        {
-            href: `${path}/usage`,
-            title: 'Usage',
-            event: 'usage',
-            hasChildren: true
-        },
-        {
-            href: `${path}/settings`,
-            event: 'settings',
-            title: 'Settings',
-            disabled: !$canWriteDatabases
-        }
-    ].filter((tab) => !tab.disabled);
+    const tabs = $derived(
+        [
+            {
+                href: baseDatabasePath,
+                title: terminology.entity.title.plural,
+                event: terminology.entity.lower.plural,
+                hasChildren: true
+            },
+            {
+                href: withPath(baseDatabasePath, '/backups'),
+                title: 'Backups',
+                event: 'backups',
+                hasChildren: true
+            },
+            {
+                href: withPath(baseDatabasePath, '/usage'),
+                title: 'Usage',
+                event: 'usage',
+                hasChildren: true
+            },
+            {
+                href: withPath(baseDatabasePath, '/settings'),
+                event: 'settings',
+                title: 'Settings',
+                disabled: !$canWriteDatabases
+            }
+        ].filter((tab) => !tab.disabled)
+    );
 </script>
 
 <Cover databasesMainScreen>
     <svelte:fragment slot="header">
-        <CoverTitle
-            style="margin-inline-start: -2.5rem;"
-            href={`${base}/project-${page.params.region}-${projectId}/databases`}>
-            {$database.name}
+        <CoverTitle href={baseDatabasesPath} style="margin-inline-start: -2.5rem;">
+            {database?.name}
         </CoverTitle>
 
-        <Id value={$database.$id}>{$database.$id}</Id>
+        <Id value={database?.$id}>{database?.$id}</Id>
     </svelte:fragment>
 
     <Tabs>
         {#each tabs as tab}
             <Tab
                 href={tab.href}
-                selected={isTabSelected(tab, page.url.pathname, path, tabs)}
-                event={tab.event}>
+                event={tab.event}
+                selected={isTabSelected(tab, page.url.pathname, baseDatabasePath, tabs)}>
                 {tab.title}
             </Tab>
         {/each}
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/settings/+page.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/settings/+page.svelte
index 00c09144e2..9a09143455 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/settings/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/settings/+page.svelte
@@ -11,34 +11,41 @@
     import { sdk } from '$lib/stores/sdk';
     import { onMount } from 'svelte';
     import Delete from '../delete.svelte';
-    import { database } from '../store';
     import { Query } from '@appwrite.io/console';
     import { Layout, Skeleton } from '@appwrite.io/pink-svelte';
+    import type { PageProps } from './$types';
+    import { getTerminologies } from '$database/(entity)';
 
-    let showDelete = false;
-    let showError: false | 'name' | 'email' | 'password' = false;
-    let errorMessage = 'Something went wrong';
-    let errorType: 'error' | 'warning' | 'success' = 'error';
-    let databaseName: string = null;
+    const { data }: PageProps = $props();
+
+    const database = $derived(data.database);
+
+    let showDelete = $state(false);
+    let databaseName: string | null = $state(null);
+
+    let errorMessage: string = $state('Something went wrong');
+    let errorType: 'error' | 'warning' | 'success' = $state('error');
+    let showError: false | 'name' | 'email' | 'password' = $state(false);
+
+    const { databaseSdk, terminology } = getTerminologies();
 
     onMount(async () => {
-        databaseName ??= $database.name;
+        databaseName ??= database.name;
     });
 
-    async function loadTableCount() {
-        const { total } = await sdk
-            .forProject(page.params.region, page.params.project)
-            .tablesDB.listTables({
-                databaseId: $database.$id,
-                queries: [Query.limit(1)]
-            });
+    async function loadEntityCount() {
+        const { total } = await databaseSdk.listEntities({
+            databaseId: database.$id,
+            queries: [Query.limit(1)]
+        });
+
         return total;
     }
 
     function addError(location: typeof showError, message: string, type: typeof errorType) {
+        errorType = type;
         showError = location;
         errorMessage = message;
-        errorType = type;
     }
 
     async function updateName() {
@@ -47,11 +54,14 @@
                 databaseId: page.params.database,
                 name: databaseName
             });
+
             await invalidate(Dependencies.DATABASE);
+
             addNotification({
                 message: 'Name has been updated',
                 type: 'success'
             });
+
             trackEvent(Submit.DatabaseUpdateName);
         } catch (error) {
             addError('name', error.message, 'error');
@@ -60,14 +70,14 @@
     }
 </script>
 
-{#if $database}
+{#if database}
     <Container databasesMainScreen>
         <CardGrid>
-            <svelte:fragment slot="title">{$database.name}</svelte:fragment>
+            <svelte:fragment slot="title">{database.name}</svelte:fragment>
             <svelte:fragment slot="aside">
                 <div class="grid-1-2-col-2">
-                    <p>Created: {toLocaleDateTime($database.$createdAt)}</p>
-                    <p>Last updated: {toLocaleDateTime($database.$updatedAt)}</p>
+                    <p>Created: {toLocaleDateTime(database.$createdAt)}</p>
+                    <p>Last updated: {toLocaleDateTime(database.$updatedAt)}</p>
                 </div>
             </svelte:fragment>
         </CardGrid>
@@ -91,7 +101,7 @@
                 </svelte:fragment>
 
                 <svelte:fragment slot="actions">
-                    <Button disabled={databaseName === $database.name || !databaseName} submit
+                    <Button disabled={databaseName === database.name || !databaseName} submit
                         >Update
                     </Button>
                 </svelte:fragment>
@@ -100,18 +110,20 @@
 
         <CardGrid>
             <svelte:fragment slot="title">Delete database</svelte:fragment>
-            The database will be permanently deleted, including all tables within it. This action is
-            irreversible.
+            The database will be permanently deleted, including all {terminology.entity.lower
+                .plural} within it. This action is irreversible.
             <svelte:fragment slot="aside">
                 <BoxAvatar>
                     <svelte:fragment slot="title">
                         <Layout.Stack direction="column" gap="xxs">
-                            <h6 class="u-bold u-trim-1">{$database.name}</h6>
+                            <h6 class="u-bold u-trim-1">{database.name}</h6>
                             <Layout.Stack direction="row" gap="s">
-                                {#await loadTableCount()}
+                                {#await loadEntityCount()}
                                     <Skeleton variant="line" width="100%" height={19.5} />
                                 {:then count}
-                                    {count} {count === 1 ? 'Table' : 'Tables'}
+                                    {@const entity = terminology.entity.title}
+                                    {count}
+                                    {count === 1 ? entity.singular : entity.plural}
                                 {/await}
                             </Layout.Stack>
                         </Layout.Stack>
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/store.ts b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/store.ts
index 36e755d77e..d5e75fb54e 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/store.ts
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/store.ts
@@ -1,11 +1,10 @@
-import { page } from '$app/stores';
+import { writable } from 'svelte/store';
 import type { Column } from '$lib/helpers/types';
-import type { Models } from '@appwrite.io/console';
-import { derived, writable } from 'svelte/store';
 import { IconChartBar, IconCloudUpload, IconCog } from '@appwrite.io/pink-icons-svelte';
+import { resolveRoute, withPath } from '$lib/stores/navigation';
+import type { Page } from '@sveltejs/kit';
 
-export const database = derived(page, ($page) => $page.data.database as Models.Database);
-export const showCreateTable = writable(false);
+export const showCreateEntity = writable(false);
 
 export const tableViewColumns = writable<Column[]>([
     { id: '$id', title: 'Table ID', type: 'string', width: 200 },
@@ -36,3 +35,13 @@ export const databaseSubNavigationItems = [
     { title: 'Usage', href: 'usage', icon: IconChartBar },
     { title: 'Settings', href: 'settings', icon: IconCog }
 ];
+
+export function buildEntityRoute(page: Page, entityType: string, entityId: string): string {
+    return withPath(
+        resolveRoute(
+            '/(console)/project-[region]-[project]/databases/database-[database]',
+            page.params
+        ),
+        `/${entityType}-${entityId}`
+    );
+}
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/subNavigation.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/subNavigation.svelte
index 31bb9d04a6..011dc9a88a 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/subNavigation.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/subNavigation.svelte
@@ -1,10 +1,9 @@
 <script lang="ts">
-    import { base } from '$app/paths';
     import { page } from '$app/state';
     import type { PageData } from './$types';
     import { showSubNavigation } from '$lib/stores/layout';
     import { bannerSpacing } from '$lib/layout/headerAlert.svelte';
-    import { showCreateTable, databaseSubNavigationItems } from './store';
+    import { showCreateEntity, databaseSubNavigationItems, buildEntityRoute } from './store';
 
     import {
         Icon,
@@ -25,35 +24,45 @@
     import { isTabletViewport } from '$lib/stores/viewport';
     import { BottomSheet } from '$lib/components';
     import Button from '$lib/elements/forms/button.svelte';
-    import { type Models, Query } from '@appwrite.io/console';
-    import { sdk } from '$lib/stores/sdk';
+    import { Query } from '@appwrite.io/console';
     import { onMount } from 'svelte';
     import { subNavigation } from '$lib/stores/database';
+    import {
+        type Entity,
+        type EntityList,
+        useDatabaseSdk,
+        useTerminology
+    } from '$database/(entity)';
+    import { resolveRoute } from '$lib/stores/navigation';
+    import { withPath } from '$lib/stores/navigation.js';
 
     const data = $derived(page.data) as PageData;
 
-    const region = $derived(page.params.region);
-    const project = $derived(page.params.project);
-    const tableId = $derived(page.params.table);
-    const databaseId = $derived(page.params.database);
+    // terminologies
+    const terminology = useTerminology(page);
+    const databaseSdk = useDatabaseSdk(page, terminology);
+
+    const entityTypePlural = terminology.entity.lower.plural;
+    const entityTypeSingular = terminology.entity.lower.singular;
+
+    const entityId = $derived(page.params[entityTypeSingular]);
 
-    let openBottomSheet = $state(false);
     let loading = $state(true);
+    let openBottomSheet = $state(false);
 
-    let tables = $state<Models.TableList>({
-        total: 0,
-        tables: []
-    });
+    let entities = $state<EntityList>({ total: 0, entities: [] });
 
-    const sortedTables = $derived.by(() =>
-        tables?.tables?.slice().sort((a, b) => a.name.localeCompare(b.name))
+    const sortedEntities = $derived.by(() =>
+        entities?.entities?.slice().sort((a, b) => a.name.localeCompare(b.name))
     );
 
-    const selectedTable = $derived.by(() =>
-        sortedTables?.find((table: Models.Table) => table.$id === tableId)
+    const selectedEntity = $derived.by(() =>
+        sortedEntities?.find((entity: Entity) => entity.$id === entityId)
     );
 
-    const isTablesScreen = $derived(page.route.id.endsWith('table-[table]'));
+    const isEntitiesScreen = $derived(
+        page.route.id.endsWith(`${entityTypeSingular}-[${entityTypeSingular}]`)
+    );
 
     const isMainDatabaseScreen = $derived(page.route.id.endsWith('database-[database]'));
 
@@ -61,12 +70,17 @@
     // 70.5px is the size of the container of the banner holder and not just the banner!
     // Needed because things vary a bit much on how different browsers treat bottom layouts.
     const bottomNavOffset = $derived($bannerSpacing ? '70.5px' : '0px');
-    const tableContentPadding = $derived($bannerSpacing ? '210px' : '140px');
+    const entityContentPadding = $derived($bannerSpacing ? '210px' : '140px');
+
+    const databaseBaseRoute = resolveRoute(
+        '/(console)/project-[region]-[project]/databases/database-[database]',
+        page.params
+    );
 
-    async function loadTables() {
+    async function loadEntities() {
         try {
-            tables = await sdk.forProject(region, project).tablesDB.listTables({
-                databaseId: databaseId,
+            entities = await databaseSdk.listEntities({
+                databaseId: page.params.database,
                 queries: [Query.orderDesc(''), Query.limit(100)]
             });
         } finally {
@@ -75,8 +89,8 @@
     }
 
     onMount(() => {
-        loadTables();
-        return subNavigation.subscribe(loadTables);
+        loadEntities();
+        return subNavigation.subscribe(loadEntities);
     });
 
     function onResize() {
@@ -92,14 +106,14 @@
     <Sidebar.Base state="open" resizable={false}>
         <section class="list-container" slot="top" style:width="100%">
             <a
-                class:is-selected={!isTablesScreen}
-                href={`${base}/project-${region}-${project}/databases/database-${databaseId}`}
+                href={databaseBaseRoute}
+                class:is-selected={!isEntitiesScreen}
                 class="database-name u-flex u-cross-center body-text-2 u-gap-8 is-not-mobile u-padding-block-8 u-padding-inline-start-4">
                 <Icon icon={IconDatabase} size="s" color="--fgcolor-neutral-weak" />
 
                 {data.database?.name}
             </a>
-            <div class="table-content" style:padding-bottom={tableContentPadding}>
+            <div class="entity-content" style:padding-bottom={entityContentPadding}>
                 {#if loading}
                     <ul class="drop-list u-margin-inline-start-8 u-margin-block-start-4">
                         {#each Array(2) as _}
@@ -113,13 +127,16 @@
                             </Layout.Stack>
                         {/each}
                     </ul>
-                {:else if tables?.total}
+                {:else if entities?.total}
                     <ul class="drop-list u-margin-inline-start-8 u-margin-block-start-4">
-                        {#each sortedTables as table, index}
-                            {@const href = `${base}/project-${region}-${project}/databases/database-${databaseId}/table-${table.$id}`}
-                            {@const isSelected = tableId === table.$id}
+                        {#each sortedEntities as entity, index}
                             {@const isFirst = index === 0}
-                            {@const isLast = index === sortedTables.length - 1}
+                            {@const isSelected = entityId === entity.$id}
+                            {@const isLast = index === sortedEntities.length - 1}
+                            {@const href = withPath(
+                                databaseBaseRoute,
+                                `/${entityTypeSingular}-${entity.$id}`
+                            )}
 
                             <Layout.Stack gap="s" direction="row" alignItems="center">
                                 <li
@@ -135,8 +152,8 @@
                                             color={isSelected
                                                 ? '--fgcolor-neutral-tertiary'
                                                 : '--fgcolor-neutral-weak'} />
-                                        <span class="text table-name" data-private
-                                            >{table.name}</span>
+                                        <span class="text entity-name" data-private
+                                            >{entity.name}</span>
                                     </a>
                                 </li>
                             </Layout.Stack>
@@ -153,7 +170,7 @@
                                 style:border-left="1px solid var(--border-neutral, #ededf0)"
                                 style:height="1rem">
                             </div>
-                            No tables yet
+                            No {entityTypePlural} yet
                         </Layout.Stack>
                     </div>
                 {/if}
@@ -166,10 +183,10 @@
                     <Button
                         compact
                         on:click={() => {
-                            $showCreateTable = true;
+                            $showCreateEntity = true;
                             $showSubNavigation = false;
                         }}>
-                        Create table
+                        Create {entityTypeSingular}
                     </Button>
                 </Layout.Stack>
             </div>
@@ -183,7 +200,7 @@
                     style="margin-inline-start: -1.25rem"
                     class="drop-list bottom-nav u-margin-block-start-4">
                     {#each databaseSubNavigationItems as action}
-                        {@const href = `${base}/project-${region}-${project}/databases/database-${databaseId}/${action.href}`}
+                        {@const href = withPath(databaseBaseRoute, `/${action.href}`)}
 
                         <Layout.Stack gap="s" direction="row" alignItems="center">
                             <li class="bottom-nav-item">
@@ -194,7 +211,7 @@
                                         size="s"
                                         icon={action.icon}
                                         color="--fgcolor-neutral-weak" />
-                                    <span class="text table-name">{action.title}</span>
+                                    <span class="text entity-name">{action.title}</span>
                                 </a>
                             </li>
                         </Layout.Stack>
@@ -208,9 +225,7 @@
         <div slot="left">
             <Layout.Stack direction="row" alignItems="center" gap="s">
                 <Icon icon={IconDatabase} size="s" color="--neutral-300" />
-                <Link.Anchor
-                    href={`${base}/project-${region}-${project}/databases/database-${databaseId}`}
-                    variant="quiet-muted">
+                <Link.Anchor href={databaseBaseRoute} variant="quiet-muted">
                     {data.database.name}
                 </Link.Anchor>
 
@@ -218,7 +233,7 @@
 
                 <Button text extraCompact on:click={() => (openBottomSheet = !openBottomSheet)}>
                     <Typography.Text variant="m-400">
-                        {selectedTable?.name}
+                        {selectedEntity?.name}
                     </Typography.Text>
                     <Icon icon={IconChevronDown} size="s" />
                 </Button>
@@ -231,22 +246,22 @@
         bind:isOpen={openBottomSheet}
         menu={{
             top: {
-                items: sortedTables.slice(0, 10).map((table) => {
+                items: sortedEntities.slice(0, 10).map((entity) => {
                     return {
-                        name: table.name,
+                        name: entity.name,
                         leadingIcon: IconTable,
-                        href: `${base}/project-${region}-${project}/databases/database-${databaseId}/table-${table.$id}`
+                        href: buildEntityRoute(page, entityTypeSingular, entity.$id)
                     };
                 })
             },
             bottom:
-                sortedTables.length > 10
+                sortedEntities.length > 10
                     ? {
                           items: [
                               {
-                                  name: 'All tables',
+                                  name: `All ${entityTypePlural}`,
                                   leadingIcon: IconTable,
-                                  href: `${base}/project-${region}-${project}/databases/database-${databaseId}`
+                                  href: databaseBaseRoute
                               }
                           ]
                       }
@@ -274,7 +289,7 @@
         }
     }
 
-    .table-content {
+    .entity-content {
         flex: 1;
         overflow-y: auto;
         overflow-x: hidden;
@@ -364,7 +379,7 @@
             }
         }
 
-        .table-name {
+        .entity-name {
             white-space: nowrap;
             overflow: hidden;
             text-overflow: ellipsis;
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/+layout.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/+layout.svelte
index 7a73c20c97..e56f274dce 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/+layout.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/+layout.svelte
@@ -23,7 +23,6 @@
     import { type RealtimeResponse, realtime, sdk } from '$lib/stores/sdk';
     import { onMount } from 'svelte';
     import {
-        table,
         columnsOrder,
         databaseColumnSheetOptions,
         databaseRowSheetOptions,
@@ -36,16 +35,15 @@
         expandTabs,
         databaseRelatedRowSheetOptions,
         rowPermissionSheet,
-        isWaterfallFromFaker,
-        type Columns
+        type Columns,
+        isWaterfallFromFaker
     } from './store';
     import { addSubPanel, registerCommands, updateCommandGroupRanks } from '$lib/commandCenter';
     import CreateColumn from './createColumn.svelte';
     import { CreateColumnPanel } from '$lib/commandCenter/panels';
-    import { database, showCreateTable } from '../store';
+    import { showCreateEntity } from '../store';
     import { project } from '../../../store';
     import { page } from '$app/state';
-    import { base } from '$app/paths';
     import { canWriteTables } from '$lib/stores/roles';
     import {
         IconChevronDown,
@@ -55,7 +53,7 @@
         IconPlus,
         IconPuzzle
     } from '@appwrite.io/pink-icons-svelte';
-    import SideSheet from './layout/sidesheet.svelte';
+    import { type Field, SideSheet, useTerminology } from '$database/(entity)';
     import EditRow from './rows/edit.svelte';
     import EditRelatedRow from './rows/editRelated.svelte';
     import EditColumn from './columns/edit.svelte';
@@ -63,21 +61,26 @@
     import EditRowPermissions from './rows/editPermissions.svelte';
     import { Dialog, Layout, Typography, Selector, Icon } from '@appwrite.io/pink-svelte';
     import { Button, Seekbar } from '$lib/elements/forms';
-    import { generateFakeRecords, generateColumns } from '$lib/helpers/faker';
+    import { generateFakeRecords, generateFields } from '$lib/helpers/faker';
     import { addNotification } from '$lib/stores/notifications';
-    import CreateIndex from './indexes/createIndex.svelte';
     import { hash } from '$lib/helpers/string';
     import { preferences } from '$lib/stores/preferences';
     import { buildRowUrl, isRelationship } from './rows/store';
     import { chunks } from '$lib/helpers/array';
     import { Submit, trackEvent } from '$lib/actions/analytics';
 
+    import type { LayoutData } from './$types';
+
+    import { CreateIndex } from '$database/(entity)';
+    import { resolveRoute, withPath } from '$lib/stores/navigation';
     import { isTabletViewport } from '$lib/stores/viewport';
     import { showColumnsSuggestionsModal } from '../(suggestions)';
     import IndexesSuggestions from '../(suggestions)/indexes.svelte';
     import ColumnsSuggestions from '../(suggestions)/columns.svelte';
     import { setupColumnObserver } from '../(observer)/columnObserver';
 
+    export let data: LayoutData;
+
     let editRow: EditRow;
     let editRelatedRow: EditRelatedRow;
     let editRowPermissions: EditRowPermissions;
@@ -91,6 +94,9 @@
     let selectedOption: Option['name'] = 'String';
     let createMoreColumns = false;
 
+    /* terminology */
+    const { type: databaseType } = useTerminology(page);
+
     let columnCreationHandler: ((response: RealtimeResponse) => void) | null = null;
 
     // manual management of focus is needed!
@@ -120,6 +126,12 @@
         };
     };
 
+    $: table = data.table;
+    $: basePath = resolveRoute(
+        '/(console)/project-[region]-[project]/databases/database-[database]/table-[table]',
+        page.params
+    );
+
     onMount(() => {
         expandTabs.set(preferences.getKey('tableHeaderExpanded', true));
 
@@ -139,8 +151,8 @@
     $: $registerCommands([
         {
             label: 'Create row',
-            keys: page.url.pathname.endsWith($table.$id) ? ['t'] : ['t', 'd'],
-            callback: () => ($showCreateTable = true),
+            keys: page.url.pathname.endsWith(table?.$id) ? ['t'] : ['t', 'd'],
+            callback: () => ($showCreateEntity = true),
             icon: IconPlus,
             group: 'rows'
         },
@@ -158,20 +170,16 @@
             label: 'Go to rows',
             keys: ['g', 'd'],
             callback() {
-                goto(
-                    `${base}/project-${page.params.region}-${page.params.project}/databases/database-${$database?.$id}/table-${$table?.$id}`
-                );
+                goto(basePath);
             },
-            disabled: page.url.pathname.endsWith($table.$id),
+            disabled: page.url.pathname.endsWith(table?.$id),
             group: 'tables'
         },
         {
             label: 'Go to columns',
             keys: ['g', 'a'],
             callback() {
-                goto(
-                    `${base}/project-${page.params.region}-${page.params.project}/databases/database-${$database?.$id}/table-${$table?.$id}/columns`
-                );
+                goto(withPath(basePath, '/columns'));
             },
             disabled: page.url.pathname.endsWith('columns'),
             group: 'tables'
@@ -180,9 +188,7 @@
             label: 'Go to indexes',
             keys: ['g', 'i'],
             callback() {
-                goto(
-                    `${base}/project-${page.params.region}-${page.params.project}/databases/database-${$database?.$id}/table-${$table?.$id}/indexes`
-                );
+                goto(withPath(basePath, '/indexes'));
             },
             disabled: page.url.pathname.endsWith('indexes'),
             group: 'tables'
@@ -191,9 +197,7 @@
             label: 'Go to activity',
             keys: ['g', 'c'],
             callback() {
-                goto(
-                    `${base}/project-${page.params.region}-${page.params.project}/databases/database-${$database?.$id}/table-${$table?.$id}/activity`
-                );
+                goto(withPath(basePath, '/activity'));
             },
             disabled: page.url.pathname.endsWith('activity'),
             group: 'tables'
@@ -202,9 +206,7 @@
             label: 'Go to usage',
             keys: ['g', 'u'],
             callback() {
-                goto(
-                    `${base}/project-${page.params.region}-${page.params.project}/databases/database-${$database?.$id}/table-${$table?.$id}/usage`
-                );
+                goto(withPath(basePath, '/usage'));
             },
             disabled: page.url.pathname.endsWith('usage'),
             group: 'tables'
@@ -213,19 +215,15 @@
             label: 'Go to settings',
             keys: ['g', 's'],
             callback() {
-                goto(
-                    `${base}/project-${page.params.region}-${page.params.project}/databases/database-${$database?.$id}/table-${$table?.$id}/settings`
-                );
+                goto(withPath(basePath, '/settings'));
             },
             disabled: page.url.pathname.endsWith('settings') || !$canWriteTables,
             group: 'tables'
         },
         {
             label: 'Display Name',
-            async callback() {
-                await goto(
-                    `${base}/project-${$project.region}-${$project.$id}/databases/database-${$database.$id}/table-${$table.$id}/settings#display-name`
-                );
+            callback() {
+                goto(withPath(basePath, '/settings#display-name'));
             },
             group: 'tables',
             disabled:
@@ -236,10 +234,8 @@
         },
         {
             label: 'Permissions',
-            async callback() {
-                await goto(
-                    `${base}/project-${$project.region}-${$project.$id}/databases/database-${$database.$id}/table-${$table.$id}/settings#permissions`
-                );
+            callback() {
+                goto(withPath(basePath, '/settings#permissions'));
             },
             group: 'tables',
             disabled:
@@ -250,10 +246,8 @@
         },
         {
             label: 'Row security',
-            async callback() {
-                await goto(
-                    `${base}/project-${$project.region}-${$project.$id}/databases/database-${$database.$id}/table-${$table.$id}/settings#row-security`
-                );
+            callback() {
+                goto(withPath(basePath, '/settings#row-security'));
             },
             group: 'tables',
             disabled:
@@ -287,9 +281,12 @@
         $spreadsheetLoading = true;
         $randomDataModalState.show = false;
 
-        let columns = page.data.table.columns as Columns[];
-        const hasAnyRelationships = columns.some((column) => isRelationship(column));
-        const filteredColumns = columns.filter((col) => col.type !== 'relationship');
+        let columns: Field[] = [];
+        const currentFields = table.fields;
+        const hasAnyRelationships = currentFields.some((field: Field) => isRelationship(field));
+        const filteredColumns = currentFields.filter(
+            (field: Field) => field.type !== 'relationship'
+        );
 
         if (!filteredColumns.length) {
             try {
@@ -301,7 +298,13 @@
 
                 columnCreationHandler = handler;
 
-                columns = await generateColumns($project, page.params.database, page.params.table);
+                columns = await generateFields(
+                    $project,
+                    page.params.database,
+                    page.params.table,
+                    databaseType
+                );
+
                 startWaiting(columns.length);
                 await waitPromise;
 
@@ -319,6 +322,8 @@
             } finally {
                 columnCreationHandler = null;
             }
+        } else {
+            columns = currentFields as Columns[];
         }
 
         let rowIds = [];
@@ -383,7 +388,7 @@
 </script>
 
 <svelte:head>
-    <title>{$table?.name ?? 'Table'} - Appwrite</title>
+    <title>{table?.name ?? 'Table'} - Appwrite</title>
 </svelte:head>
 
 <slot />
@@ -502,6 +507,7 @@
 
     {#key currentRowId}
         <EditRow
+            {table}
             bind:this={editRow}
             bind:row={$databaseRowSheetOptions.row}
             bind:rowId={$databaseRowSheetOptions.rowId}
@@ -537,9 +543,23 @@
         }
     }}>
     <CreateIndex
+        entity={table}
         bind:this={createIndex}
         bind:showCreateIndex={$showCreateIndexSheet.show}
-        externalColumnKey={$showCreateIndexSheet.column} />
+        externalFieldKey={$showCreateIndexSheet.column}
+        onCreateIndex={async (index) => {
+            await sdk.forProject(page.params.region, page.params.project).tablesDB.createIndex({
+                databaseId: page.params.database,
+                tableId: page.params.table,
+                key: index.key,
+                type: index.type,
+                columns: index.fields,
+                lengths: index.lengths,
+                orders: index.orders
+            });
+
+            await invalidate(Dependencies.TABLE);
+        }} />
 </SideSheet>
 
 <SideSheet
@@ -552,6 +572,7 @@
         onClick: async () => editRowPermissions?.updatePermissions()
     }}>
     <EditRowPermissions
+        {table}
         bind:this={editRowPermissions}
         bind:row={$rowPermissionSheet.row}
         bind:arePermsDisabled={editRowPermissionsDisabled} />
@@ -581,7 +602,7 @@
 
 <ColumnsSuggestions bind:show={$showColumnsSuggestionsModal} />
 
-<IndexesSuggestions />
+<IndexesSuggestions {table} />
 
 <style lang="scss">
     // not the best solution but needed!
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/+layout.ts b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/+layout.ts
index 2a34aa22f1..e2f2dadbcd 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/+layout.ts
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/+layout.ts
@@ -1,18 +1,22 @@
-import { sdk } from '$lib/stores/sdk';
-import { Dependencies } from '$lib/constants';
-import type { LayoutLoad } from './$types';
-import Breadcrumbs from './breadcrumbs.svelte';
 import Header from './header.svelte';
+import type { LayoutLoad } from './$types';
+import { Dependencies } from '$lib/constants';
+import { Breadcrumbs, useDatabaseSdk } from '$database/(entity)';
 
-export const load: LayoutLoad = async ({ params, depends }) => {
+export const load: LayoutLoad = async ({ params, depends, parent }) => {
+    const { database } = await parent();
     depends(Dependencies.TABLE);
 
+    const databaseSdk = useDatabaseSdk(params.region, params.project, database.type);
+
+    const table = await databaseSdk.getEntity({
+        databaseId: params.database,
+        entityId: params.table
+    });
+
     return {
+        table,
         header: Header,
-        breadcrumbs: Breadcrumbs,
-        table: await sdk.forProject(params.region, params.project).tablesDB.getTable({
-            databaseId: params.database,
-            tableId: params.table
-        })
+        breadcrumbs: Breadcrumbs
     };
 };
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/+page.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/+page.svelte
index 5483e87a37..36f3db3bba 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/+page.svelte
@@ -9,12 +9,10 @@
     import { Icon, Layout, Divider, Tooltip, Typography, Link } from '@appwrite.io/pink-svelte';
     import type { PageData } from './$types';
     import {
-        table,
         tableColumns,
         isCsvImportInProgress,
         showRowCreateSheet,
         showCreateColumnSheet,
-        type Columns,
         randomDataModalState,
         expandTabs
     } from './store';
@@ -35,10 +33,11 @@
         IconRefresh
     } from '@appwrite.io/pink-icons-svelte';
     import type { Models } from '@appwrite.io/console';
-    import EmptySheet from './layout/emptySheet.svelte';
     import CreateRow from './rows/create.svelte';
     import { onDestroy } from 'svelte';
     import { isCloud } from '$lib/system';
+    import { columnOptions } from './columns/store';
+    import { EmptySheet, EmptySheetCards, type Field } from '$database/(entity)';
     import { invalidate } from '$app/navigation';
     import { Dependencies } from '$lib/constants';
     import {
@@ -46,27 +45,31 @@
         tableColumnSuggestions,
         showColumnsSuggestionsModal
     } from '../(suggestions)';
-    import EmptySheetCards from './layout/emptySheetCards.svelte';
     import IconAI from '../(suggestions)/icon/aiForButton.svelte';
 
     export let data: PageData;
 
+    $: table = data.table;
+
     let isRefreshing = false;
     let showImportCSV = false;
 
     // todo: might need a type fix here.
     const filterColumns = writable<Column[]>([]);
 
-    function createTableColumns(columns: Columns[], selected: string[] = []): Column[] {
-        return columns.map((column) => ({
-            id: column.key,
-            title: column.key,
-            type: column.type as ColumnType,
-            hide: !!selected?.includes(column.key),
-            array: column?.array,
-            format: 'format' in column && column?.format === 'enum' ? column.format : null,
-            elements: 'elements' in column ? column.elements : null
-        }));
+    function createTableColumns(fields: Field[], selected: string[] = []): Column[] {
+        return fields.map((field) => {
+            return {
+                id: field.key,
+                title: field.key,
+                type: field.type as ColumnType,
+                hide: !!selected?.includes(field.key),
+                array: field?.array,
+                format: 'format' in field && field?.format === 'enum' ? field.format : null,
+                elements: 'elements' in field ? field.elements : null,
+                icon: columnOptions.find((option) => option.type === field.type)?.icon
+            };
+        });
     }
 
     function createFilterableColumns(columns: Column[], selected: string[] = []): Column[] {
@@ -84,14 +87,14 @@
 
     $: selected = preferences.getCustomTableColumns(page.params.table);
 
-    $: if ($table.columns) {
-        const freshColumns = createTableColumns($table.columns, selected);
+    $: if (table.fields) {
+        const freshColumns = createTableColumns(table.fields, selected);
         tableColumns.set(freshColumns);
         filterColumns.set(createFilterableColumns(freshColumns, selected));
     }
 
-    $: hasColumns = !!$table.columns.length;
-    $: hasValidColumns = $table?.columns?.some((col) => col.status === 'available');
+    $: hasColumns = !!table.fields.length;
+    $: hasValidColumns = table?.fields?.some((field: Field) => field.status === 'available');
     $: canShowSuggestionsSheet =
         // enabled, has table details
         // and it matches current table
@@ -255,7 +258,7 @@
                 <EmptySheet
                     mode="rows-filtered"
                     title="There are no rows that match your filters"
-                    customColumns={createTableColumns($table.columns, selected)}>
+                    customColumns={createTableColumns(table.fields, selected)}>
                     {#snippet actions()}
                         <Button
                             size="s"
@@ -275,7 +278,7 @@
                 <EmptySheet
                     mode="rows"
                     showActions={$canWriteRows}
-                    customColumns={createTableColumns($table.columns, selected)}>
+                    customColumns={createTableColumns(table.fields, selected)}>
                     {#snippet actions()}
                         <EmptySheetCards
                             icon={IconPlus}
@@ -371,7 +374,7 @@
 {/if}
 
 <CreateRow
-    table={$table}
+    {table}
     bind:showSheet={$showRowCreateSheet.show}
     bind:existingData={$showRowCreateSheet.row} />
 
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/+page.ts b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/+page.ts
index 31d33e0299..0f954c47d4 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/+page.ts
@@ -1,11 +1,12 @@
 import { Dependencies, SPREADSHEET_PAGE_LIMIT } from '$lib/constants';
 import { getLimit, getPage, getQuery, getView, pageToOffset, View } from '$lib/helpers/load';
 import { sdk } from '$lib/stores/sdk';
-import { type Models, Query } from '@appwrite.io/console';
+import { Query } from '@appwrite.io/console';
 import type { PageLoad } from './$types';
 import { queries, queryParamToMap } from '$lib/components/filters';
 import { buildWildcardColumnsQuery } from './rows/store';
 import type { TagValue } from '$lib/components/filters/store';
+import type { Entity } from '$database/(entity)';
 
 export const load: PageLoad = async ({ params, depends, url, route, parent }) => {
     const { table } = await parent();
@@ -57,7 +58,7 @@ function buildGridQueries(
     limit: number,
     offset: number,
     parsedQueries: Map<TagValue, string>,
-    table: Models.Table
+    table: Entity
 ) {
     const hasOrderQuery = Array.from(parsedQueries.values()).some(
         (q) => q.includes('orderAsc') || q.includes('orderDesc')
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/activity/+page.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/activity/+page.svelte
index 1161bb56d8..849d38953b 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/activity/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/activity/+page.svelte
@@ -2,7 +2,11 @@
     import { Activity } from '$lib/layout';
     import type { PageData } from './$types';
 
-    export let data: PageData;
+    const {
+        data
+    }: {
+        data: PageData;
+    } = $props();
 </script>
 
 <div class="wide-screen-wrapper databases-spreadsheet">
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/breadcrumbs.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/breadcrumbs.svelte
deleted file mode 100644
index 0b27f2fd07..0000000000
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/breadcrumbs.svelte
+++ /dev/null
@@ -1,27 +0,0 @@
-<script lang="ts">
-    import { base } from '$app/paths';
-    import { page } from '$app/state';
-    import { Breadcrumbs } from '$lib/layout';
-    import { database } from '../store';
-    import { table } from './store';
-
-    $: breadcrumbs = [
-        {
-            title: '...'
-        },
-        {
-            href: `${base}/project-${page.params.region}-${page.params.project}/databases`,
-            title: 'Databases'
-        },
-        {
-            href: `${base}/project-${page.params.region}-${page.params.project}/databases/database-${$database?.$id}`,
-            title: $database?.name
-        },
-        {
-            href: `${base}/project-${page.params.region}-${page.params.project}/databases/database-${$database?.$id}/table-${$table?.$id}`,
-            title: $table?.name
-        }
-    ];
-</script>
-
-<Breadcrumbs {breadcrumbs} />
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/+page.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/+page.svelte
index 08d9192f4a..ab6eb7e417 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/+page.svelte
@@ -16,7 +16,6 @@
         Typography
     } from '@appwrite.io/pink-svelte';
     import { isRelationship, isSpatialType, isString } from '../rows/store';
-    import FailedModal from '../failedModal.svelte';
     import {
         columns,
         type Columns,
@@ -46,10 +45,8 @@
     } from '@appwrite.io/pink-icons-svelte';
     import { type ComponentProps, onDestroy, onMount } from 'svelte';
     import { Click, trackEvent } from '$lib/actions/analytics';
-    import CsvDisabled from '../csvDisabled.svelte';
     import { isSmallViewport } from '$lib/stores/viewport';
-    import SideSheet from '../layout/sidesheet.svelte';
-    import SpreadsheetContainer from '../layout/spreadsheet.svelte';
+    import { SideSheet, SpreadsheetContainer, FailedModal, CsvDisabled } from '$database/(entity)';
     import { showCreateColumnSheet } from '../store';
     import { type Models } from '@appwrite.io/console';
     import { preferences } from '$lib/stores/preferences';
@@ -572,9 +569,9 @@
 </div>
 
 {#if selectedColumn}
-    <DeleteColumn bind:showDelete bind:selectedColumn />
+    <DeleteColumn table={data.table} bind:showDelete bind:selectedColumn />
 {:else if selectedColumns && selectedColumns.length}
-    <DeleteColumn bind:showDelete bind:selectedColumn={selectedColumns} />
+    <DeleteColumn table={data.table} bind:showDelete bind:selectedColumn={selectedColumns} />
 {/if}
 
 <SideSheet
@@ -587,9 +584,7 @@
     <EditColumn showEdit isModal={false} {selectedColumn} bind:this={editColumn} />
 </SideSheet>
 
-{#if showFailed}
-    <FailedModal bind:show={showFailed} title="Create attribute" header="Creation failed" {error} />
-{/if}
+<FailedModal bind:show={showFailed} title="Create column" header="Creation failed" {error} />
 
 <style>
     .floating-action-bar {
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/createColumnDropdown.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/createColumnDropdown.svelte
index 172d5f42c6..7f464ebd2a 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/createColumnDropdown.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/createColumnDropdown.svelte
@@ -3,8 +3,8 @@
     import { ActionMenu, Icon, Popover } from '@appwrite.io/pink-svelte';
     import { columnOptions, type Option } from './store';
     import { IconPlus } from '@appwrite.io/pink-icons-svelte';
-    import CsvDisabled from '../csvDisabled.svelte';
     import { isCsvImportInProgress } from '../store';
+    import { CsvDisabled } from '$database/(entity)';
 
     export let showCreate = false;
     export let selectedOption: Option['name'] = null;
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/deleteColumn.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/deleteColumn.svelte
index 7b72bd20bb..d7ff1f08fc 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/deleteColumn.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/deleteColumn.svelte
@@ -1,7 +1,6 @@
 <script lang="ts">
     import { page } from '$app/state';
     import { addNotification } from '$lib/stores/notifications';
-    import { table } from '../store';
     import type { Columns } from '../store';
     import { sdk } from '$lib/stores/sdk';
     import { Submit, trackEvent, trackError } from '$lib/actions/analytics';
@@ -9,11 +8,14 @@
     import Confirm from '$lib/components/confirm.svelte';
     import { Layout } from '@appwrite.io/pink-svelte';
     import type { Models } from '@appwrite.io/console';
+    import type { Entity } from '$database/(entity)';
 
     let {
+        table,
         showDelete = $bindable(false),
         selectedColumn = $bindable(null)
     }: {
+        table: Entity;
         showDelete: boolean;
         selectedColumn: Columns | string[];
     } = $props();
@@ -90,12 +92,12 @@
     {#if selectedColumns.length === 1}
         <p>
             Are you sure you want to delete <b data-private>{selectedKeys[0]}</b> from
-            <b data-private>{$table?.name}</b>?
+            <b data-private>{table.name}</b>?
         </p>
     {:else}
         <p>
             Are you sure you want to delete <b data-private>{selectedKeys.join(', ')}</b> from
-            <b data-private>{$table?.name}</b>?
+            <b data-private>{table.name}</b>?
         </p>
     {/if}
 
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/relationship.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/relationship.svelte
index 8d3c0099e7..9c1fe7e611 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/relationship.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/relationship.svelte
@@ -56,18 +56,16 @@
 </script>
 
 <script lang="ts">
-    import { InputText, InputSelect } from '$lib/elements/forms';
     import { onMount } from 'svelte';
     import { Box } from '$lib/components';
-    import { table } from '../store';
     import arrowOne from './arrow-one.svg';
     import arrowTwo from './arrow-two.svg';
     import { camelize } from '$lib/helpers/string';
+    import { debounce } from '$lib/helpers/debounce';
+    import { InputText, InputSelect } from '$lib/elements/forms';
     import { Card, Layout, Input } from '@appwrite.io/pink-svelte';
     import { IconArrowSmRight, IconSwitchHorizontal } from '@appwrite.io/pink-icons-svelte';
-    import { debounce } from '$lib/helpers/debounce';
 
-    // Props
     export let editing = false;
     export let disabled = false;
     export let data: Models.ColumnRelationship;
@@ -122,7 +120,9 @@
     });
 
     // Reactive statements
-    $: tables = tableList?.tables?.filter((n) => n.$id !== $table.$id) ?? [];
+    $: currentTable = page.data.table;
+
+    $: tables = tableList?.tables?.filter((n) => n.$id !== currentTable.$id) ?? [];
 
     $: if (editing) {
         way = data.twoWay ? 'two' : 'one';
@@ -130,7 +130,7 @@
         if (way === 'two') {
             data.twoWay = true;
             if (!data.twoWayKey) {
-                data.twoWayKey = camelize($table.name);
+                data.twoWayKey = camelize(currentTable.name);
             }
         } else {
             data.twoWay = false;
@@ -219,7 +219,7 @@
     <div class="u-flex u-flex-vertical u-gap-16">
         <Box>
             <div class="u-flex u-align u-cross-center u-main-center u-gap-32">
-                <span data-private>{camelize($table.name)}</span>
+                <span data-private>{camelize(currentTable.name)}</span>
                 {#if data.twoWay}
                     <img src={arrowTwo} alt={'Two way relationship'} />
                 {:else}
@@ -231,7 +231,7 @@
         {#if data.relationType}
             <div>
                 <p class="u-text-center">
-                    <b data-private>{camelize($table.name)}</b> can contain {[
+                    <b data-private>{camelize(currentTable.name)}</b> can contain {[
                         'oneToOne',
                         'manyToOne'
                     ].includes(data.relationType)
@@ -244,7 +244,7 @@
                     can belong to {['oneToOne', 'oneToMany'].includes(data.relationType)
                         ? 'one'
                         : 'many'}
-                    <b data-private>{camelize($table.name)}</b>
+                    <b data-private>{camelize(currentTable.name)}</b>
                 </p>
             </div>
         {/if}
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/csvDisabled.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/csvDisabled.svelte
deleted file mode 100644
index 1ebac31832..0000000000
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/csvDisabled.svelte
+++ /dev/null
@@ -1,12 +0,0 @@
-<script lang="ts">
-    import { isCsvImportInProgress } from './store';
-    import { Tooltip } from '@appwrite.io/pink-svelte';
-</script>
-
-<Tooltip disabled={!$isCsvImportInProgress} maxWidth="12rem">
-    <div>
-        <slot />
-    </div>
-
-    <div slot="tooltip">This action is disabled during import.</div>
-</Tooltip>
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/failedModal.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/failedModal.svelte
deleted file mode 100644
index 8c67e481f0..0000000000
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/failedModal.svelte
+++ /dev/null
@@ -1,26 +0,0 @@
-<script lang="ts">
-    import Modal from '$lib/components/modal.svelte';
-    import Button from '$lib/elements/forms/button.svelte';
-
-    export let show: boolean;
-    export let error: string;
-    export let title: string;
-    export let header: string;
-</script>
-
-<Modal {title} bind:show>
-    <div class="box u-flex-vertical u-gap-24">
-        <p class="u-inline-flex u-cross-center u-gap-8">
-            <span
-                class="icon-exclamation-circle u-font-size-20"
-                aria-hidden="true"
-                style="color:hsl(var(--color-danger-100));"></span
-            >{header}
-        </p>
-        <p>{error}</p>
-    </div>
-
-    <svelte:fragment slot="footer">
-        <Button secondary on:click={() => (show = false)}>Close</Button>
-    </svelte:fragment>
-</Modal>
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/header.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/header.svelte
index 2e52e82f96..fd5d1e1f0c 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/header.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/header.svelte
@@ -1,23 +1,19 @@
 <script lang="ts">
-    import { base } from '$app/paths';
     import { page } from '$app/state';
-    import { Id, Tab, Tabs } from '$lib/components';
-    import { isTabSelected } from '$lib/helpers/load';
-    import { Cover } from '$lib/layout';
-    import AnimatedTitle from '$lib/layout/animatedTitle.svelte';
     import { canWriteTables } from '$lib/stores/roles';
-    import { expandTabs, table } from './store';
-    import { Layout } from '@appwrite.io/pink-svelte';
-    import { preferences } from '$lib/stores/preferences';
+    import { resolveRoute } from '$lib/stores/navigation';
 
-    const databaseId = $derived(page.params.database);
-
-    const tableId = $derived(page.params.table);
+    import { type Entity, Header } from '$database/(entity)';
 
     const path = $derived(
-        `${base}/project-${page.params.region}-${page.params.project}/databases/database-${databaseId}/table-${tableId}`
+        resolveRoute(
+            '/(console)/project-[region]-[project]/databases/database-[database]/table-[table]',
+            page.params
+        )
     );
 
+    const table = $derived(page.data.table) as Entity;
+
     const tabs = $derived(
         [
             {
@@ -56,77 +52,8 @@
             }
         ].filter((tab) => !tab.disabled)
     );
-
-    const link = $derived(
-        `${base}/project-${page.params.region}-${page.params.project}/databases/database-${databaseId}`
-    );
-
-    const nonSheetPages = $derived.by(() => {
-        const endings = ['table-[table]', 'table-[table]/columns', 'table-[table]/indexes'];
-        const isSpreadsheetPage = endings.some((end) => page.route.id?.endsWith(end));
-        return !isSpreadsheetPage;
-    });
-
-    $effect(() => {
-        if (nonSheetPages) expandTabs.set(true);
-        else {
-            expandTabs.set(preferences.getKey('tableHeaderExpanded', true));
-        }
-    });
 </script>
 
-<div class:nonSheetPages>
-    <Cover animate expanded collapsed={!$expandTabs} blocksize={$expandTabs ? '152px' : '90px'}>
-        <svelte:fragment slot="header">
-            <Layout.Stack direction="row" alignContent="center" alignItems="center" inline>
-                <AnimatedTitle href={link} collapsed={!$expandTabs}>
-                    {$table?.name}
-                </AnimatedTitle>
-
-                {#key $table?.$id}
-                    <Id value={$table?.$id} tooltipPlacement={$expandTabs ? undefined : 'right'}
-                        >{$table?.$id}</Id>
-                {/key}
-            </Layout.Stack>
-        </svelte:fragment>
-
-        <div class="tabs-container" class:collapsed={!$expandTabs}>
-            <Tabs>
-                {#each tabs as tab}
-                    <Tab
-                        href={tab.href}
-                        selected={isTabSelected(tab, page.url.pathname, path, tabs)}
-                        event={tab.event}>
-                        {tab.title}
-                    </Tab>
-                {/each}
-            </Tabs>
-        </div>
-    </Cover>
-</div>
-
-<style lang="scss">
-    .nonSheetPages :global(.cover-container) {
-        @media (min-width: 1440px) {
-            padding-inline: 7px !important;
-        }
-
-        @media (min-width: 1728px) {
-            padding-inline: 10.25rem !important;
-        }
-    }
-
-    .tabs-container {
-        opacity: 1;
-        transition: opacity 300ms cubic-bezier(0.4, 0, 0.2, 1);
-
-        &.collapsed {
-            opacity: 0;
-            pointer-events: none;
-
-            & :global([role='tab']) {
-                cursor: default;
-            }
-        }
-    }
-</style>
+{#if table}
+    <Header {tabs} entity={table} />
+{/if}
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/indexes/+page.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/indexes/+page.svelte
index 9f2313ae13..28dd10b930 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/indexes/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/indexes/+page.svelte
@@ -1,352 +1,103 @@
 <script lang="ts">
-    import { Container } from '$lib/layout';
-    import { table, type ColumnsWidth } from '../store';
-    import Delete from './deleteIndex.svelte';
-    import CreateIndex from './createIndex.svelte';
-    import Overview from './overviewIndex.svelte';
-    import type { Models } from '@appwrite.io/console';
-    import { Button } from '$lib/elements/forms';
-    import FailedModal from '../failedModal.svelte';
-    import { canWriteTables } from '$lib/stores/roles';
-    import { preferences } from '$lib/stores/preferences';
-    import { debounce } from '$lib/helpers/debounce';
-    import {
-        ActionMenu,
-        Badge,
-        Divider,
-        FloatingActionBar,
-        Icon,
-        Layout,
-        Link,
-        Popover,
-        Spreadsheet,
-        Typography
-    } from '@appwrite.io/pink-svelte';
-    import {
-        IconBookOpen,
-        IconDotsHorizontal,
-        IconEye,
-        IconPlus,
-        IconTrash
-    } from '@appwrite.io/pink-icons-svelte';
-    import { type ComponentProps, onDestroy, onMount } from 'svelte';
-    import { Click, trackEvent } from '$lib/actions/analytics';
-    import EmptySheet from '../layout/emptySheet.svelte';
-    import SpreadsheetContainer from '../layout/spreadsheet.svelte';
-    import SideSheet from '../layout/sidesheet.svelte';
-    import type { PageData } from './$types';
-    import { showCreateColumnSheet } from '../store';
-    import { isSmallViewport } from '$lib/stores/viewport';
     import { page } from '$app/state';
-    import { showIndexesSuggestions, showColumnsSuggestionsModal } from '../../(suggestions)';
-    import IconAI from '../../(suggestions)/icon/aiForButton.svelte';
-    import EmptySheetCards from '../layout/emptySheetCards.svelte';
+    import { onDestroy } from 'svelte';
+    import { sdk } from '$lib/stores/sdk';
     import { isCloud } from '$lib/system';
-    import { realtime } from '$lib/stores/sdk';
-    import { invalidate } from '$app/navigation';
-    import { Dependencies } from '$lib/constants';
-
-    let {
-        data
-    }: {
-        data: PageData;
-    } = $props();
-
-    let showCreateIndex = $state(false);
-    let selectedIndex: Models.ColumnIndex = $state(null);
-
-    let selectedIndexes = $state([]);
-    let createIndex: CreateIndex;
-
-    let error = $state('');
-    let showFailed = $state(false);
-    let showDelete = $state(false);
-    let showOverview = $state(false);
-
-    let columnsWidth = $state<ColumnsWidth | null>(null);
-
-    const tableId = page.params.table;
-    const organizationId = data.organization.$id ?? data.project.teamId;
-
-    const spreadsheetColumns = $derived([
-        {
-            id: 'key',
-            width: getColumnWidth('key', 250),
-            minimumWidth: 250,
-            resizable: true
-        },
-        {
-            id: 'type',
-            width: getColumnWidth('type', 200),
-            minimumWidth: 200,
-            resizable: true
-        },
-        {
-            id: 'columns',
-            width: getColumnWidth('columns', 200),
-            minimumWidth: 200,
-            resizable: true
-        },
-        // { id: 'orders' }, // design doesn't have orders atm
-        {
-            id: 'lengths',
-            width: getColumnWidth('lengths', 180),
-            minimumWidth: 180,
-            resizable: true
-        },
-        {
-            id: 'actions',
-            width: 40,
-            isAction: true,
-            resizable: false
-        }
-    ]);
+    import type { PageProps } from './$types';
+    import { canWriteTables } from '$lib/stores/roles';
+    import { Typography, Link } from '@appwrite.io/pink-svelte';
+    import IconAI from '../../(suggestions)/icon/aiForButton.svelte';
+    import { showCreateColumnSheet } from '$database/table-[table]/store';
+    import { IconBookOpen, IconPlus } from '@appwrite.io/pink-icons-svelte';
+    import { showIndexesSuggestions, showColumnsSuggestionsModal } from '$database/(suggestions)';
+    import {
+        type CreateIndexesCallbackType,
+        Indexes,
+        EmptySheet,
+        EmptySheetCards
+    } from '$database/(entity)';
 
-    onMount(() => {
-        columnsWidth = preferences.getColumnWidths(tableId + '#indexes');
+    let { data }: PageProps = $props();
 
-        return realtime.forProject(page.params.region, ['project', 'console'], (response) => {
-            if (response.events.includes('databases.*.tables.*.indexes.*')) {
-                invalidate(Dependencies.TABLE);
-            }
-        });
+    const params = $derived({
+        databaseId: page.params.database,
+        tableId: page.params.table
     });
 
-    function getColumnStatusBadge(status: string): ComponentProps<Badge>['type'] {
-        switch (status) {
-            case 'processing':
-                return 'warning';
-            case 'deleting':
-            case 'stuck':
-            case 'failed':
-                return 'error';
-            default:
-                return undefined;
-        }
-    }
+    const tablesDB = $derived(sdk.forProject(page.params.region, page.params.project).tablesDB);
 
-    function getColumnWidth(columnId: string, defaultWidth: number): number {
-        const savedWidth = columnsWidth?.[columnId];
-        if (!savedWidth) return defaultWidth;
-
-        return savedWidth.resized;
+    async function onCreateIndex(index: CreateIndexesCallbackType) {
+        await tablesDB.createIndex({
+            ...params,
+            key: index.key,
+            type: index.type,
+            columns: index.fields,
+            lengths: index.lengths,
+            orders: index.orders
+        });
     }
 
-    function saveColumnsWidth({ columnId, newWidth }: { columnId: string; newWidth: number }) {
-        const existing = columnsWidth?.[columnId];
-        const fixed = existing
-            ? typeof existing?.fixed === 'number'
-                ? existing.fixed
-                : existing?.fixed?.min
-            : newWidth;
-
-        columnsWidth = {
-            ...(columnsWidth ?? {}),
-            [columnId]: {
-                fixed,
-                resized: Math.ceil(newWidth)
-            }
-        };
-
-        saveColumnWidthsToPreferences({ columnId, newWidth, fixedWidth: fixed });
+    async function onDeleteIndexes(selectedKeys: string[]) {
+        await Promise.all(
+            selectedKeys.map((key) =>
+                tablesDB.deleteIndex({
+                    ...params,
+                    key
+                })
+            )
+        );
     }
 
-    const saveColumnWidthsToPreferences = debounce(
-        (column: { columnId: string; newWidth: number; fixedWidth: number }) => {
-            if (!organizationId) return;
-
-            preferences.saveColumnWidths(organizationId, tableId + '#indexes', {
-                [column.columnId]: {
-                    fixed: column.fixedWidth,
-                    resized: Math.ceil(column.newWidth)
-                }
-            });
-        },
-        1000
-    );
-
     onDestroy(() => ($showCreateColumnSheet.show = false));
-
-    const emptyCellsLimit = $derived($isSmallViewport ? 14 : 17);
-    const emptyCellsCount = $derived(
-        data.table.indexes.length >= emptyCellsLimit
-            ? 0
-            : emptyCellsLimit - data.table.indexes.length
-    );
 </script>
 
-<Container
-    expanded
-    expandHeightButton={$isSmallViewport}
-    style="background: var(--bgcolor-neutral-primary)">
-    <Layout.Stack direction="row" justifyContent="flex-end">
-        {#if $canWriteTables}
-            <Button
-                secondary
-                event="create_index"
-                disabled={!$table?.columns?.length}
-                on:click={() => (showCreateIndex = true)}>
-                <Icon icon={IconPlus} slot="start" size="s" />
-                Create index
-            </Button>
-        {/if}
-    </Layout.Stack>
-</Container>
-
-<div class="databases-spreadsheet">
-    {#if data.table?.columns?.length}
-        {#if data.table.indexes.length}
-            <SpreadsheetContainer>
-                <Spreadsheet.Root
-                    let:root
-                    columns={spreadsheetColumns}
-                    height="100%"
-                    allowSelection
-                    emptyCells={emptyCellsCount}
-                    bind:selectedRows={selectedIndexes}
-                    bottomActionClick={() => (showCreateIndex = true)}
-                    on:columnsResize={(resize) => saveColumnsWidth(resize.detail)}>
-                    <svelte:fragment slot="header" let:root>
-                        <Spreadsheet.Header.Cell column="key" {root}>Key</Spreadsheet.Header.Cell>
-                        <Spreadsheet.Header.Cell column="type" {root}>Type</Spreadsheet.Header.Cell>
-                        <Spreadsheet.Header.Cell column="columns" {root}
-                            >Columns</Spreadsheet.Header.Cell>
-                        <!--                        <Spreadsheet.Header.Cell column="orders" {root}-->
-                        <!--                            >Orders</Spreadsheet.Header.Cell>-->
-                        <Spreadsheet.Header.Cell column="lengths" {root}
-                            >Lengths</Spreadsheet.Header.Cell>
-                        <Spreadsheet.Header.Cell column="actions" {root} />
-                    </svelte:fragment>
-
-                    {#each data.table.indexes as index}
-                        <Spreadsheet.Row.Base {root} id={index.key}>
-                            <Spreadsheet.Cell column="key" {root} isEditable={false}>
-                                <Layout.Stack direction="row" alignItems="center">
-                                    {index.key}
-                                    {#if index.status !== 'available'}
-                                        <Badge
-                                            size="s"
-                                            variant="secondary"
-                                            content={index.status}
-                                            type={getColumnStatusBadge(index.status)} />
-                                        {#if index.error}
-                                            <Link.Button
-                                                variant="muted"
-                                                on:click={(e) => {
-                                                    e.preventDefault();
-                                                    error = index.error;
-                                                    showFailed = true;
-                                                }}>Details</Link.Button>
-                                        {/if}
-                                    {/if}
-                                </Layout.Stack>
-                            </Spreadsheet.Cell>
-                            <Spreadsheet.Cell column="type" {root} isEditable={false}
-                                >{index.type}</Spreadsheet.Cell>
-                            <Spreadsheet.Cell column="columns" {root} isEditable={false}>
-                                {index.columns.join(', ')}
-                            </Spreadsheet.Cell>
-                            <!--                            <Spreadsheet.Cell column="orders" {root} isEditable={false}>-->
-                            <!--                                {index.orders}-->
-                            <!--                            </Spreadsheet.Cell>-->
-                            <Spreadsheet.Cell column="lengths" {root} isEditable={false}>
-                                {index.lengths}
-                            </Spreadsheet.Cell>
-                            <Spreadsheet.Cell column="actions" {root}>
-                                <Popover let:toggle padding="none" placement="bottom-end" portal>
-                                    <Button text icon ariaLabel="more options" on:click={toggle}>
-                                        <Icon icon={IconDotsHorizontal} size="s" />
-                                    </Button>
-                                    <ActionMenu.Root slot="tooltip" let:toggle>
-                                        <ActionMenu.Item.Button
-                                            leadingIcon={IconEye}
-                                            on:click={() => {
-                                                toggle();
-                                                selectedIndex = index;
-                                                showOverview = true;
-                                            }}>Overview</ActionMenu.Item.Button>
-
-                                        <div style:padding-block="0.25rem">
-                                            <Divider />
-                                        </div>
-
-                                        <ActionMenu.Item.Button
-                                            status="danger"
-                                            leadingIcon={IconTrash}
-                                            on:click={() => {
-                                                toggle();
-                                                showDelete = true;
-                                                selectedIndex = index;
-                                                trackEvent(Click.DatabaseIndexDelete);
-                                            }}>Delete</ActionMenu.Item.Button>
-                                    </ActionMenu.Root>
-                                </Popover>
-                            </Spreadsheet.Cell>
-                        </Spreadsheet.Row.Base>
-                    {/each}
-
-                    <svelte:fragment slot="footer">
-                        <Layout.Stack
-                            direction="row"
-                            alignContent="center"
-                            alignItems="center"
-                            justifyContent="space-between">
-                            <Typography.Text variant="m-400" color="--fgcolor-neutral-secondary">
-                                {@const length = data.table.indexes.length}
-                                {length}
-                                {length === 1 ? 'index' : 'indexes'}
-                            </Typography.Text>
-                        </Layout.Stack>
-                    </svelte:fragment>
-                </Spreadsheet.Root>
-            </SpreadsheetContainer>
-        {:else}
-            <EmptySheet mode="indexes" showActions={$canWriteTables}>
-                {#snippet subtitle()}
-                    {#if isCloud}
-                        <Typography.Text align="center">
-                            Need a hand? Learn more in the
-                            <Link.Anchor
-                                target="_blank"
-                                href="https://appwrite.io/docs/products/databases/tables#indexes">
-                                docs.
-                            </Link.Anchor>
-                        </Typography.Text>
-                    {/if}
-                {/snippet}
-
-                {#snippet actions()}
-                    {#if isCloud}
-                        <EmptySheetCards
-                            icon={IconAI}
-                            title="Suggest indexes"
-                            disabled={!$table?.columns?.length}
-                            subtitle="Use AI to generate indexes"
-                            onClick={() => {
-                                showIndexesSuggestions.update(() => true);
-                            }} />
-                    {/if}
+<Indexes {onCreateIndex} {onDeleteIndexes} entity={data.table}>
+    {#snippet emptyIndexesSheetView(toggle)}
+        <EmptySheet mode="indexes" showActions={$canWriteTables}>
+            {#snippet subtitle()}
+                {#if isCloud}
+                    <Typography.Text align="center">
+                        Need a hand? Learn more in the
+                        <Link.Anchor
+                            target="_blank"
+                            href="https://appwrite.io/docs/products/databases/tables#indexes">
+                            docs.
+                        </Link.Anchor>
+                    </Typography.Text>
+                {/if}
+            {/snippet}
 
+            {#snippet actions()}
+                {#if isCloud}
                     <EmptySheetCards
-                        icon={IconPlus}
-                        title="Create index"
-                        disabled={!$table?.columns?.length}
-                        subtitle="Create indexes manually"
+                        icon={IconAI}
+                        title="Suggest indexes"
+                        disabled={!data.table?.fields?.length}
+                        subtitle="Use AI to generate indexes"
                         onClick={() => {
-                            showCreateIndex = true;
+                            showIndexesSuggestions.update(() => true);
                         }} />
+                {/if}
+
+                <EmptySheetCards
+                    icon={IconPlus}
+                    title="Create index"
+                    disabled={!data.table?.fields?.length}
+                    subtitle="Create indexes manually"
+                    onClick={toggle} />
 
-                    {#if !isCloud}
-                        <EmptySheetCards
-                            icon={IconBookOpen}
-                            title="Documentation"
-                            subtitle="Read the Appwrite docs"
-                            href="https://appwrite.io/docs/products/databases/tables#indexes" />
-                    {/if}
-                {/snippet}
-            </EmptySheet>
-        {/if}
-    {:else}
+                {#if !isCloud}
+                    <EmptySheetCards
+                        icon={IconBookOpen}
+                        title="Documentation"
+                        subtitle="Read the Appwrite docs"
+                        href="https://appwrite.io/docs/products/databases/tables#indexes" />
+                {/if}
+            {/snippet}
+        </EmptySheet>
+    {/snippet}
+
+    {#snippet emptyEntitiesSheetView()}
         <EmptySheet mode="indexes" title="You have no columns yet" showActions={$canWriteTables}>
             {#snippet subtitle()}
                 {#if isCloud}
@@ -395,59 +146,5 @@
                 {/if}
             {/snippet}
         </EmptySheet>
-    {/if}
-
-    {#if selectedIndexes.length > 0}
-        <div class="floating-action-bar">
-            <FloatingActionBar>
-                <svelte:fragment slot="start">
-                    <div style:width="max-content">
-                        <Layout.Stack direction="row" alignItems="center" gap="m">
-                            <Badge content={selectedIndexes.length.toString()} />
-                            <span style:font-size="14px">
-                                {selectedIndexes.length > 1 ? 'indexes' : 'index'}
-                                selected
-                            </span>
-                        </Layout.Stack>
-                    </div>
-                </svelte:fragment>
-                <svelte:fragment slot="end">
-                    <Button text on:click={() => (selectedIndexes = [])}>Cancel</Button>
-                    <Button secondary on:click={() => (showDelete = true)}>Delete</Button>
-                </svelte:fragment>
-            </FloatingActionBar>
-        </div>
-    {/if}
-</div>
-
-<SideSheet
-    title="Create index"
-    bind:show={showCreateIndex}
-    submit={{
-        text: 'Create',
-        onClick: async () => await createIndex.create()
-    }}>
-    <CreateIndex {showCreateIndex} bind:this={createIndex} />
-</SideSheet>
-
-{#if selectedIndex}
-    <Delete bind:showDelete {selectedIndex} />
-{:else if selectedIndexes && selectedIndexes.length}
-    <Delete bind:showDelete bind:selectedIndex={selectedIndexes} />
-{/if}
-
-<SideSheet title="Preview index" bind:show={showOverview}>
-    <Overview {selectedIndex} />
-</SideSheet>
-
-<FailedModal bind:show={showFailed} title="Create index" header="Creation failed" {error} />
-
-<style lang="scss">
-    .floating-action-bar {
-        left: 50%;
-        width: 100%;
-        z-index: 14;
-        position: absolute;
-        transform: translateX(-50%);
-    }
-</style>
+    {/snippet}
+</Indexes>
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/indexes/select.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/indexes/select.svelte
deleted file mode 100644
index e356097a5e..0000000000
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/indexes/select.svelte
+++ /dev/null
@@ -1,39 +0,0 @@
-<script lang="ts">
-    import Helper from '$lib/elements/forms/helper.svelte';
-    import { Icon } from '@appwrite.io/pink-svelte';
-    import { IconChevronDown } from '@appwrite.io/pink-icons-svelte';
-
-    export let value: string;
-    export let id: string;
-    export let label: string;
-    export let required = false;
-
-    let element: HTMLSelectElement;
-
-    let error: string;
-
-    const handleInvalid = (event: Event) => {
-        event.preventDefault();
-
-        if (element.validity.valueMissing) {
-            error = 'This field is required';
-            return;
-        }
-        error = element.validationMessage;
-    };
-
-    $: if (value) {
-        error = null;
-    }
-</script>
-
-<label class="label" for={id}>{label}</label>
-<div class="select">
-    <select bind:this={element} {id} bind:value {required} on:invalid={handleInvalid}>
-        <slot />
-    </select>
-    <Icon icon={IconChevronDown} size="s" />
-</div>
-{#if error}
-    <Helper type="warning">{error}</Helper>
-{/if}
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/rows/columns/types/relationship.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/rows/columns/types/relationship.svelte
index fccc94df4a..4f8c836bd8 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/rows/columns/types/relationship.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/rows/columns/types/relationship.svelte
@@ -124,7 +124,12 @@
     }
 
     function updateRelatedList() {
+        /**
+         * don't be alarmed here.
+         * reassigning to trigger reactivity!
+         */
         relatedList = relatedList;
+
         value = relatedList;
     }
 
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/rows/create.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/rows/create.svelte
index 8ac677c606..62eb13dd6f 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/rows/create.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/rows/create.svelte
@@ -10,7 +10,7 @@
     import { type Columns, spreadsheetRenderKey } from '../store';
     import { ID, type Models } from '@appwrite.io/console';
     import { Alert, Layout, Typography, Selector } from '@appwrite.io/pink-svelte';
-    import SideSheet from '../layout/sidesheet.svelte';
+    import { type Entity, SideSheet, toRelationalField } from '$database/(entity)';
     import { invalidate } from '$app/navigation';
     import { Dependencies } from '$lib/constants';
     import { tick } from 'svelte';
@@ -29,8 +29,8 @@
         showSheet = $bindable(false),
         existingData = $bindable(null)
     }: {
+        table: Entity;
         showSheet: boolean;
-        table: Models.Table;
         existingData: Models.Row | null;
     } = $props();
 
@@ -45,15 +45,17 @@
     }
 
     function computeInitialCreateRow(): CreateRow {
-        const availableColumns = table.columns.filter((a) => a.status === 'available');
+        const availableColumns = table.fields
+            .map(toRelationalField)
+            .filter((column: Columns) => column.status === 'available');
 
         return {
             id: null,
             row: existingData
                 ? existingData
                 : availableColumns.reduce(
-                      (acc, attr) => {
-                          acc[attr.key] = attr.array ? [] : null;
+                      (acc, field) => {
+                          acc[field.key] = field.array ? [] : null;
                           return acc;
                       },
                       {} as Record<string, unknown>
@@ -189,7 +191,7 @@
                         Choose which permission scopes to grant your application. It is best
                         practice to allow only the permissions you need to meet your project goals.
                     </Typography.Text>
-                    {#if table.rowSecurity}
+                    {#if table.recordSecurity}
                         <Alert.Inline status="info">
                             <svelte:fragment slot="title">Row security is enabled</svelte:fragment>
                             Users will be able to access this row if they have been granted
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/rows/edit.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/rows/edit.svelte
index bfa9e7b4c5..418b8a6c14 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/rows/edit.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/rows/edit.svelte
@@ -8,7 +8,7 @@
     import type { Models } from '@appwrite.io/console';
     import { Dependencies } from '$lib/constants';
     import { invalidate } from '$app/navigation';
-    import { table, type Columns, PROHIBITED_ROW_KEYS } from '../store';
+    import { type Columns, PROHIBITED_ROW_KEYS } from '../store';
     import ColumnItem from './columns/columnItem.svelte';
     import {
         buildWildcardColumnsQuery,
@@ -18,18 +18,18 @@
     } from './store';
     import { Layout, Skeleton } from '@appwrite.io/pink-svelte';
     import { deepClone } from '$lib/helpers/object';
+    import { type Entity, toRelationalField } from '$database/(entity)';
     import deepEqual from 'deep-equal';
     import { onMount } from 'svelte';
 
-    const tableId = page.params.table;
-    const databaseId = page.params.database;
-
     let {
+        table,
         row = $bindable(),
         rowId = $bindable(null),
         autoFocus = true,
         disabled = $bindable(true)
     }: {
+        table: Entity;
         row?: Models.Row | null;
         rowId?: string | null;
         autoFocus?: boolean;
@@ -65,10 +65,10 @@
 
         try {
             row = await sdk.forProject(page.params.region, page.params.project).tablesDB.getRow({
-                databaseId,
-                tableId,
+                databaseId: table.databaseId,
+                tableId: table.$id,
                 rowId,
-                queries: buildWildcardColumnsQuery($table)
+                queries: buildWildcardColumnsQuery(table)
             });
         } catch (error) {
             addNotification({
@@ -143,8 +143,8 @@
 
         try {
             await sdk.forProject(page.params.region, page.params.project).tablesDB.updateRow({
-                databaseId,
-                tableId,
+                databaseId: table.databaseId,
+                tableId: table.$id,
                 rowId: row.$id,
                 data: $work,
                 permissions: $work.$permissions
@@ -166,12 +166,12 @@
     }
 
     $effect(() => {
-        if (!work || !row || !$table?.columns?.length) {
+        if (!work || !row || !table?.fields?.length) {
             disabled = true;
             return;
         }
 
-        disabled = $table.columns.every((column) => compareColumns(column, $work, row));
+        disabled = table.fields.every((column: Columns) => compareColumns(column, $work, row));
     });
 
     function focusFirstInput() {
@@ -191,16 +191,16 @@
     <div style:margin-block="" style:margin-inline-end="2.25rem">
         <Skeleton variant="line" height={40} width="auto" />
     </div>
-{:else if $table.columns?.length && work}
+{:else if table.fields?.length && work}
     <div bind:this={columnFormWrapper}>
         <Layout.Stack direction="column" gap="xl">
-            {#each $table.columns as column}
+            {#each table.fields as column}
                 {@const label = column.key}
                 <ColumnItem
-                    {column}
                     {label}
                     editing
                     formValues={$work}
+                    column={toRelationalField(column)}
                     onUpdateFormValues={updateRowData} />
             {/each}
         </Layout.Stack>
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/rows/editPermissions.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/rows/editPermissions.svelte
index e9edae26e7..d3f58dc7a9 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/rows/editPermissions.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/rows/editPermissions.svelte
@@ -1,5 +1,4 @@
 <script lang="ts">
-    import { table } from '../store';
     import { page } from '$app/state';
     import { sdk } from '$lib/stores/sdk';
     import { invalidate } from '$app/navigation';
@@ -10,12 +9,15 @@
     import { addNotification } from '$lib/stores/notifications';
     import { symmetricDifference } from '$lib/helpers/array';
     import { Submit, trackEvent, trackError } from '$lib/actions/analytics';
+    import type { Entity } from '$database/(entity)';
     import { onMount } from 'svelte';
 
     let {
+        table,
         row = $bindable(null),
         arePermsDisabled = $bindable(true)
     }: {
+        table: Entity;
         row: Models.DefaultRow | Models.Row;
         arePermsDisabled?: boolean;
     } = $props();
@@ -73,7 +75,7 @@
     >.
 </p>
 
-{#if $table.rowSecurity}
+{#if table.recordSecurity}
     {#if showPermissionAlert}
         <Alert.Inline
             status="info"
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/rows/editRelated.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/rows/editRelated.svelte
index 5011493482..1b3c83eb97 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/rows/editRelated.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/rows/editRelated.svelte
@@ -14,6 +14,12 @@
     import { Accordion, Layout, Skeleton } from '@appwrite.io/pink-svelte';
     import { deepClone } from '$lib/helpers/object';
     import { preferences } from '$lib/stores/preferences';
+    import {
+        type Entity,
+        type Field,
+        getTerminologies,
+        toRelationalField
+    } from '$database/(entity)';
     import { onMount } from 'svelte';
 
     const databaseId = page.params.database;
@@ -30,12 +36,20 @@
 
     let loading = $state(false);
     let fetchedRows = $state<Models.Row[]>([]);
-    let relatedTable = $state<Models.Table | null>(null);
+    let relatedTable = $state<Entity | null>(null);
 
     let workData = $state<Map<string, Writable<Models.Row>>>(new Map());
     let columnFormWrapper = $state<HTMLElement | null>(null);
 
+    const { databaseSdk } = getTerminologies();
+
     onMount(() => {
+        if (rows && tableId) {
+            loadRelatedRow().then(() => {
+                focusFirstInput();
+            });
+        }
+
         /* silences the not read error warning */
         disabledState;
     });
@@ -49,15 +63,6 @@
 
         try {
             if (isSingleStore()) {
-                relatedTable =
-                    page.data.tables?.[tableId] ??
-                    (await sdk
-                        .forProject(page.params.region, page.params.project)
-                        .tablesDB.getTable({
-                            databaseId,
-                            tableId: tableId
-                        }));
-
                 const fetchedRow = await sdk
                     .forProject(page.params.region, page.params.project)
                     .tablesDB.getRow({
@@ -67,6 +72,12 @@
                         queries: buildWildcardColumnsQuery(relatedTable)
                     });
 
+                // cannot use page.data.entities!
+                relatedTable = await databaseSdk.getEntity({
+                    databaseId,
+                    entityId: tableId
+                });
+
                 fetchedRows = [fetchedRow];
             } else {
                 let fetchedTables = [];
@@ -81,19 +92,18 @@
                 });
 
                 if (missingTableIds.length > 0) {
-                    const tablesResponse = await sdk
-                        .forProject(page.params.region, page.params.project)
-                        .tablesDB.listTables({
-                            databaseId,
-                            queries: [
-                                Query.equal('$id', missingTableIds),
-                                Query.limit(missingTableIds.length)
-                            ]
-                        });
-                    fetchedTables = tablesResponse.tables;
+                    const tablesResponse = await databaseSdk.listEntities({
+                        databaseId,
+                        queries: [
+                            Query.equal('$id', missingTableIds),
+                            Query.limit(missingTableIds.length)
+                        ]
+                    });
+
+                    fetchedTables = tablesResponse.entities;
                 }
 
-                const allTables = [...(page.data.tables || []), ...fetchedTables];
+                const allTables = [...(page.data.entities || []), ...fetchedTables];
                 relatedTable = allTables.find((table) => table.$id === firstTableId) || null;
 
                 let rowsMissingData = [];
@@ -159,7 +169,8 @@
                     return obj;
                 }, {});
 
-                newWorkData.set(row.$id, writable(deepClone(workingData as Models.Row)));
+                const clonedObject = deepClone(workingData as Models.Row);
+                newWorkData.set(row.$id, writable(clonedObject));
             });
 
             workData = newWorkData;
@@ -174,20 +185,20 @@
         }
     }
 
-    function compareColumns(column: Columns, $work: Models.Row, originalRow: Models.Row) {
-        if (!column) {
+    function compareColumns(field: Field, $work: Models.Row, originalRow: Models.Row) {
+        if (!field) {
             return false;
         }
 
-        const workColumn = $work?.[column.key];
-        const currentColumn = originalRow?.[column.key];
+        const workColumn = $work?.[field.key];
+        const currentColumn = originalRow?.[field.key];
 
-        if (column.array) {
+        if (field.array) {
             return !symmetricDifference(Array.from(workColumn), Array.from(currentColumn)).length;
         }
 
-        if (isRelationship(column)) {
-            if (isRelationshipToMany(column as Models.ColumnRelationship)) {
+        if (isRelationship(field)) {
+            if (isRelationshipToMany(field as Models.ColumnRelationship)) {
                 if (!Array.isArray(workColumn) || !Array.isArray(currentColumn)) {
                     return workColumn === currentColumn;
                 }
@@ -214,7 +225,7 @@
     }
 
     function calculateAndCompareDisabledState() {
-        if (!relatedTable?.columns?.length || !fetchedRows.length) return true;
+        if (!relatedTable?.fields?.length || !fetchedRows.length) return true;
 
         if (isSingleStore()) {
             const rowId = fetchedRows[0].$id;
@@ -224,7 +235,9 @@
             if (!row || !work) return true;
 
             const workValue = get(work);
-            return relatedTable.columns.every((column) => compareColumns(column, workValue, row));
+            return relatedTable.fields.every((field: Field) =>
+                compareColumns(field, workValue, row)
+            );
         } else {
             return fetchedRows.every((row) => {
                 const work = workData.get(row.$id);
@@ -232,8 +245,8 @@
 
                 const workValue = get(work);
 
-                return relatedTable.columns.every((column) =>
-                    compareColumns(column, workValue, row)
+                return relatedTable.fields.every((field: Field) =>
+                    compareColumns(field, workValue, row)
                 );
             });
         }
@@ -347,16 +360,18 @@
     <div style:margin-inline-end="2.25rem">
         <Skeleton variant="line" height={40} width="auto" />
     </div>
-{:else if relatedTable?.columns?.length && fetchedRows.length}
+{:else if relatedTable?.fields?.length && fetchedRows.length}
     <!-- we should not show current table column items in this view -->
     {@const twoWayKeys = new Set(
-        relatedTable.columns
+        relatedTable.fields
             .filter((column: Models.ColumnRelationship) => column.twoWay)
             .map((c) => c.key)
     )}
 
     <!-- render the filtered ones -->
-    {@const columnsToRender = relatedTable.columns.filter((c) => !twoWayKeys.has(c.key))}
+    {@const columnsToRender = relatedTable.fields.filter(
+        (field: Field) => !twoWayKeys.has(field.key)
+    )}
 
     <div bind:this={columnFormWrapper}>
         {#if fetchedRows.length === 1}
@@ -366,10 +381,10 @@
                     {#each columnsToRender as column}
                         {@const label = column.key}
                         <ColumnItem
-                            {column}
                             {label}
                             editing
                             formValues={workStore}
+                            column={toRelationalField(column)}
                             onUpdateFormValues={handleFormUpdate(fetchedRows[0].$id)} />
                     {/each}
                 </Layout.Stack>
@@ -387,10 +402,10 @@
                                     {#each columnsToRender as column}
                                         {@const label = column.key}
                                         <ColumnItem
-                                            {column}
                                             {label}
                                             editing
                                             formValues={workStore}
+                                            column={toRelationalField(column)}
                                             onUpdateFormValues={handleFormUpdate(row.$id)} />
                                     {/each}
                                 </Layout.Stack>
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/rows/store.ts b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/rows/store.ts
index 835262ef73..a007c01fc4 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/rows/store.ts
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/rows/store.ts
@@ -1,13 +1,14 @@
 import { page } from '$app/state';
 import type { Column } from '$lib/helpers/types';
-import type { Columns } from '../store';
+import type { Attributes, Columns } from '../store';
 import { type Models, Query } from '@appwrite.io/console';
+import type { Entity, Field } from '$database/(entity)';
 
-export function isRelationshipToMany(col: Columns) {
-    if (!col) return false;
-    if (!isRelationship(col)) return false;
+export function isRelationshipToMany(field: Field) {
+    if (!field) return false;
+    if (!isRelationship(field)) return false;
 
-    const column = col as Models.ColumnRelationship;
+    const column = field as Models.ColumnRelationship | Models.AttributeRelationship;
 
     if (!column?.relationType) return false;
     if (column?.side === 'child') {
@@ -17,34 +18,42 @@ export function isRelationshipToMany(col: Columns) {
     }
 }
 
-export function isRelationship(column: Columns): column is Models.ColumnRelationship {
-    if (!column) return false;
-    return column?.type === 'relationship';
+export function isRelationship(
+    field: Field
+): field is Models.ColumnRelationship | Models.AttributeRelationship {
+    if (!field) return false;
+    return field?.type === 'relationship';
 }
 
-export function isString(column: Columns): column is Models.ColumnString {
-    if (!column) return false;
-    return column?.type === 'string';
+export function isString(field: Field): field is Models.ColumnString | Models.AttributeString {
+    if (!field) return false;
+    return field?.type === 'string';
 }
 
 export function isSpatialType(
-    column: Columns | Column
-): column is Models.ColumnPoint | Models.ColumnLine | Models.ColumnPolygon {
-    if (!column) return false;
+    field: Columns | Attributes | Column
+): field is
+    | Models.ColumnPoint
+    | Models.ColumnLine
+    | Models.ColumnPolygon
+    | Models.AttributePoint
+    | Models.AttributeLine
+    | Models.AttributePolygon {
+    if (!field) return false;
 
     const spatialTypes = ['point', 'linestring', 'polygon'];
 
-    return spatialTypes.includes(column.type.toLowerCase());
+    return spatialTypes.includes(field.type.toLowerCase());
 }
 
 /**
- * Returns select queries for all main and related fields in a table.
+ * Returns select queries for all main and related fields in an `Entity`.
  */
-export function buildWildcardColumnsQuery(table: Models.Table | null = null): string[] {
+export function buildWildcardColumnsQuery(entity: Entity | null = null): string[] {
     return [
-        ...(table?.columns
-            ?.filter((col) => col.status === 'available' && isRelationship(col))
-            ?.map((col) => Query.select([`${col.key}.*`])) ?? []),
+        ...(entity?.fields
+            ?.filter((field) => field.status === 'available' && isRelationship(field))
+            ?.map((field) => Query.select([`${field.key}.*`])) ?? []),
 
         Query.select(['*'])
     ];
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/settings/+page.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/settings/+page.svelte
index 20abb285b4..bca5e5fde1 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/settings/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/settings/+page.svelte
@@ -1,23 +1,66 @@
 <script lang="ts">
+    import { page } from '$app/state';
+    import { sdk } from '$lib/stores/sdk';
     import { Container } from '$lib/layout';
-    import { table } from '../store';
-    import DangerZone from './dangerZone.svelte';
     import DisplayName from './displayName.svelte';
-    import UpdateName from './updateName.svelte';
-    import UpdatePermissions from './updatePermissions.svelte';
-    import UpdateSecurity from './updateSecurity.svelte';
-    import UpdateStatus from './updateStatus.svelte';
+    import {
+        DangerZone,
+        UpdateName,
+        UpdatePermissions,
+        UpdateSecurity,
+        UpdateStatus
+    } from '$database/(entity)';
+    import type { PageProps } from './$types';
+
+    /* served from parent layout */
+    const { data }: PageProps = $props();
+
+    const table = $derived(data.table);
+
+    const params = $derived.by(() => {
+        return {
+            name: table.name,
+            tableId: page.params.table,
+            databaseId: page.params.database
+        };
+    });
+
+    async function deleteTable() {
+        await sdk
+            .forProject(page.params.region, page.params.project)
+            .tablesDB.deleteTable({ ...params });
+    }
+
+    async function updateTable(
+        updates: Partial<{
+            name: string;
+            enabled: boolean;
+            permissions: string[];
+            rowSecurity: boolean;
+        }>
+    ) {
+        await sdk
+            .forProject(page.params.region, page.params.project)
+            .tablesDB.updateTable({ ...params, ...updates });
+    }
 </script>
 
 <div class="wide-screen-wrapper databases-spreadsheet">
     <Container expanded slotSpacing databasesScreen>
-        {#if $table}
-            <UpdateStatus />
-            <UpdateName />
-            <DisplayName />
-            <UpdatePermissions />
-            <UpdateSecurity />
-            <DangerZone />
-        {/if}
+        <UpdateStatus entity={table} onChangeStatus={(enabled) => updateTable({ enabled })} />
+
+        <UpdateName entity={table} onChangeName={(name) => updateTable({ name })} />
+
+        <DisplayName />
+
+        <UpdatePermissions
+            entity={table}
+            onChangePermissions={(permissions) => updateTable({ permissions })} />
+
+        <UpdateSecurity
+            entity={table}
+            onChangeSecurity={(rowSecurity) => updateTable({ rowSecurity })} />
+
+        <DangerZone entity={table} onDelete={deleteTable} />
     </Container>
 </div>
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/settings/dangerZone.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/settings/dangerZone.svelte
deleted file mode 100644
index fa75976966..0000000000
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/settings/dangerZone.svelte
+++ /dev/null
@@ -1,34 +0,0 @@
-<script lang="ts">
-    import { BoxAvatar, CardGrid } from '$lib/components';
-    import { Button } from '$lib/elements/forms';
-    import { toLocaleDateTime } from '$lib/helpers/date';
-    import { table } from '../store';
-    import Delete from './deleteTable.svelte';
-    import { Click, trackEvent } from '$lib/actions/analytics';
-
-    let showDelete = false;
-</script>
-
-<CardGrid>
-    <svelte:fragment slot="title">Delete table</svelte:fragment>
-    The table will be permanently deleted, including all the rows within it. This action is irreversible.
-    <svelte:fragment slot="aside">
-        <BoxAvatar>
-            <svelte:fragment slot="title">
-                <h6 class="u-bold u-trim-1">{$table.name}</h6>
-            </svelte:fragment>
-            <p>Last updated: {toLocaleDateTime($table.$updatedAt)}</p>
-        </BoxAvatar>
-    </svelte:fragment>
-
-    <svelte:fragment slot="actions">
-        <Button
-            secondary
-            on:click={() => {
-                trackEvent(Click.DatabaseTableDelete);
-                showDelete = true;
-            }}>Delete</Button>
-    </svelte:fragment>
-</CardGrid>
-
-<Delete bind:showDelete />
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/settings/deleteTable.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/settings/deleteTable.svelte
deleted file mode 100644
index 697dd79622..0000000000
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/settings/deleteTable.svelte
+++ /dev/null
@@ -1,61 +0,0 @@
-<script lang="ts">
-    import { goto } from '$app/navigation';
-    import { base } from '$app/paths';
-    import { page } from '$app/state';
-    import { Submit, trackEvent, trackError } from '$lib/actions/analytics';
-    import Confirm from '$lib/components/confirm.svelte';
-    import { addNotification } from '$lib/stores/notifications';
-    import { sdk } from '$lib/stores/sdk';
-    import { Typography } from '@appwrite.io/pink-svelte';
-    import { table } from '../store';
-    import { subNavigation } from '$lib/stores/database';
-    import { preferences } from '$lib/stores/preferences';
-    import { organization } from '$lib/stores/organization.js';
-
-    export let showDelete = false;
-
-    let error: string;
-
-    async function handleDelete() {
-        const tableId = page.params.table;
-        const databaseId = page.params.database;
-
-        try {
-            await sdk.forProject(page.params.region, page.params.project).tablesDB.deleteTable({
-                databaseId,
-                tableId
-            });
-
-            showDelete = false;
-            subNavigation.update();
-
-            addNotification({
-                type: 'success',
-                message: `${$table.name} has been deleted`
-            });
-
-            trackEvent(Submit.TableDelete);
-
-            await Promise.all([
-                preferences.deleteTableDetails($organization.$id, tableId),
-                goto(
-                    `${base}/project-${page.params.region}-${page.params.project}/databases/database-${page.params.database}`
-                )
-            ]);
-        } catch (e) {
-            error = e.message;
-            trackError(e, Submit.TableDelete);
-        }
-    }
-</script>
-
-<Confirm
-    confirmDeletion
-    onSubmit={handleDelete}
-    title="Delete table"
-    bind:open={showDelete}
-    bind:error>
-    <Typography.Text>
-        Are you sure you want to delete <b>{$table.name}</b>?
-    </Typography.Text>
-</Confirm>
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/settings/updateName.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/settings/updateName.svelte
deleted file mode 100644
index 45ad32ed0d..0000000000
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/settings/updateName.svelte
+++ /dev/null
@@ -1,68 +0,0 @@
-<script lang="ts">
-    import { invalidate } from '$app/navigation';
-    import { page } from '$app/state';
-    import { Submit, trackEvent, trackError } from '$lib/actions/analytics';
-    import { CardGrid } from '$lib/components';
-    import { Dependencies } from '$lib/constants';
-    import { Button, Form, InputText } from '$lib/elements/forms';
-    import { addNotification } from '$lib/stores/notifications';
-    import { sdk } from '$lib/stores/sdk';
-    import { onMount } from 'svelte';
-    import { table } from '../store';
-    import { subNavigation } from '$lib/stores/database';
-
-    const databaseId = page.params.database;
-
-    let tableName: string = null;
-
-    onMount(() => {
-        tableName ??= $table.name;
-    });
-
-    async function updateName() {
-        try {
-            await sdk.forProject(page.params.region, page.params.project).tablesDB.updateTable({
-                databaseId,
-                tableId: $table.$id,
-                name: tableName,
-                permissions: $table.$permissions,
-                rowSecurity: $table.rowSecurity,
-                enabled: $table.enabled
-            });
-
-            subNavigation.update();
-
-            await invalidate(Dependencies.TABLE);
-            addNotification({
-                message: 'Name has been updated',
-                type: 'success'
-            });
-            trackEvent(Submit.TableUpdateName);
-        } catch (error) {
-            addNotification({
-                message: error.message,
-                type: 'error'
-            });
-            trackError(error, Submit.TableUpdateName);
-        }
-    }
-</script>
-
-<Form onSubmit={updateName}>
-    <CardGrid>
-        <svelte:fragment slot="title">Name</svelte:fragment>
-        <svelte:fragment slot="aside">
-            <InputText
-                required
-                id="name"
-                label="Name"
-                placeholder="Enter name"
-                autocomplete={false}
-                bind:value={tableName} />
-        </svelte:fragment>
-
-        <svelte:fragment slot="actions">
-            <Button disabled={tableName === $table.name || !tableName} submit>Update</Button>
-        </svelte:fragment>
-    </CardGrid>
-</Form>
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/settings/updatePermissions.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/settings/updatePermissions.svelte
deleted file mode 100644
index 8041cb2c2f..0000000000
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/settings/updatePermissions.svelte
+++ /dev/null
@@ -1,72 +0,0 @@
-<script lang="ts">
-    import { invalidate } from '$app/navigation';
-    import { page } from '$app/state';
-    import { Submit, trackEvent, trackError } from '$lib/actions/analytics';
-    import { CardGrid } from '$lib/components';
-    import { Permissions } from '$lib/components/permissions';
-    import { Dependencies } from '$lib/constants';
-    import { Button } from '$lib/elements/forms';
-    import { symmetricDifference } from '$lib/helpers/array';
-    import { addNotification } from '$lib/stores/notifications';
-    import { sdk } from '$lib/stores/sdk';
-    import { onMount } from 'svelte';
-    import { table } from '../store';
-    import { Link } from '@appwrite.io/pink-svelte';
-
-    const databaseId = page.params.database;
-
-    let arePermsDisabled = true;
-
-    let tablePermissions: string[] = null;
-
-    onMount(() => {
-        tablePermissions ??= $table.$permissions;
-    });
-
-    async function updatePermissions() {
-        try {
-            await sdk.forProject(page.params.region, page.params.project).tablesDB.updateTable({
-                databaseId,
-                tableId: $table.$id,
-                name: $table.name,
-                permissions: tablePermissions,
-                rowSecurity: $table.rowSecurity,
-                enabled: $table.enabled
-            });
-            await invalidate(Dependencies.TABLE);
-            addNotification({
-                message: 'Permissions have been updated',
-                type: 'success'
-            });
-            trackEvent(Submit.TableUpdatePermissions);
-        } catch (error) {
-            addNotification({
-                message: error.message,
-                type: 'error'
-            });
-            trackError(error, Submit.TableUpdatePermissions);
-        }
-    }
-
-    $: arePermsDisabled = !(
-        tablePermissions && symmetricDifference(tablePermissions, $table.$permissions).length
-    );
-</script>
-
-<CardGrid>
-    <svelte:fragment slot="title">Permissions</svelte:fragment>
-    Choose who can access your tables and rows. <Link.Anchor
-        href="https://appwrite.io/docs/products/databases/permissions"
-        target="_blank"
-        rel="noopener noreferrer">
-        Learn more
-    </Link.Anchor>.
-    <svelte:fragment slot="aside">
-        {#if tablePermissions}
-            <Permissions bind:permissions={tablePermissions} withCreate />
-        {/if}
-    </svelte:fragment>
-    <svelte:fragment slot="actions">
-        <Button disabled={arePermsDisabled} on:click={updatePermissions}>Update</Button>
-    </svelte:fragment>
-</CardGrid>
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/settings/updateSecurity.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/settings/updateSecurity.svelte
deleted file mode 100644
index 1b92ad0596..0000000000
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/settings/updateSecurity.svelte
+++ /dev/null
@@ -1,66 +0,0 @@
-<script lang="ts">
-    import { invalidate } from '$app/navigation';
-    import { page } from '$app/state';
-    import { Submit, trackEvent, trackError } from '$lib/actions/analytics';
-    import { CardGrid } from '$lib/components';
-    import { Dependencies } from '$lib/constants';
-    import { Button, InputSwitch } from '$lib/elements/forms';
-    import { addNotification } from '$lib/stores/notifications';
-    import { sdk } from '$lib/stores/sdk';
-    import { onMount } from 'svelte';
-    import { table } from '../store';
-
-    const databaseId = page.params.database;
-
-    let tableRowSecurity: boolean = null;
-
-    onMount(() => {
-        tableRowSecurity ??= $table.rowSecurity;
-    });
-
-    async function updateSecurity() {
-        try {
-            await sdk.forProject(page.params.region, page.params.project).tablesDB.updateTable({
-                databaseId,
-                tableId: $table.$id,
-                name: $table.name,
-                permissions: $table.$permissions,
-                rowSecurity: tableRowSecurity,
-                enabled: $table.enabled
-            });
-            await invalidate(Dependencies.TABLE);
-            addNotification({
-                message: 'Security has been updated',
-                type: 'success'
-            });
-            trackEvent(Submit.TableUpdateSecurity);
-        } catch (error) {
-            addNotification({
-                message: error.message,
-                type: 'error'
-            });
-            trackError(error, Submit.TableUpdateSecurity);
-        }
-    }
-</script>
-
-<CardGrid>
-    <svelte:fragment slot="title">Row security</svelte:fragment>
-    <svelte:fragment slot="aside">
-        <InputSwitch bind:value={tableRowSecurity} id="security" label="Row security" />
-
-        <p class="text">
-            When row security is enabled, users will be able to access rows for which they have been
-            granted <b>either row or table permissions</b>.
-        </p>
-        <p class="text">
-            If row security is disabled, users can access rows <b
-                >only if they have table permissions</b
-            >. Row permissions will be ignored.
-        </p>
-    </svelte:fragment>
-    <svelte:fragment slot="actions">
-        <Button disabled={tableRowSecurity === $table.rowSecurity} on:click={updateSecurity}
-            >Update</Button>
-    </svelte:fragment>
-</CardGrid>
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/settings/updateStatus.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/settings/updateStatus.svelte
deleted file mode 100644
index 8d91f266e7..0000000000
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/settings/updateStatus.svelte
+++ /dev/null
@@ -1,66 +0,0 @@
-<script lang="ts">
-    import { invalidate } from '$app/navigation';
-    import { page } from '$app/state';
-    import { Submit, trackEvent, trackError } from '$lib/actions/analytics';
-    import { CardGrid } from '$lib/components';
-    import { Dependencies } from '$lib/constants';
-    import { Button, InputSwitch } from '$lib/elements/forms';
-    import { toLocaleDateTime } from '$lib/helpers/date';
-    import { addNotification } from '$lib/stores/notifications';
-    import { sdk } from '$lib/stores/sdk';
-    import { onMount } from 'svelte';
-    import { table } from '../store';
-
-    const databaseId = page.params.database;
-
-    let enabled: boolean = null;
-
-    onMount(() => {
-        enabled ??= $table.enabled;
-    });
-
-    async function toggleTable() {
-        try {
-            await sdk.forProject(page.params.region, page.params.project).tablesDB.updateTable({
-                databaseId,
-                tableId: $table.$id,
-                name: $table.name,
-                permissions: $table.$permissions,
-                rowSecurity: $table.rowSecurity,
-                enabled
-            });
-            await invalidate(Dependencies.TABLE);
-            addNotification({
-                message: `${$table.name} has been updated`,
-                type: 'success'
-            });
-            trackEvent(Submit.TableUpdateEnabled);
-        } catch (error) {
-            addNotification({
-                message: error.message,
-                type: 'error'
-            });
-            trackError(error, Submit.TableUpdateEnabled);
-        }
-    }
-</script>
-
-<CardGrid>
-    <svelte:fragment slot="title">{$table.name}</svelte:fragment>
-    <svelte:fragment slot="aside">
-        <ul>
-            <InputSwitch
-                id="toggle"
-                label={enabled ? 'Enabled' : 'Disabled'}
-                bind:value={enabled} />
-        </ul>
-        <div>
-            <p>Created: {toLocaleDateTime($table.$createdAt)}</p>
-            <p>Last updated: {toLocaleDateTime($table.$updatedAt)}</p>
-        </div>
-    </svelte:fragment>
-
-    <svelte:fragment slot="actions">
-        <Button disabled={enabled === $table.enabled} on:click={toggleTable}>Update</Button>
-    </svelte:fragment>
-</CardGrid>
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/spreadsheet.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/spreadsheet.svelte
index dabc3955cf..0b7cf540bc 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/spreadsheet.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/spreadsheet.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
     import { page } from '$app/state';
     import { goto, invalidate } from '$app/navigation';
-    import { Submit, trackError, trackEvent } from '$lib/actions/analytics';
+    import { Click, Submit, trackError, trackEvent } from '$lib/actions/analytics';
     import { Confirm, Id, SortButton } from '$lib/components';
     import { Dependencies, SPREADSHEET_PAGE_LIMIT } from '$lib/constants';
     import { Button as ConsoleButton, InputSelect } from '$lib/elements/forms';
@@ -21,7 +21,6 @@
     } from './rows/store';
     import {
         columns,
-        table,
         tableColumns,
         databaseColumnSheetOptions,
         databaseRowSheetOptions,
@@ -86,7 +85,7 @@
     import type { HeaderCellAction, RowCellAction } from './sheetOptions.svelte';
     import SheetOptions from './sheetOptions.svelte';
     import { isSmallViewport, isTabletViewport } from '$lib/stores/viewport';
-    import SpreadsheetContainer from './layout/spreadsheet.svelte';
+    import { type Field, SpreadsheetContainer } from '$database/(entity)';
     import EditRowCell from './rows/cell/edit.svelte';
     import { copy } from '$lib/helpers/copy';
     import { writable } from 'svelte/store';
@@ -103,6 +102,7 @@
         row: Partial<Models.Row> | null;
     };
 
+    $: table = data.table;
     $: rows = writable(data.rows);
     $: if ($rows) {
         paginatedRows.clear();
@@ -163,19 +163,21 @@
     function makeTableColumns() {
         const selectedColumnsToHide = preferences.getCustomTableColumns(tableId);
 
-        const baseColumns = $table.columns.map((col) => ({
-            id: col.key,
-            title: col.key,
-            type: col.type as ColumnType,
-            hide: !!selectedColumnsToHide?.includes(col.key),
-            array: col?.array,
-            width: getColumnWidth(col.key, { min: minimumWidth }),
-            minimumWidth: minimumWidth,
-            draggable: true,
-            icon: getAppropriateIcon(col.type),
-            format: 'format' in col && col?.format === 'enum' ? col.format : null,
-            elements: 'elements' in col ? col.elements : null
-        }));
+        const baseColumns: Column[] = table.fields.map((field: Field) => {
+            return {
+                id: field.key,
+                title: field.key,
+                type: field.type as ColumnType,
+                hide: !!selectedColumnsToHide?.includes(field.key),
+                array: field?.array,
+                width: getColumnWidth(field.key, { min: minimumWidth }),
+                minimumWidth: minimumWidth,
+                draggable: true,
+                icon: getAppropriateIcon(field.type),
+                format: 'format' in field && field?.format === 'enum' ? field.format : null,
+                elements: 'elements' in field ? field.elements : null
+            };
+        });
 
         const staticColumns: Column[] = [
             {
@@ -384,9 +386,7 @@
                 });
             } else {
                 if (selectedRows.length) {
-                    const hasAnyRelationships = $table.columns.some((column) =>
-                        isRelationship(column)
-                    );
+                    const hasAnyRelationships = table.fields.some(isRelationship) ?? false;
 
                     const tablesSDK = sdk.forProject(
                         page.params.region,
@@ -430,7 +430,7 @@
             }
 
             await invalidate(Dependencies.ROWS);
-            trackEvent(Submit.RowDelete);
+            trackEvent(Click.DatabaseRowDelete);
 
             if (!hadErrors) {
                 // error is already shown above!
@@ -624,7 +624,7 @@
         try {
             await sdk.forProject(page.params.region, page.params.project).tablesDB.updateRow({
                 databaseId,
-                tableId: $table.$id,
+                tableId: table.$id,
                 rowId: row.$id,
                 data: row,
                 permissions: row.$permissions
@@ -673,7 +673,7 @@
                     Query.limit(SPREADSHEET_PAGE_LIMIT),
                     Query.offset(pageToOffset(pageNumber, SPREADSHEET_PAGE_LIMIT)),
                     ...filterQueries /* filter queries */,
-                    ...buildWildcardColumnsQuery($table)
+                    ...buildWildcardColumnsQuery(table)
                 ]
             });
 
@@ -700,7 +700,7 @@
                         getCorrectOrderQuery(),
                         Query.limit(SPREADSHEET_PAGE_LIMIT),
                         Query.offset(pageToOffset(targetPageNum, SPREADSHEET_PAGE_LIMIT)),
-                        ...buildWildcardColumnsQuery($table)
+                        ...buildWildcardColumnsQuery(table)
                     ]
                 });
 
@@ -715,8 +715,8 @@
         let tableId = null;
         if (typeof relatedTable === 'string') {
             tableId = relatedTable;
-        } else if (typeof relatedTable === 'object' && '$tableId' in relatedTable) {
-            tableId = relatedTable.$tableId;
+        } else if (typeof relatedTable === 'object' && 'tableId' in relatedTable) {
+            tableId = relatedTable.tableId;
         }
 
         return preferences.getDisplayNames(tableId) ?? ['$id'];
@@ -758,7 +758,7 @@
 
     $: canShowDatetimePopover = true;
 
-    $: if ($table.columns) {
+    $: if (table.fields) {
         makeTableColumns();
     }
 
@@ -1230,17 +1230,17 @@
     bind:open={showDelete}
     onSubmit={handleDelete}
     confirmDeletionLabel={relatedColumns?.length
-        ? `Delete ${selectedRowForDelete !== null ? 'row' : 'rows'} from ${$table.name}`
+        ? `Delete ${selectedRowForDelete !== null ? 'row' : 'rows'} from ${table.name}`
         : undefined}
     title={selectedRows.length === 1 ? 'Delete Row' : 'Delete Rows'}>
     {@const isSingle = selectedRowForDelete !== null}
 
     <p>
         {#if isSingle}
-            Are you sure you want to delete this row from <b>{$table.name}</b>?
+            Are you sure you want to delete this row from <b>{table.name}</b>?
         {:else}
             Are you sure you want to delete <b>{selectedRows.length}</b>
-            {selectedRows.length > 1 ? 'rows' : 'row'} from <b>{$table.name}</b>?
+            {selectedRows.length > 1 ? 'rows' : 'row'} from <b>{table.name}</b>?
         {/if}
     </p>
 
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/store.ts b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/store.ts
index 913bba1e37..f840a035cc 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/store.ts
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/store.ts
@@ -20,11 +20,28 @@ export type Columns =
     | Models.ColumnPolygon
     | (Models.ColumnRelationship & { default?: never });
 
-type Table = Omit<Models.Table, 'columns'> & {
+export type Attributes =
+    | Models.AttributeBoolean
+    | Models.AttributeEmail
+    | Models.AttributeEnum
+    | Models.AttributeFloat
+    | Models.AttributeInteger
+    | Models.AttributeIp
+    | Models.AttributeString
+    | Models.AttributeUrl
+    | Models.AttributePoint
+    | Models.AttributeLine
+    | Models.AttributePolygon
+    | (Models.AttributeRelationship & { default?: never });
+
+export type Collection = Omit<Models.Collection, 'attributes'> & {
+    attributes: Array<Attributes>;
+};
+
+export type Table = Omit<Models.Table, 'columns'> & {
     columns: Array<Columns>;
 };
 
-export const table = derived(page, ($page) => $page.data.table as Table);
 export const columns = derived(page, ($page) => $page.data.table.columns as Columns[]);
 export const indexes = derived(page, ($page) => $page.data.table.indexes as Models.ColumnIndex[]);
 
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/usage/[[period]]/+page.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/usage/[[period]]/+page.svelte
index 4476c9a17b..a8d8fdb0b0 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/usage/[[period]]/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/usage/[[period]]/+page.svelte
@@ -1,24 +1,11 @@
 <script lang="ts">
-    import { base } from '$app/paths';
-    import { page } from '$app/state';
-    import { Usage } from '$lib/layout';
-    import Container from '$lib/layout/container.svelte';
+    import type { PageProps } from './$types';
+    import { Usage } from '$database/(entity)';
 
-    export let data;
+    let { data }: PageProps = $props();
 
-    $: count = data.rows;
-    $: total = data.rowsTotal;
+    const count = $derived(data.rows);
+    const total = $derived(data.rowsTotal);
 </script>
 
-<div class="wide-screen-wrapper databases-spreadsheet">
-    <Container expanded slotSpacing paddingInlineEnd databasesScreen>
-        <Usage
-            path={`${base}/project-${page.params.region}-${page.params.project}/databases/database-${page.params.database}/table-${page.params.table}/usage`}
-            {total}
-            {count}
-            countMetadata={{
-                legend: 'Rows',
-                title: 'Total rows'
-            }} />
-    </Container>
-</div>
+<Usage {count} {total} />
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table.svelte
index 6a5c733521..3768e05434 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table.svelte
@@ -1,6 +1,5 @@
 <script lang="ts">
     import { invalidate } from '$app/navigation';
-    import { resolve } from '$app/paths';
     import { page } from '$app/state';
     import { Submit, trackError, trackEvent } from '$lib/actions/analytics';
     import {
@@ -13,18 +12,22 @@
     import DualTimeView from '$lib/components/dualTimeView.svelte';
     import { canWriteTables } from '$lib/stores/roles';
     import { sdk } from '$lib/stores/sdk';
-    import { Table } from '@appwrite.io/pink-svelte';
     import type { PageData } from './$types';
-    import { tableViewColumns } from './store';
+    import { Table } from '@appwrite.io/pink-svelte';
+    import { tableViewColumns, buildEntityRoute } from './store';
     import { subNavigation } from '$lib/stores/database';
-    import type { Models } from '@appwrite.io/console';
+    import { type TerminologyResult } from '$database/(entity)';
 
     const {
-        data
+        data,
+        terminology
     }: {
         data: PageData;
+        terminology: TerminologyResult;
     } = $props();
 
+    const entitySingular = $derived(terminology.entity.lower.singular);
+
     async function onDelete(batchDelete: DeleteOperation): Promise<DeleteOperationState> {
         const result = await batchDelete((tableId) =>
             sdk.forProject(page.params.region, page.params.project).tablesDB.deleteTable({
@@ -46,22 +49,10 @@
 
         return result;
     }
-
-    function getTableHref(table: Models.Table) {
-        return resolve(
-            '/(console)/project-[region]-[project]/databases/database-[database]/table-[table]',
-            {
-                region: page.params.region,
-                project: page.params.project,
-                database: page.params.database,
-                table: table.$id
-            }
-        );
-    }
 </script>
 
 <MultiSelectionTable
-    resource="table"
+    resource={entitySingular}
     columns={$tableViewColumns}
     allowSelection={$canWriteTables}
     {onDelete}>
@@ -72,18 +63,21 @@
     {/snippet}
 
     {#snippet children(root)}
-        {#each data.tables.tables as table (table.$id)}
-            <Table.Row.Link {root} id={table.$id} href={getTableHref(table)}>
+        {#each data.entities.entities as entity (entity.$id)}
+            <Table.Row.Link
+                {root}
+                id={entity.$id}
+                href={buildEntityRoute(page, entitySingular, entity.$id)}>
                 {#each $tableViewColumns as column}
                     <Table.Cell column={column.id} {root}>
                         {#if column.id === '$id'}
                             {#key $tableViewColumns}
-                                <Id value={table.$id}>{table.$id}</Id>
+                                <Id value={entity.$id}>{entity.$id}</Id>
                             {/key}
                         {:else if column.id === 'name'}
-                            {table.name}
+                            {entity.name}
                         {:else}
-                            <DualTimeView time={table[column.id]} />
+                            <DualTimeView time={entity[column.id]} />
                         {/if}
                     </Table.Cell>
                 {/each}
diff --git a/src/routes/(console)/project-[region]-[project]/databases/table.svelte b/src/routes/(console)/project-[region]-[project]/databases/table.svelte
index 0764bf9ea2..ad134a1feb 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/table.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/table.svelte
@@ -1,20 +1,21 @@
 <script lang="ts">
-    import { base } from '$app/paths';
     import { page } from '$app/state';
+    import { columns } from './store';
     import { Id } from '$lib/components';
+    import type { Models } from '@appwrite.io/console';
+    import { useTerminology } from '$database/(entity)';
     import DualTimeView from '$lib/components/dualTimeView.svelte';
-    import { columns } from './store';
+    import { resolveRoute, withPath } from '$lib/stores/navigation';
     import { IconExclamation } from '@appwrite.io/pink-icons-svelte';
     import { Layout, Tooltip, Table, Icon } from '@appwrite.io/pink-svelte';
-    import { type Models } from '@appwrite.io/console';
 
     let {
-        tables,
+        entities,
         policies,
         databases,
         lastBackups
     }: {
-        tables: Record<string, string>;
+        entities: Record<string, string>;
         databases: Models.DatabaseList;
         lastBackups: Record<string, string>;
         policies: Record<string, Models.BackupPolicy[]>;
@@ -32,6 +33,19 @@
     function getPoliciesDescription(policies: Models.BackupPolicy[] | null): string {
         return policies?.map((policy) => getPolicyDescription(policy.schedule)).join(', ') ?? '';
     }
+
+    function getEntityUrl(database: Models.Database, entityId: string) {
+        const terminology = useTerminology(database.type);
+        const entityType = terminology.entity.lower.singular;
+
+        return withPath(
+            resolveRoute('/(console)/project-[region]-[project]/databases/database-[database]', {
+                ...page.params,
+                database: database.$id
+            }),
+            entityId ? `/${entityType}-${entityId}` : ''
+        );
+    }
 </script>
 
 <Table.Root columns={$columns} let:root>
@@ -40,13 +54,11 @@
             <Table.Header.Cell column={id} {root}>{title}</Table.Header.Cell>
         {/each}
     </svelte:fragment>
+
     {#each databases.databases as database (database.$id)}
         <!-- takes directly to the spreadsheet -->
-        {@const tableId = tables[database?.$id] ?? null}
-        {@const tableHref = tableId ? `/table-${tableId}` : ''}
-        <Table.Row.Link
-            {root}
-            href={`${base}/project-${page.params.region}-${page.params.project}/databases/database-${database.$id}${tableHref}`}>
+        {@const entityId = entities[database?.$id] ?? null}
+        <Table.Row.Link {root} href={getEntityUrl(database, entityId)}>
             {#each $columns as column}
                 <Table.Cell column={column.id} {root}>
                     {#if column.id === '$id'}
diff --git a/src/routes/(console)/project-[region]-[project]/overview/onboard.svelte b/src/routes/(console)/project-[region]-[project]/overview/onboard.svelte
index 8650aa4987..42216d01aa 100644
--- a/src/routes/(console)/project-[region]-[project]/overview/onboard.svelte
+++ b/src/routes/(console)/project-[region]-[project]/overview/onboard.svelte
@@ -35,6 +35,7 @@
     import { Click, trackEvent } from '$lib/actions/analytics';
     import { goto } from '$app/navigation';
     import { page } from '$app/state';
+    import { Platform } from './platforms/+page.svelte';
 
     let {
         pingCount = 0,
@@ -67,7 +68,7 @@
         goto(`${projectRoute}/overview/api-keys/create`, { replaceState: true });
     }
 
-    function openPlatformWizard(type: number, platform?: Models.Platform) {
+    function openPlatformWizard(type: Platform, platform?: Models.Platform) {
         if (platform) {
             continuePlatform(type, platform.name, platform.type);
         } else {
@@ -109,7 +110,10 @@
                                     direction={$isSmallViewport ? 'column' : 'row'}>
                                     <Card.Button
                                         on:click={() => {
-                                            openPlatformWizard(0, platformMap.get('Web'));
+                                            openPlatformWizard(
+                                                Platform.Web,
+                                                platformMap.get('Web')
+                                            );
                                         }}
                                         padding="s"
                                         ><Layout.Stack
@@ -152,7 +156,10 @@
                                         </Layout.Stack></Card.Button>
                                     <Card.Button
                                         on:click={() => {
-                                            openPlatformWizard(4, platformMap.get('React Native'));
+                                            openPlatformWizard(
+                                                Platform.ReactNative,
+                                                platformMap.get('React Native')
+                                            );
                                         }}
                                         padding="s"
                                         ><Layout.Stack
@@ -202,7 +209,10 @@
                                     direction={$isSmallViewport ? 'column' : 'row'}>
                                     <Card.Button
                                         on:click={() => {
-                                            openPlatformWizard(3, platformMap.get('Apple'));
+                                            openPlatformWizard(
+                                                Platform.Apple,
+                                                platformMap.get('Apple')
+                                            );
                                         }}
                                         padding="s">
                                         <Layout.Stack
@@ -249,7 +259,10 @@
                                     </Card.Button>
                                     <Card.Button
                                         on:click={() => {
-                                            openPlatformWizard(2, platformMap.get('Android'));
+                                            openPlatformWizard(
+                                                Platform.Android,
+                                                platformMap.get('Android')
+                                            );
                                         }}
                                         padding="s">
                                         <Layout.Stack
@@ -297,7 +310,10 @@
                                     </Card.Button>
                                     <Card.Button
                                         on:click={() => {
-                                            openPlatformWizard(1, platformMap.get('Flutter'));
+                                            openPlatformWizard(
+                                                Platform.Flutter,
+                                                platformMap.get('Flutter')
+                                            );
                                         }}
                                         padding="s">
                                         <Layout.Stack
diff --git a/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/settings/+page.svelte b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/settings/+page.svelte
index 1ea7cc4d70..1606d0195e 100644
--- a/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/settings/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/settings/+page.svelte
@@ -331,7 +331,7 @@
     <Form onSubmit={updateSecurity}>
         <CardGrid>
             <svelte:fragment slot="title">Security settings</svelte:fragment>
-            Enable or disable security services for the bucket including <b>Ecryption</b>
+            Enable or disable security services for the bucket including <b>Encryption</b>
             and <b>Antivirus scanning.</b>
             <svelte:fragment slot="aside">
                 <Selector.Switch
diff --git a/src/routes/+layout.ts b/src/routes/+layout.ts
index bcd3e307ff..63f986c8ee 100644
--- a/src/routes/+layout.ts
+++ b/src/routes/+layout.ts
@@ -6,7 +6,7 @@ import { redirect } from '@sveltejs/kit';
 import { Dependencies } from '$lib/constants';
 import type { LayoutLoad } from './$types';
 import { redirectTo } from './store';
-import { base, resolve } from '$app/paths';
+import { resolve } from '$app/paths';
 import type { Account } from '$lib/stores/user';
 import { type AppwriteException, Query, Platform } from '@appwrite.io/console';
 import { isCloud, VARS } from '$lib/system';
@@ -54,11 +54,11 @@ export const load: LayoutLoad = async ({ depends, url, route }) => {
     }
 
     if (error.type === 'user_more_factors_required') {
-        if (url.pathname === `${base}/mfa`)
+        if (url.pathname === resolve('/mfa'))
             return {
                 mfaRequired: true
             };
-        redirect(303, withParams(`${base}/mfa`, url.searchParams));
+        redirect(303, withParams(resolve('/mfa'), url.searchParams));
     }
 
     if (!isPublicRoute) {
@@ -66,7 +66,7 @@ export const load: LayoutLoad = async ({ depends, url, route }) => {
             checkPricingRefAndRedirect(url.searchParams, true);
         }
 
-        redirect(303, withParams(`${base}/login`, url.searchParams));
+        redirect(303, withParams(resolve('/login'), url.searchParams));
     }
 };
 
diff --git a/svelte.config.js b/svelte.config.js
index 18b6687901..831de20405 100644
--- a/svelte.config.js
+++ b/svelte.config.js
@@ -19,7 +19,9 @@ const config = {
     kit: {
         alias: {
             $routes: './src/routes',
-            $themes: './src/themes'
+            $themes: './src/themes',
+            $database:
+                './src/routes/(console)/project-[region]-[project]/databases/database-[database]'
         },
         adapter: adapter({
             fallback: 'index.html',