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
index 7d082a56b..29a77c201 100644
--- 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
@@ -2,14 +2,14 @@ import type { Page } from '@sveltejs/kit';
 
 import { capitalize, plural } from '$lib/helpers/string';
 import { AppwriteException, type Models } from '@appwrite.io/console';
-import type { Attributes, Collection, Columns, Table } from '$database/table-[table]/store';
+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?: Collection['attributes'] | Table['columns'];
+    fields?: (Attributes | Columns)[];
     recordSecurity?: Models.Collection['documentSecurity'] | Models.Table['rowSecurity'];
 };
 
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 c27b33fbf..bec674be3 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
@@ -31,7 +31,7 @@
     import { onDestroy } from 'svelte';
     import { isCloud } from '$lib/system';
     import { columnOptions } from './columns/store';
-    import { EmptySheet, type Field, toRelationalField } from '$database/(entity)';
+    import { EmptySheet, type Field } from '$database/(entity)';
     import { Empty as SuggestionsEmptySheet, tableColumnSuggestions } from '../(suggestions)';
 
     export let data: PageData;
@@ -45,16 +45,15 @@
 
     function createTableColumns(fields: Field[], selected: string[] = []): Column[] {
         return fields.map((field) => {
-            const column = toRelationalField(field);
             return {
-                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,
-                icon: columnOptions.find((option) => option.type === column.type)?.icon
+                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
             };
         });
     }
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 7d66e4bf9..62eb13dd6 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 { type Entity, type Field, SideSheet, toRelationalField } from '$database/(entity)';
+    import { type Entity, SideSheet, toRelationalField } from '$database/(entity)';
     import { invalidate } from '$app/navigation';
     import { Dependencies } from '$lib/constants';
     import { tick } from 'svelte';
@@ -46,16 +46,16 @@
 
     function computeInitialCreateRow(): CreateRow {
         const availableColumns = table.fields
-            .filter((field: Field) => field.status === 'available')
-            .map(toRelationalField);
+            .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>
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 ed6f448dc..5c3be8d3f 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
@@ -348,15 +348,14 @@
     <!-- we should not show current table column items in this view -->
     {@const twoWayKeys = new Set(
         relatedTable.fields
-            .map(toRelationalField)
             .filter((column: Models.ColumnRelationship) => column.twoWay)
             .map((c) => c.key)
     )}
 
     <!-- render the filtered ones -->
-    {@const columnsToRender = relatedTable.fields
-        .map(toRelationalField)
-        .filter((field: Field) => !twoWayKeys.has(field.key))}
+    {@const columnsToRender = relatedTable.fields.filter(
+        (field: Field) => !twoWayKeys.has(field.key)
+    )}
 
     <div bind:this={columnFormWrapper}>
         {#if fetchedRows.length === 1}
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 1bfdd4bfc..c730997d6 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
@@ -82,7 +82,7 @@
     import type { HeaderCellAction, RowCellAction } from './sheetOptions.svelte';
     import SheetOptions from './sheetOptions.svelte';
     import { isSmallViewport, isTabletViewport } from '$lib/stores/viewport';
-    import { type Field, SpreadsheetContainer, toRelationalField } from '$database/(entity)';
+    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';
@@ -153,20 +153,18 @@
         const selectedColumnsToHide = preferences.getCustomTableColumns(tableId);
 
         const baseColumns: Column[] = table.fields.map((field: Field) => {
-            const col = toRelationalField(field);
-
             return {
-                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 }),
+                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(col.type),
-                format: 'format' in col && col?.format === 'enum' ? col.format : null,
-                elements: 'elements' in col ? col.elements : null
+                icon: getAppropriateIcon(field.type),
+                format: 'format' in field && field?.format === 'enum' ? field.format : null,
+                elements: 'elements' in field ? field.elements : null
             };
         });
 
diff --git a/src/routes/(console)/project-[region]-[project]/overview/platforms/+page.svelte b/src/routes/(console)/project-[region]-[project]/overview/platforms/+page.svelte
index 6ab1d5269..335c85b46 100644
--- a/src/routes/(console)/project-[region]-[project]/overview/platforms/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/overview/platforms/+page.svelte
@@ -7,7 +7,7 @@
     import CreateWeb from './createWeb.svelte';
     import { createPlatform } from './wizard/store';
     import { Click, trackEvent } from '$lib/actions/analytics';
-    import { PlatformType } from '@appwrite.io/console/src/enums/platform-type';
+    import { PlatformType } from '@appwrite.io/console';
 
     export enum Platform {
         Web,