diff --git a/src/lib/stores/user.ts b/src/lib/stores/user.ts
index e6f6d02c8..7b3dbe945 100644
--- a/src/lib/stores/user.ts
+++ b/src/lib/stores/user.ts
@@ -1,9 +1,8 @@
 import { page } from '$app/stores';
-import { derived, get } from 'svelte/store';
+import { derived } from 'svelte/store';
 import type { Models } from '@aw-labs/appwrite-console';
-import { sdkForConsole } from './sdk';
+import { sdk } from './sdk';
 import { cachedStore } from '$lib/helpers/cache';
-import { browser } from '$app/environment';
 
 export const user = derived(
     page,
@@ -18,11 +17,11 @@ export const prefs = cachedStore<
     }
 >('prefs', (store) => ({
     load: async () => {
-        const prefs = await sdkForConsole.account.getPrefs();
+        const prefs = await sdk.forConsole.account.getPrefs();
         store.set(prefs);
     },
     updatePrefs: async (prefs: Models.Preferences) => {
-        await sdkForConsole.account.updatePrefs(prefs);
+        await sdk.forConsole.account.updatePrefs(prefs);
         store.set(prefs);
     }
 }));
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/boolean.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/boolean.svelte
index 37bdff331..eaead8c2f 100644
--- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/boolean.svelte
+++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/boolean.svelte
@@ -23,7 +23,7 @@
 
         data: Partial<Models.AttributeBoolean>
     ) {
-        await sdkForProject.databases.createBooleanAttribute(
+        await sdk.forProject.databases.createBooleanAttribute(
             databaseId,
             collectionId,
             data.key,
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/datetime.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/datetime.svelte
index 60dba8c40..401837675 100644
--- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/datetime.svelte
+++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/datetime.svelte
@@ -23,7 +23,7 @@
         collectionId: string,
         data: Partial<Models.AttributeDatetime>
     ) {
-        await sdkForProject.databases.createDatetimeAttribute(
+        await sdk.forProject.databases.createDatetimeAttribute(
             databaseId,
             collectionId,
             data.key,
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/email.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/email.svelte
index ab25c1774..02020f222 100644
--- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/email.svelte
+++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/email.svelte
@@ -24,7 +24,7 @@
         collectionId: string,
         data: Partial<Models.AttributeEmail>
     ) {
-        await sdkForProject.databases.createEmailAttribute(
+        await sdk.forProject.databases.createEmailAttribute(
             databaseId,
             collectionId,
             data.key,
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/enum.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/enum.svelte
index 8f5dc4f3b..65763fd35 100644
--- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/enum.svelte
+++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/enum.svelte
@@ -24,7 +24,7 @@
         collectionId: string,
         data: Partial<Models.AttributeEnum>
     ) {
-        await sdkForProject.databases.createEnumAttribute(
+        await sdk.forProject.databases.createEnumAttribute(
             databaseId,
             collectionId,
             data.key,
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/float.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/float.svelte
index 764222905..54b13848d 100644
--- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/float.svelte
+++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/float.svelte
@@ -25,7 +25,7 @@
         collectionId: string,
         data: Partial<Models.AttributeFloat>
     ) {
-        await sdkForProject.databases.createFloatAttribute(
+        await sdk.forProject.databases.createFloatAttribute(
             databaseId,
             collectionId,
             data.key,
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/integer.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/integer.svelte
index 6f9e52043..9b61bfa0e 100644
--- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/integer.svelte
+++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/integer.svelte
@@ -25,7 +25,7 @@
         collectionId: string,
         data: Partial<Models.AttributeInteger>
     ) {
-        await sdkForProject.databases.createIntegerAttribute(
+        await sdk.forProject.databases.createIntegerAttribute(
             databaseId,
             collectionId,
             data.key,
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/ip.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/ip.svelte
index a7786e7aa..c4b6c02f6 100644
--- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/ip.svelte
+++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/ip.svelte
@@ -22,7 +22,7 @@
         collectionId: string,
         data: Partial<Models.AttributeIp>
     ) {
-        await sdkForProject.databases.createIpAttribute(
+        await sdk.forProject.databases.createIpAttribute(
             databaseId,
             collectionId,
             data.key,
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/relationship.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/relationship.svelte
index 8abec8377..ce40e817a 100644
--- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/relationship.svelte
+++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/relationship.svelte
@@ -1,6 +1,6 @@
 <script context="module" lang="ts">
     import { Query, type Models } from '@aw-labs/appwrite-console';
-    import { sdkForProject } from '$lib/stores/sdk';
+    import { sdk } from '$lib/stores/sdk';
 
     export async function submitRelationship(
         databaseId: string,
@@ -8,7 +8,7 @@
         key: string,
         data: Partial<Models.AttributeString>
     ) {
-        await sdkForProject.databases.createStringAttribute(
+        await sdk.forProject.databases.createStringAttribute(
             databaseId,
             collectionId,
             key,
@@ -24,7 +24,7 @@
         collectionId: string,
         data: Partial<Models.AttributeString>
     ) {
-        await sdkForProject.databases.createStringAttribute(
+        await sdk.forProject.databases.createStringAttribute(
             databaseId,
             collectionId,
             data.key,
@@ -90,14 +90,14 @@
     // Lifecycle hooks
     async function getCollections(search: string = null) {
         if (search) {
-            const collections = await sdkForProject.databases.listCollections(
+            const collections = await sdk.forProject.databases.listCollections(
                 databaseId,
                 [Query.orderDesc('$createdAt')],
                 search
             );
             return collections;
         } else {
-            const collections = await sdkForProject.databases.listCollections(databaseId);
+            const collections = await sdk.forProject.databases.listCollections(databaseId);
             return collections;
         }
     }
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/string.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/string.svelte
index 660570e6f..820f76ef8 100644
--- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/string.svelte
+++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/string.svelte
@@ -23,7 +23,7 @@
         collectionId: string,
         data: Partial<Models.AttributeString>
     ) {
-        await sdkForProject.databases.createStringAttribute(
+        await sdk.forProject.databases.createStringAttribute(
             databaseId,
             collectionId,
             data.key,
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/url.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/url.svelte
index e1410c83a..e438809fd 100644
--- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/url.svelte
+++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/url.svelte
@@ -23,7 +23,7 @@
         collectionId: string,
         data: Partial<Models.AttributeUrl>
     ) {
-        await sdkForProject.databases.createUrlAttribute(
+        await sdk.forProject.databases.createUrlAttribute(
             databaseId,
             collectionId,
             data.key,
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/relationship.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/relationship.svelte
index 1a82e667a..107f7ffc8 100644
--- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/relationship.svelte
+++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/relationship.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
     import { Button, InputSelectSearch } from '$lib/elements/forms';
-    import { sdkForProject } from '$lib/stores/sdk';
+    import { sdk } from '$lib/stores/sdk';
     import { Query, type Models } from '@aw-labs/appwrite-console';
     import { onMount } from 'svelte';
 
@@ -20,14 +20,14 @@
 
     async function getCollections(search: string = null) {
         if (search) {
-            const collections = await sdkForProject.databases.listCollections(
+            const collections = await sdk.forProject.databases.listCollections(
                 attribute.related,
                 [Query.orderDesc('$createdAt')],
                 search
             );
             return collections;
         } else {
-            const collections = await sdkForProject.databases.listCollections(attribute.related);
+            const collections = await sdk.forProject.databases.listCollections(attribute.related);
             return collections;
         }
     }
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/data/+page.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/data/+page.svelte
index 81df3cb61..5778850b7 100644
--- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/data/+page.svelte
+++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/data/+page.svelte
@@ -2,7 +2,7 @@
     import { Button } from '$lib/elements/forms';
     import { CardGrid, Heading } from '$lib/components';
     import { page } from '$app/stores';
-    import { sdkForProject } from '$lib/stores/sdk';
+    import { sdk } from '$lib/stores/sdk';
     import { addNotification } from '$lib/stores/notifications';
     import { writable } from 'svelte/store';
     import type { Models } from '@aw-labs/appwrite-console';
@@ -39,7 +39,7 @@
 
     async function updateData() {
         try {
-            await sdkForProject.databases.updateDocument(
+            await sdk.forProject.databases.updateDocument(
                 databaseId,
                 collectionId,
                 documentId,