diff --git a/src/lib/commandCenter/searchers/buckets.ts b/src/lib/commandCenter/searchers/buckets.ts
index a3ede978c..cc707f3e7 100644
--- a/src/lib/commandCenter/searchers/buckets.ts
+++ b/src/lib/commandCenter/searchers/buckets.ts
@@ -32,7 +32,9 @@ export const bucketSearcher = (async (query: string) => {
     const region = page.params.region;
     const { buckets } = await sdk
         .forProject(page.params.region, page.params.project)
-        .storage.listBuckets([Query.orderDesc('$createdAt')]);
+        .storage.listBuckets({
+            queries: [Query.orderDesc('$createdAt')]
+        });
 
     const filtered = buckets.filter((bucket) => bucket.name.includes(query));
 
diff --git a/src/lib/commandCenter/searchers/databases.ts b/src/lib/commandCenter/searchers/databases.ts
index 30af078e4..3b6896458 100644
--- a/src/lib/commandCenter/searchers/databases.ts
+++ b/src/lib/commandCenter/searchers/databases.ts
@@ -8,7 +8,7 @@ import { page } from '$app/state';
 export const dbSearcher = (async (query: string) => {
     const { databases } = await sdk
         .forProject(page.params.region, page.params.project)
-        .tablesDb.list({});
+        .tablesDB.list();
 
     return databases
         .filter((db) => db.name.toLowerCase().includes(query.toLowerCase()))
diff --git a/src/lib/commandCenter/searchers/files.ts b/src/lib/commandCenter/searchers/files.ts
index 858441740..576f3029e 100644
--- a/src/lib/commandCenter/searchers/files.ts
+++ b/src/lib/commandCenter/searchers/files.ts
@@ -15,7 +15,11 @@ export const fileSearcher = (async (query: string) => {
 
     const { files } = await sdk
         .forProject(page.params.region, page.params.project)
-        .storage.listFiles($bucket.$id, [Query.orderDesc('')], query || undefined);
+        .storage.listFiles({
+            bucketId: $bucket.$id,
+            queries: [Query.orderDesc('')],
+            search: query || undefined
+        });
 
     return files.map((file) => ({
         label: file.name,
diff --git a/src/lib/commandCenter/searchers/projects.ts b/src/lib/commandCenter/searchers/projects.ts
index 5787da93c..1df30a3b7 100644
--- a/src/lib/commandCenter/searchers/projects.ts
+++ b/src/lib/commandCenter/searchers/projects.ts
@@ -7,10 +7,9 @@ import type { Searcher } from '../commands';
 import { base } from '$app/paths';
 
 export const projectsSearcher = (async (query: string) => {
-    const { projects } = await sdk.forConsole.projects.list([
-        Query.equal('teamId', get(organization).$id),
-        Query.orderDesc('')
-    ]);
+    const { projects } = await sdk.forConsole.projects.list({
+        queries: [Query.equal('teamId', get(organization).$id), Query.orderDesc('')]
+    });
 
     return projects
         .filter((project) => project.name.toLowerCase().includes(query.toLowerCase()))
diff --git a/src/lib/commandCenter/searchers/tables.ts b/src/lib/commandCenter/searchers/tables.ts
index 91e03454b..c66a8a59f 100644
--- a/src/lib/commandCenter/searchers/tables.ts
+++ b/src/lib/commandCenter/searchers/tables.ts
@@ -8,7 +8,7 @@ export const tablesSearcher = (async (query: string) => {
     const databaseId = page.params.database;
     const { tables } = await sdk
         .forProject(page.params.region, page.params.project)
-        .tablesDb.listTables({ databaseId });
+        .tablesDB.listTables({ databaseId });
 
     return tables
         .filter((table) => table.name.toLowerCase().includes(query.toLowerCase()))
diff --git a/src/lib/commandCenter/searchers/teams.ts b/src/lib/commandCenter/searchers/teams.ts
index ba8d76ca9..7e9f4dc60 100644
--- a/src/lib/commandCenter/searchers/teams.ts
+++ b/src/lib/commandCenter/searchers/teams.ts
@@ -17,9 +17,9 @@ const getTeamCommand = (team: Models.Team<Models.Preferences>, region: string, p
     }) satisfies Command;
 
 export const teamSearcher = (async (query: string) => {
-    const { teams } = await sdk
-        .forProject(page.params.region, page.params.project)
-        .teams.list([], query);
+    const { teams } = await sdk.forProject(page.params.region, page.params.project).teams.list({
+        search: query
+    });
 
     if (teams.length === 1) {
         return [
diff --git a/src/lib/commandCenter/searchers/users.ts b/src/lib/commandCenter/searchers/users.ts
index 197b15e89..c4e08409a 100644
--- a/src/lib/commandCenter/searchers/users.ts
+++ b/src/lib/commandCenter/searchers/users.ts
@@ -18,9 +18,9 @@ const getUserCommand = (user: Models.User<Models.Preferences>, region: string, p
     }) satisfies Command;
 
 export const userSearcher = (async (query: string) => {
-    const { users } = await sdk
-        .forProject(page.params.region, page.params.project)
-        .users.list([], query || undefined);
+    const { users } = await sdk.forProject(page.params.region, page.params.project).users.list({
+        search: query || undefined
+    });
 
     if (users.length === 1) {
         return [
diff --git a/src/lib/components/avatarInitials.svelte b/src/lib/components/avatarInitials.svelte
index fe6cd54a0..5049c48ad 100644
--- a/src/lib/components/avatarInitials.svelte
+++ b/src/lib/components/avatarInitials.svelte
@@ -9,7 +9,9 @@
     export let size: AvatarProps['size'] = 'm';
     export let background: string | undefined = undefined;
 
-    $: src = sdk.forConsole.avatars.getInitials(name, 192, 192, background).toString();
+    $: src = sdk.forConsole.avatars
+        .getInitials({ name, width: 192, height: 192, background })
+        .toString();
 </script>
 
 <Avatar alt={name} {size} {src} />
diff --git a/src/lib/components/csvImportBox.svelte b/src/lib/components/csvImportBox.svelte
index 077a49b49..8ff2838ab 100644
--- a/src/lib/components/csvImportBox.svelte
+++ b/src/lib/components/csvImportBox.svelte
@@ -80,7 +80,7 @@
             try {
                 const table = await sdk
                     .forProject(page.params.region, page.params.project)
-                    .tablesDb.getTable({
+                    .tablesDB.getTable({
                         databaseId,
                         tableId
                     });
diff --git a/src/lib/components/filePicker.svelte b/src/lib/components/filePicker.svelte
index 34a984fc7..06866380b 100644
--- a/src/lib/components/filePicker.svelte
+++ b/src/lib/components/filePicker.svelte
@@ -77,7 +77,12 @@
         return (
             sdk
                 .forProject(page.params.region, page.params.project)
-                .storage.getFilePreview(bucketId, fileId, size, size)
+                .storage.getFilePreview({
+                    bucketId,
+                    fileId,
+                    width: size,
+                    height: size
+                })
                 .toString() + '&mode=admin'
         );
     }
@@ -87,15 +92,20 @@
             uploading = true;
             let file = null;
             if (localFileBucketSelected) {
-                file = await sdk
-                    .forConsoleIn(page.params.region)
-                    .storage.createFile('default', ID.unique(), localFile[0]);
+                file = await sdk.forConsoleIn(page.params.region).storage.createFile({
+                    bucketId: 'default',
+                    fileId: ID.unique(),
+                    file: localFile[0]
+                });
             } else {
                 file = await sdk
                     .forProject(page.params.region, page.params.project)
-                    .storage.createFile(selectedBucket, ID.unique(), fileSelector.files[0], [
-                        Permission.read(Role.any())
-                    ]);
+                    .storage.createFile({
+                        bucketId: selectedBucket,
+                        fileId: ID.unique(),
+                        file: fileSelector.files[0],
+                        permissions: [Permission.read(Role.any())]
+                    });
                 search.set($search === null ? '' : null);
             }
             selectFile(file);
@@ -203,7 +213,11 @@
         currentBucket &&
         sdk
             .forProject(page.params.region, page.params.project)
-            .storage.listFiles(currentBucket.$id, getProperQuery(), $search || undefined)
+            .storage.listFiles({
+                bucketId: currentBucket.$id,
+                queries: getProperQuery(),
+                search: $search || undefined
+            })
             .then((response) => {
                 if ($search === '') {
                     searchEnabled = response.total > 0;
diff --git a/src/lib/components/git/connectRepoModal.svelte b/src/lib/components/git/connectRepoModal.svelte
index bf2685c65..68acdab02 100644
--- a/src/lib/components/git/connectRepoModal.svelte
+++ b/src/lib/components/git/connectRepoModal.svelte
@@ -56,7 +56,11 @@
             if (repositoryBehaviour === 'new') {
                 const repo = await sdk
                     .forProject(page.params.region, page.params.project)
-                    .vcs.createRepository($installation.$id, repositoryName, repositoryPrivate);
+                    .vcs.createRepository({
+                        installationId: $installation.$id,
+                        name: repositoryName,
+                        xprivate: repositoryPrivate
+                    });
                 repository.set(repo);
                 selectedRepository = repo.id;
             }
diff --git a/src/lib/components/git/productionBranchFieldset.svelte b/src/lib/components/git/productionBranchFieldset.svelte
index de059a73c..addd40557 100644
--- a/src/lib/components/git/productionBranchFieldset.svelte
+++ b/src/lib/components/git/productionBranchFieldset.svelte
@@ -18,13 +18,19 @@
     async function loadBranches() {
         const repo = await sdk
             .forProject(page.params.region, page.params.project)
-            .vcs.getRepository(installationId, repositoryId);
+            .vcs.getRepository({
+                installationId,
+                providerRepositoryId: repositoryId
+            });
 
         branch = repo.defaultBranch ?? 'main';
 
         const { branches } = await sdk
             .forProject(page.params.region, page.params.project)
-            .vcs.listRepositoryBranches(installationId, repositoryId);
+            .vcs.listRepositoryBranches({
+                installationId,
+                providerRepositoryId: repositoryId
+            });
 
         return sortBranches(branches);
     }
diff --git a/src/lib/components/git/repositories.svelte b/src/lib/components/git/repositories.svelte
index f67a5a0c3..260576f32 100644
--- a/src/lib/components/git/repositories.svelte
+++ b/src/lib/components/git/repositories.svelte
@@ -107,21 +107,21 @@
             $repositories.repositories = (
                 (await sdk
                     .forProject(page.params.region, page.params.project)
-                    .vcs.listRepositories(
+                    .vcs.listRepositories({
                         installationId,
-                        VCSDetectionType.Runtime,
-                        search || undefined
-                    )) as unknown as Models.ProviderRepositoryRuntimeList
+                        type: VCSDetectionType.Runtime,
+                        search: search || undefined
+                    })) as unknown as Models.ProviderRepositoryRuntimeList
             ).runtimeProviderRepositories; //TODO: remove forced cast after backend fixes
         } else {
             $repositories.repositories = (
                 (await sdk
                     .forProject(page.params.region, page.params.project)
-                    .vcs.listRepositories(
+                    .vcs.listRepositories({
                         installationId,
-                        VCSDetectionType.Framework,
-                        search || undefined
-                    )) as unknown as Models.ProviderRepositoryFrameworkList
+                        type: VCSDetectionType.Framework,
+                        search: search || undefined
+                    })) as unknown as Models.ProviderRepositoryFrameworkList
             ).frameworkProviderRepositories;
         }
         $repositories.search = search;
diff --git a/src/lib/components/git/selectRootModal.svelte b/src/lib/components/git/selectRootModal.svelte
index 7caa5b58d..5d7088862 100644
--- a/src/lib/components/git/selectRootModal.svelte
+++ b/src/lib/components/git/selectRootModal.svelte
@@ -43,7 +43,12 @@
         try {
             const content = await sdk
                 .forProject(page.params.region, page.params.project)
-                .vcs.getRepositoryContents($installation.$id, $repository.id, currentPath, branch);
+                .vcs.getRepositoryContents({
+                    installationId: $installation.$id,
+                    providerRepositoryId: $repository.id,
+                    providerRootDirectory: currentPath,
+                    providerReference: branch
+                });
             directories[0].fileCount = content.contents?.length ?? 0;
             directories[0].children = content.contents
                 .filter((e) => e.isDirectory)
@@ -83,7 +88,12 @@
             try {
                 const content = await sdk
                     .forProject(page.params.region, page.params.project)
-                    .vcs.getRepositoryContents($installation.$id, $repository.id, path, branch);
+                    .vcs.getRepositoryContents({
+                        installationId: $installation.$id,
+                        providerRepositoryId: $repository.id,
+                        providerRootDirectory: path,
+                        providerReference: branch
+                    });
 
                 const fileCount = content.contents?.length ?? 0;
                 const contentDirectories = content.contents.filter((e) => e.isDirectory);
diff --git a/src/lib/components/permissions/row.svelte b/src/lib/components/permissions/row.svelte
index 31a6fd4db..8706f77a7 100644
--- a/src/lib/components/permissions/row.svelte
+++ b/src/lib/components/permissions/row.svelte
@@ -29,13 +29,13 @@
         if (role === 'user') {
             const user = await sdk
                 .forProject(page.params.region, page.params.project)
-                .users.get(id);
+                .users.get({ userId: id });
             return user;
         }
         if (role === 'team') {
             const team = await sdk
                 .forProject(page.params.region, page.params.project)
-                .teams.get(id);
+                .teams.get({ teamId: id });
             return team;
         }
     }
diff --git a/src/lib/components/permissions/team.svelte b/src/lib/components/permissions/team.svelte
index c5d21e5f5..02867a7fd 100644
--- a/src/lib/components/permissions/team.svelte
+++ b/src/lib/components/permissions/team.svelte
@@ -45,9 +45,10 @@
     async function request() {
         if (!show) return;
         isLoading = true;
-        results = await sdk
-            .forProject(page.params.region, page.params.project)
-            .teams.list([Query.limit(5), Query.offset(offset)], search || undefined);
+        results = await sdk.forProject(page.params.region, page.params.project).teams.list({
+            queries: [Query.limit(5), Query.offset(offset)],
+            search: search || undefined
+        });
         isLoading = false;
     }
 
diff --git a/src/lib/components/permissions/user.svelte b/src/lib/components/permissions/user.svelte
index 64f687a69..bf051e76d 100644
--- a/src/lib/components/permissions/user.svelte
+++ b/src/lib/components/permissions/user.svelte
@@ -48,9 +48,10 @@
     async function request() {
         if (!show) return;
         isLoading = true;
-        results = await sdk
-            .forProject(page.params.region, page.params.project)
-            .users.list([Query.limit(5), Query.offset(offset)], search || undefined);
+        results = await sdk.forProject(page.params.region, page.params.project).users.list({
+            queries: [Query.limit(5), Query.offset(offset)],
+            search: search || undefined
+        });
         isLoading = false;
     }
 
diff --git a/src/lib/helpers/faker.ts b/src/lib/helpers/faker.ts
index edb0ecd26..691af8695 100644
--- a/src/lib/helpers/faker.ts
+++ b/src/lib/helpers/faker.ts
@@ -11,15 +11,15 @@ export async function generateColumns(
     const client = sdk.forProject(project.region, project.$id);
 
     return await Promise.all([
-        client.tablesDb.createStringColumn({
+        client.tablesDB.createStringColumn({
             databaseId,
             tableId,
             key: 'name',
             size: 255,
             required: false
         }),
-        client.tablesDb.createEmailColumn({ databaseId, tableId, key: 'email', required: false }),
-        client.tablesDb.createIntegerColumn({
+        client.tablesDB.createEmailColumn({ databaseId, tableId, key: 'email', required: false }),
+        client.tablesDB.createIntegerColumn({
             databaseId,
             tableId,
             key: 'age',
@@ -27,21 +27,21 @@ export async function generateColumns(
             min: 0,
             max: 150
         }),
-        client.tablesDb.createStringColumn({
+        client.tablesDB.createStringColumn({
             databaseId,
             tableId,
             key: 'city',
             size: 100,
             required: false
         }),
-        client.tablesDb.createStringColumn({
+        client.tablesDB.createStringColumn({
             databaseId,
             tableId,
             key: 'description',
             size: 1000,
             required: false
         }),
-        client.tablesDb.createBooleanColumn({ databaseId, tableId, key: 'active', required: false })
+        client.tablesDB.createBooleanColumn({ databaseId, tableId, key: 'active', required: false })
     ]);
 }
 
diff --git a/src/lib/helpers/flag.ts b/src/lib/helpers/flag.ts
index 0fb3254a6..5eb12dafd 100644
--- a/src/lib/helpers/flag.ts
+++ b/src/lib/helpers/flag.ts
@@ -4,5 +4,7 @@ import { sdk } from '$lib/stores/sdk';
 
 export function getFlagUrl(countryCode: string) {
     if (!isValueOfStringEnum(Flag, countryCode)) return '';
-    return sdk.forConsole.avatars.getFlag(countryCode, 22, 15, 100)?.toString();
+    return sdk.forConsole.avatars
+        .getFlag({ code: countryCode, width: 22, height: 15, quality: 100 })
+        ?.toString();
 }
diff --git a/src/lib/helpers/logout.ts b/src/lib/helpers/logout.ts
index 0e5e9507f..e25666b75 100644
--- a/src/lib/helpers/logout.ts
+++ b/src/lib/helpers/logout.ts
@@ -6,7 +6,7 @@ import { base } from '$app/paths';
 import { uploader } from '$lib/stores/uploader';
 
 export async function logout(redirect: boolean = true) {
-    await sdk.forConsole.account.deleteSession('current');
+    await sdk.forConsole.account.deleteSession({ sessionId: 'current' });
     await invalidate(Dependencies.ACCOUNT);
     uploader.reset();
     trackEvent(Submit.AccountLogout);
diff --git a/src/lib/stores/sdk.ts b/src/lib/stores/sdk.ts
index 7603c3820..20ec5b83c 100644
--- a/src/lib/stores/sdk.ts
+++ b/src/lib/stores/sdk.ts
@@ -126,7 +126,7 @@ const sdkForProject = {
     proxy: new Proxy(clientProject),
     migrations: new Migrations(clientProject),
     sites: new Sites(clientProject),
-    tablesDb: new TablesDB(clientProject)
+    tablesDB: new TablesDB(clientProject)
 };
 
 export const realtime = {
diff --git a/src/routes/(authenticated)/mfa/+page.svelte b/src/routes/(authenticated)/mfa/+page.svelte
index f18b59e89..2f9bff560 100644
--- a/src/routes/(authenticated)/mfa/+page.svelte
+++ b/src/routes/(authenticated)/mfa/+page.svelte
@@ -20,7 +20,7 @@
     let code = '';
 
     async function back() {
-        await sdk.forConsole.account.deleteSession('current');
+        await sdk.forConsole.account.deleteSession({ sessionId: 'current' });
         await goto(base);
     }
 
diff --git a/src/routes/(console)/(migration-wizard)/step1.svelte b/src/routes/(console)/(migration-wizard)/step1.svelte
index 3bc718df5..babcf8511 100644
--- a/src/routes/(console)/(migration-wizard)/step1.svelte
+++ b/src/routes/(console)/(migration-wizard)/step1.svelte
@@ -36,7 +36,11 @@
 
     const beforeSubmit = async () => {
         if (projectType === 'existing') return;
-        const project = await sdk.forConsole.projects.create(ID.unique(), newProjName, selectedOrg);
+        const project = await sdk.forConsole.projects.create({
+            projectId: ID.unique(),
+            name: newProjName,
+            teamId: selectedOrg
+        });
         selectedProject.set(project.$id);
     };
 </script>
diff --git a/src/routes/(console)/+layout.svelte b/src/routes/(console)/+layout.svelte
index 53293ca79..e415cff37 100644
--- a/src/routes/(console)/+layout.svelte
+++ b/src/routes/(console)/+layout.svelte
@@ -326,15 +326,17 @@
 
     $: projects = isOnOnboarding
         ? null
-        : sdk.forConsole.projects.list([
-              Query.equal(
-                  'teamId',
-                  // id from page params ?? id from store ?? id from preferences
-                  page.params.organization ?? currentOrganizationId ?? data.currentOrgId
-              ),
-              Query.limit(5),
-              Query.orderDesc('$updatedAt')
-          ]);
+        : sdk.forConsole.projects.list({
+              queries: [
+                  Query.equal(
+                      'teamId',
+                      // id from page params ?? id from store ?? id from preferences
+                      page.params.organization ?? currentOrganizationId ?? data.currentOrgId
+                  ),
+                  Query.limit(5),
+                  Query.orderDesc('$updatedAt')
+              ]
+          });
 
     $: if ($requestedMigration) {
         openMigrationWizard();
diff --git a/src/routes/(console)/account/activity/+page.ts b/src/routes/(console)/account/activity/+page.ts
index 4f02c4912..20e70bbf3 100644
--- a/src/routes/(console)/account/activity/+page.ts
+++ b/src/routes/(console)/account/activity/+page.ts
@@ -12,6 +12,8 @@ export const load: PageLoad = async ({ url, route }) => {
     return {
         offset,
         limit,
-        logs: await sdk.forConsole.account.listLogs([Query.offset(offset), Query.limit(limit)])
+        logs: await sdk.forConsole.account.listLogs({
+            queries: [Query.offset(offset), Query.limit(limit)]
+        })
     };
 };
diff --git a/src/routes/(console)/account/deleteMfa.svelte b/src/routes/(console)/account/deleteMfa.svelte
index e37bd9d49..612dfab64 100644
--- a/src/routes/(console)/account/deleteMfa.svelte
+++ b/src/routes/(console)/account/deleteMfa.svelte
@@ -13,7 +13,9 @@
 
     async function deleteAuthenticator() {
         try {
-            await sdk.forConsole.account.deleteMfaAuthenticator(AuthenticatorType.Totp);
+            await sdk.forConsole.account.deleteMfaAuthenticator({
+                type: AuthenticatorType.Totp
+            });
             await invalidate(Dependencies.ACCOUNT);
             await invalidate(Dependencies.FACTORS);
             showDelete = false;
diff --git a/src/routes/(console)/account/identities.svelte b/src/routes/(console)/account/identities.svelte
index e6aa0416b..924d22621 100644
--- a/src/routes/(console)/account/identities.svelte
+++ b/src/routes/(console)/account/identities.svelte
@@ -15,7 +15,7 @@
 
     async function deleteIdentity(id: string) {
         try {
-            await sdk.forConsole.account.deleteIdentity(id);
+            await sdk.forConsole.account.deleteIdentity({ identityId: id });
             addNotification({
                 message: 'Identity has been deleted',
                 type: 'success'
diff --git a/src/routes/(console)/account/mfa.svelte b/src/routes/(console)/account/mfa.svelte
index 777abe4f8..cbb82d4c6 100644
--- a/src/routes/(console)/account/mfa.svelte
+++ b/src/routes/(console)/account/mfa.svelte
@@ -17,15 +17,20 @@
     let error = '';
 
     async function addAuthenticator(): Promise<string> {
-        type = await sdk.forConsole.account.createMfaAuthenticator(AuthenticatorType.Totp);
+        type = await sdk.forConsole.account.createMfaAuthenticator({
+            type: AuthenticatorType.Totp
+        });
         trackEvent(Submit.AccountAuthenticatorCreate);
 
-        return sdk.forConsole.avatars.getQR(type.uri, 192 * 2);
+        return sdk.forConsole.avatars.getQR({ text: type.uri, size: 192 * 2 });
     }
 
     async function verifyAuthenticator() {
         try {
-            await sdk.forConsole.account.updateMfaAuthenticator(AuthenticatorType.Totp, code);
+            await sdk.forConsole.account.updateMfaAuthenticator({
+                type: AuthenticatorType.Totp,
+                otp: code
+            });
             await Promise.all([invalidate(Dependencies.ACCOUNT), invalidate(Dependencies.FACTORS)]);
             showSetup = false;
             addNotification({
diff --git a/src/routes/(console)/account/organizations/+page.svelte b/src/routes/(console)/account/organizations/+page.svelte
index a6e6197a9..6496aa7fd 100644
--- a/src/routes/(console)/account/organizations/+page.svelte
+++ b/src/routes/(console)/account/organizations/+page.svelte
@@ -27,7 +27,7 @@
     let addOrganization = false;
 
     const getMemberships = async (teamId: string) => {
-        const memberships = await sdk.forConsole.teams.listMemberships(teamId);
+        const memberships = await sdk.forConsole.teams.listMemberships({ teamId });
         return memberships.memberships.map((team) => team.userName || team.userEmail);
     };
 
diff --git a/src/routes/(console)/account/organizations/+page.ts b/src/routes/(console)/account/organizations/+page.ts
index c1734a28c..6d8ea5689 100644
--- a/src/routes/(console)/account/organizations/+page.ts
+++ b/src/routes/(console)/account/organizations/+page.ts
@@ -13,7 +13,7 @@ export const load: PageLoad = async ({ url, route }) => {
     const queries = [Query.offset(offset), Query.limit(limit), Query.orderDesc('')];
 
     const organizations = !isCloud
-        ? await sdk.forConsole.teams.list(queries)
+        ? await sdk.forConsole.teams.list({ queries })
         : await sdk.forConsole.billing.listOrganization(queries);
 
     return {
diff --git a/src/routes/(console)/account/sessions/+page.svelte b/src/routes/(console)/account/sessions/+page.svelte
index ed52cef08..de2dfae5e 100644
--- a/src/routes/(console)/account/sessions/+page.svelte
+++ b/src/routes/(console)/account/sessions/+page.svelte
@@ -21,7 +21,7 @@
         const code = clientCode.toLowerCase();
         if (!isValueOfStringEnum(Browser, code)) return '';
 
-        return sdk.forConsole.avatars.getBrowser(code, 40, 40);
+        return sdk.forConsole.avatars.getBrowser({ code, width: 40, height: 40 });
     }
 
     function logoutSessionId(sessionId: string) {
@@ -34,7 +34,9 @@
     async function logout(session: Models.Session) {
         let result;
         try {
-            result = await sdk.forConsole.account.deleteSession(session.$id);
+            result = await sdk.forConsole.account.deleteSession({
+                sessionId: session.$id
+            });
         } catch (e) {
             addNotification({
                 type: 'error',
diff --git a/src/routes/(console)/account/updateEmail.svelte b/src/routes/(console)/account/updateEmail.svelte
index cad162c36..e2e2d6cd4 100644
--- a/src/routes/(console)/account/updateEmail.svelte
+++ b/src/routes/(console)/account/updateEmail.svelte
@@ -18,7 +18,10 @@
 
     async function updateEmail() {
         try {
-            await sdk.forConsole.account.updateEmail(email, emailPassword);
+            await sdk.forConsole.account.updateEmail({
+                email,
+                password: emailPassword
+            });
             await Promise.all([invalidate(Dependencies.ACCOUNT), invalidate(Dependencies.FACTORS)]);
             addNotification({
                 message: 'Email has been updated',
diff --git a/src/routes/(console)/account/updateName.svelte b/src/routes/(console)/account/updateName.svelte
index 07e85def1..3b22a8fa0 100644
--- a/src/routes/(console)/account/updateName.svelte
+++ b/src/routes/(console)/account/updateName.svelte
@@ -17,7 +17,9 @@
 
     async function updateName() {
         try {
-            await sdk.forConsole.account.updateName(name);
+            await sdk.forConsole.account.updateName({
+                name
+            });
             await invalidate(Dependencies.ACCOUNT);
             addNotification({
                 message: 'Name has been updated',
diff --git a/src/routes/(console)/account/updatePassword.svelte b/src/routes/(console)/account/updatePassword.svelte
index d51f612bf..54b1f68bb 100644
--- a/src/routes/(console)/account/updatePassword.svelte
+++ b/src/routes/(console)/account/updatePassword.svelte
@@ -12,7 +12,10 @@
 
     async function updatePassword() {
         try {
-            await sdk.forConsole.account.updatePassword(newPassword, oldPassword);
+            await sdk.forConsole.account.updatePassword({
+                password: newPassword,
+                oldPassword
+            });
             newPassword = oldPassword = null;
             addNotification({
                 message: 'Password has been updated',
diff --git a/src/routes/(console)/createOrganization.svelte b/src/routes/(console)/createOrganization.svelte
index b869b35e2..a657bdf47 100644
--- a/src/routes/(console)/createOrganization.svelte
+++ b/src/routes/(console)/createOrganization.svelte
@@ -21,7 +21,10 @@
 
     async function create() {
         try {
-            const org = await sdk.forConsole.teams.create(ID.unique(), name);
+            const org = await sdk.forConsole.teams.create({
+                teamId: ID.unique(),
+                name
+            });
             await invalidate(Dependencies.ACCOUNT);
             dispatch('created');
             await goto(`${base}/organization-${org.$id}`);
diff --git a/src/routes/(console)/onboarding/create-organization/+page.svelte b/src/routes/(console)/onboarding/create-organization/+page.svelte
index b29ff6f44..3b563fd02 100644
--- a/src/routes/(console)/onboarding/create-organization/+page.svelte
+++ b/src/routes/(console)/onboarding/create-organization/+page.svelte
@@ -35,7 +35,10 @@
                     members_invited: 0
                 });
             } else {
-                organization = await sdk.forConsole.teams.create(ID.unique(), organizationName);
+                organization = await sdk.forConsole.teams.create({
+                    teamId: ID.unique(),
+                    name: organizationName
+                });
             }
         } catch (e) {
             trackError(e, Submit.OrganizationCreate);
diff --git a/src/routes/(console)/onboarding/create-project/+page.ts b/src/routes/(console)/onboarding/create-project/+page.ts
index 9cf6c0a9c..808f43366 100644
--- a/src/routes/(console)/onboarding/create-project/+page.ts
+++ b/src/routes/(console)/onboarding/create-project/+page.ts
@@ -65,10 +65,9 @@ export const load: PageLoad = async ({ parent }) => {
         const org = organizations.teams[0];
         let projects: Models.ProjectList = null;
         try {
-            projects = await sdk.forConsole.projects.list([
-                Query.equal('teamId', org.$id),
-                Query.limit(1)
-            ]);
+            projects = await sdk.forConsole.projects.list({
+                queries: [Query.equal('teamId', org.$id), Query.limit(1)]
+            });
         } catch (e) {
             redirect(303, `${base}/organization-${org.$id}`);
         }
diff --git a/src/routes/(console)/organization-[organization]/+layout.ts b/src/routes/(console)/organization-[organization]/+layout.ts
index 2aadce4bd..e4ca63103 100644
--- a/src/routes/(console)/organization-[organization]/+layout.ts
+++ b/src/routes/(console)/organization-[organization]/+layout.ts
@@ -43,8 +43,8 @@ export const load: LayoutLoad = async ({ params, depends, parent }) => {
         }
 
         const [organization, members, countryList, locale] = await Promise.all([
-            sdk.forConsole.teams.get(params.organization) as Promise<Organization>,
-            sdk.forConsole.teams.listMemberships(params.organization),
+            sdk.forConsole.teams.get({ teamId: params.organization }) as Promise<Organization>,
+            sdk.forConsole.teams.listMemberships({ teamId: params.organization }),
             sdk.forConsole.locale.listCountries(),
             sdk.forConsole.locale.get(),
             preferences.loadTeamPrefs(params.organization),
diff --git a/src/routes/(console)/organization-[organization]/createProject.svelte b/src/routes/(console)/organization-[organization]/createProject.svelte
index 856447cab..340c66efa 100644
--- a/src/routes/(console)/organization-[organization]/createProject.svelte
+++ b/src/routes/(console)/organization-[organization]/createProject.svelte
@@ -27,7 +27,11 @@
         try {
             disabled = true;
             showSubmissionLoader = true;
-            const project = await sdk.forConsole.projects.create(id ?? ID.unique(), name, teamId);
+            const project = await sdk.forConsole.projects.create({
+                projectId: id ?? ID.unique(),
+                name,
+                teamId
+            });
             show = false;
             dispatch('created', project);
             trackEvent(Submit.ProjectCreate, {
diff --git a/src/routes/(console)/organization-[organization]/createProjectCloud.svelte b/src/routes/(console)/organization-[organization]/createProjectCloud.svelte
index a0236076f..6492c8615 100644
--- a/src/routes/(console)/organization-[organization]/createProjectCloud.svelte
+++ b/src/routes/(console)/organization-[organization]/createProjectCloud.svelte
@@ -29,7 +29,12 @@
         showSubmissionLoader = true;
 
         try {
-            project = await sdk.forConsole.projects.create(id ?? ID.unique(), name, teamId, region);
+            project = await sdk.forConsole.projects.create({
+                projectId: id ?? ID.unique(),
+                name,
+                teamId,
+                region
+            });
 
             await goto(`${base}/project-${project.region}-${project.$id}`);
             trackEvent(Submit.ProjectCreate, { customId: !!id, teamId, region: region });
diff --git a/src/routes/(console)/organization-[organization]/deleteMember.svelte b/src/routes/(console)/organization-[organization]/deleteMember.svelte
index e7ce4c119..5b01f8429 100644
--- a/src/routes/(console)/organization-[organization]/deleteMember.svelte
+++ b/src/routes/(console)/organization-[organization]/deleteMember.svelte
@@ -22,7 +22,10 @@
 
     const deleteMembership = async () => {
         try {
-            await sdk.forConsole.teams.deleteMembership(selectedMember.teamId, selectedMember.$id);
+            await sdk.forConsole.teams.deleteMembership({
+                teamId: selectedMember.teamId,
+                membershipId: selectedMember.$id
+            });
 
             if (isUser) {
                 logout();
diff --git a/src/routes/(console)/organization-[organization]/domains/+page.ts b/src/routes/(console)/organization-[organization]/domains/+page.ts
index eaa4368af..b11413a44 100644
--- a/src/routes/(console)/organization-[organization]/domains/+page.ts
+++ b/src/routes/(console)/organization-[organization]/domains/+page.ts
@@ -22,12 +22,14 @@ export const load = async ({ depends, url, route, parent }) => {
         limit,
         query,
         search,
-        domains: await sdk.forConsole.domains.list([
-            Query.limit(limit),
-            Query.offset(offset),
-            Query.orderDesc(''),
-            Query.equal('teamId', organization.$id),
-            ...parsedQueries.values()
-        ])
+        domains: await sdk.forConsole.domains.list({
+            queries: [
+                Query.limit(limit),
+                Query.offset(offset),
+                Query.orderDesc(''),
+                Query.equal('teamId', organization.$id),
+                ...parsedQueries.values()
+            ]
+        })
     };
 };
diff --git a/src/routes/(console)/organization-[organization]/domains/deleteDomainModal.svelte b/src/routes/(console)/organization-[organization]/domains/deleteDomainModal.svelte
index 53a0794f7..885d5f9e0 100644
--- a/src/routes/(console)/organization-[organization]/domains/deleteDomainModal.svelte
+++ b/src/routes/(console)/organization-[organization]/domains/deleteDomainModal.svelte
@@ -17,7 +17,9 @@
 
     async function deleteDomain() {
         try {
-            await sdk.forConsole.domains.delete(selectedDomain.$id);
+            await sdk.forConsole.domains.delete({
+                domainId: selectedDomain.$id
+            });
             show = false;
             addNotification({
                 type: 'success',
diff --git a/src/routes/(console)/organization-[organization]/domains/domain-[domain]/deleteRecordModal.svelte b/src/routes/(console)/organization-[organization]/domains/domain-[domain]/deleteRecordModal.svelte
index 01b4577f5..ce530d207 100644
--- a/src/routes/(console)/organization-[organization]/domains/domain-[domain]/deleteRecordModal.svelte
+++ b/src/routes/(console)/organization-[organization]/domains/domain-[domain]/deleteRecordModal.svelte
@@ -15,7 +15,10 @@
 
     async function deleteDomain() {
         try {
-            await sdk.forConsole.domains.deleteRecord(page.params.domain, selectedRecord.$id);
+            await sdk.forConsole.domains.deleteRecord({
+                domainId: page.params.domain,
+                recordId: selectedRecord.$id
+            });
             await invalidate(Dependencies.DOMAINS);
             show = false;
             addNotification({
diff --git a/src/routes/(console)/organization-[organization]/domains/domain-[domain]/importRecordModal.svelte b/src/routes/(console)/organization-[organization]/domains/domain-[domain]/importRecordModal.svelte
index 53df79780..5c3ba0657 100644
--- a/src/routes/(console)/organization-[organization]/domains/domain-[domain]/importRecordModal.svelte
+++ b/src/routes/(console)/organization-[organization]/domains/domain-[domain]/importRecordModal.svelte
@@ -22,7 +22,10 @@
             const file = files[0];
             const content = await file.text();
 
-            await sdk.forConsole.domains.updateZone(page.params.domain, content);
+            await sdk.forConsole.domains.updateZone({
+                domainId: page.params.domain,
+                content
+            });
             invalidate(Dependencies.DOMAIN);
             show = false;
             addNotification({
diff --git a/src/routes/(console)/organization-[organization]/settings/+page.svelte b/src/routes/(console)/organization-[organization]/settings/+page.svelte
index 763b37fd4..b5bf05fc0 100644
--- a/src/routes/(console)/organization-[organization]/settings/+page.svelte
+++ b/src/routes/(console)/organization-[organization]/settings/+page.svelte
@@ -28,7 +28,10 @@
 
     async function updateName() {
         try {
-            await sdk.forConsole.teams.updateName($organization.$id, name);
+            await sdk.forConsole.teams.updateName({
+                teamId: $organization.$id,
+                name
+            });
             await invalidate(Dependencies.ORGANIZATION);
             addNotification({
                 message: 'Name has been updated',
diff --git a/src/routes/(console)/organization-[organization]/settings/+page.ts b/src/routes/(console)/organization-[organization]/settings/+page.ts
index d5242c753..ffecda25a 100644
--- a/src/routes/(console)/organization-[organization]/settings/+page.ts
+++ b/src/routes/(console)/organization-[organization]/settings/+page.ts
@@ -9,7 +9,7 @@ export const load: PageLoad = async ({ depends, params, parent }) => {
     depends(Dependencies.ORGANIZATION);
 
     const [projects, invoices] = await Promise.all([
-        sdk.forConsole.projects.list([Query.equal('teamId', params.organization)]),
+        sdk.forConsole.projects.list({ queries: [Query.equal('teamId', params.organization)] }),
         isCloud ? sdk.forConsole.billing.listInvoices(params.organization) : undefined
     ]);
 
diff --git a/src/routes/(console)/organization-[organization]/settings/deleteOrganizationModal.svelte b/src/routes/(console)/organization-[organization]/settings/deleteOrganizationModal.svelte
index 7e64d41d4..dab95d83a 100644
--- a/src/routes/(console)/organization-[organization]/settings/deleteOrganizationModal.svelte
+++ b/src/routes/(console)/organization-[organization]/settings/deleteOrganizationModal.svelte
@@ -30,7 +30,9 @@
             if (isCloud) {
                 await sdk.forConsole.billing.deleteOrganization($organization.$id);
             } else {
-                await sdk.forConsole.teams.delete($organization.$id);
+                await sdk.forConsole.teams.delete({
+                    teamId: $organization.$id
+                });
             }
             const prefs = await sdk.forConsole.account.getPrefs();
             const newPrefs = { ...prefs, organization: null };
diff --git a/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.ts b/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.ts
index f67a503cf..8fd36fadf 100644
--- a/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.ts
+++ b/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.ts
@@ -55,7 +55,7 @@ export const load: PageLoad = async ({ params, parent }) => {
         // so it is fine to use this check and fetch memberships conditionally!
         !plan?.addons?.seats?.supported
             ? null
-            : sdk.forConsole.teams.listMemberships(org.$id, [Query.limit(100)])
+            : sdk.forConsole.teams.listMemberships({ teamId: org.$id, queries: [Query.limit(100)] })
     ]);
 
     return {
@@ -76,7 +76,9 @@ function getUsageProjects(usage: OrganizationUsage) {
         for (let index = 0; index < usage.projects.length; index += limit) {
             const chunkIds = usage.projects.slice(index, index + limit).map((p) => p.projectId);
             requests.push(
-                sdk.forConsole.projects.list([Query.limit(limit), Query.equal('$id', chunkIds)])
+                sdk.forConsole.projects.list({
+                    queries: [Query.limit(limit), Query.equal('$id', chunkIds)]
+                })
             );
         }
 
diff --git a/src/routes/(console)/project-[region]-[project]/+layout.ts b/src/routes/(console)/project-[region]-[project]/+layout.ts
index 2d7c9dbc9..2c5c14ab8 100644
--- a/src/routes/(console)/project-[region]-[project]/+layout.ts
+++ b/src/routes/(console)/project-[region]-[project]/+layout.ts
@@ -15,7 +15,7 @@ export const load: LayoutLoad = async ({ params, depends, parent }) => {
     const { plansInfo, organizations, preferences: prefs } = await parent();
     depends(Dependencies.PROJECT);
 
-    const project = await sdk.forConsole.projects.get(params.project);
+    const project = await sdk.forConsole.projects.get({ projectId: params.project });
     project.region ??= 'default';
 
     // fast path without a network call!
@@ -27,7 +27,7 @@ export const load: LayoutLoad = async ({ params, depends, parent }) => {
 
     const [org, regionalConsoleVariables, rolesResult, organizationPlan] = await Promise.all([
         !organization
-            ? (sdk.forConsole.teams.get(project.teamId) as Promise<Organization>)
+            ? (sdk.forConsole.teams.get({ teamId: project.teamId }) as Promise<Organization>)
             : organization,
         sdk.forConsoleIn(project.region).console.variables(),
         isCloud ? sdk.forConsole.billing.getRoles(project.teamId) : null,
diff --git a/src/routes/(console)/project-[region]-[project]/auth/+page.ts b/src/routes/(console)/project-[region]-[project]/auth/+page.ts
index 74ce23f31..c92055259 100644
--- a/src/routes/(console)/project-[region]-[project]/auth/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/auth/+page.ts
@@ -20,8 +20,9 @@ export const load: PageLoad = async ({ url, route, params }) => {
         limit,
         search,
         page,
-        users: await sdk
-            .forProject(params.region, params.project)
-            .users.list([Query.limit(limit), Query.offset(offset), Query.orderDesc('')], search)
+        users: await sdk.forProject(params.region, params.project).users.list({
+            queries: [Query.limit(limit), Query.offset(offset), Query.orderDesc('')],
+            search
+        })
     };
 };
diff --git a/src/routes/(console)/project-[region]-[project]/auth/createTeam.svelte b/src/routes/(console)/project-[region]-[project]/auth/createTeam.svelte
index dc7bd0cdc..aed8116c3 100644
--- a/src/routes/(console)/project-[region]-[project]/auth/createTeam.svelte
+++ b/src/routes/(console)/project-[region]-[project]/auth/createTeam.svelte
@@ -21,7 +21,10 @@
         try {
             const team = await sdk
                 .forProject(page.params.region, page.params.project)
-                .teams.create(id ?? ID.unique(), name);
+                .teams.create({
+                    teamId: id ?? ID.unique(),
+                    name
+                });
             name = '';
             showCreate = false;
             showCustomId = false;
diff --git a/src/routes/(console)/project-[region]-[project]/auth/security/updateMockNumbers.svelte b/src/routes/(console)/project-[region]-[project]/auth/security/updateMockNumbers.svelte
index a9ed632c9..e8a82bab9 100644
--- a/src/routes/(console)/project-[region]-[project]/auth/security/updateMockNumbers.svelte
+++ b/src/routes/(console)/project-[region]-[project]/auth/security/updateMockNumbers.svelte
@@ -38,7 +38,10 @@
 
     async function updateMockNumbers() {
         try {
-            await sdk.forConsole.projects.updateMockNumbers($project.$id, numbers);
+            await sdk.forConsole.projects.updateMockNumbers({
+                projectId: $project.$id,
+                numbers
+            });
             await invalidate(Dependencies.PROJECT);
             addNotification({
                 type: 'success',
diff --git a/src/routes/(console)/project-[region]-[project]/auth/security/updateSessionAlerts.svelte b/src/routes/(console)/project-[region]-[project]/auth/security/updateSessionAlerts.svelte
index 447e2caa0..ba8af9ec9 100644
--- a/src/routes/(console)/project-[region]-[project]/auth/security/updateSessionAlerts.svelte
+++ b/src/routes/(console)/project-[region]-[project]/auth/security/updateSessionAlerts.svelte
@@ -13,7 +13,10 @@
 
     async function updateSessionAlerts() {
         try {
-            await sdk.forConsole.projects.updateSessionAlerts($project.$id, authSessionAlerts);
+            await sdk.forConsole.projects.updateSessionAlerts({
+                projectId: $project.$id,
+                alerts: authSessionAlerts
+            });
             await invalidate(Dependencies.PROJECT);
             addNotification({
                 type: 'success',
diff --git a/src/routes/(console)/project-[region]-[project]/auth/security/updateSessionLength.svelte b/src/routes/(console)/project-[region]-[project]/auth/security/updateSessionLength.svelte
index 2d6eb04ba..807adba3f 100644
--- a/src/routes/(console)/project-[region]-[project]/auth/security/updateSessionLength.svelte
+++ b/src/routes/(console)/project-[region]-[project]/auth/security/updateSessionLength.svelte
@@ -17,7 +17,10 @@
 
     async function updateSessionLength() {
         try {
-            await sdk.forConsole.projects.updateAuthDuration(project.$id, $baseValue);
+            await sdk.forConsole.projects.updateAuthDuration({
+                projectId: project.$id,
+                duration: $baseValue
+            });
             await invalidate(Dependencies.PROJECT);
 
             addNotification({
diff --git a/src/routes/(console)/project-[region]-[project]/auth/security/updateSessionsLimit.svelte b/src/routes/(console)/project-[region]-[project]/auth/security/updateSessionsLimit.svelte
index 06ef31dd0..eb0bb97c8 100644
--- a/src/routes/(console)/project-[region]-[project]/auth/security/updateSessionsLimit.svelte
+++ b/src/routes/(console)/project-[region]-[project]/auth/security/updateSessionsLimit.svelte
@@ -13,7 +13,10 @@
 
     async function updateSessionsLimit() {
         try {
-            await sdk.forConsole.projects.updateAuthSessionsLimit($project.$id, maxSessions);
+            await sdk.forConsole.projects.updateAuthSessionsLimit({
+                projectId: $project.$id,
+                limit: maxSessions
+            });
             await invalidate(Dependencies.PROJECT);
 
             addNotification({
diff --git a/src/routes/(console)/project-[region]-[project]/auth/security/updateUsersLimit.svelte b/src/routes/(console)/project-[region]-[project]/auth/security/updateUsersLimit.svelte
index fc16a6a5d..a319a1a08 100644
--- a/src/routes/(console)/project-[region]-[project]/auth/security/updateUsersLimit.svelte
+++ b/src/routes/(console)/project-[region]-[project]/auth/security/updateUsersLimit.svelte
@@ -28,7 +28,10 @@
 
     async function updateLimit() {
         try {
-            await sdk.forConsole.projects.updateAuthLimit($project?.$id, isLimited ? newLimit : 0);
+            await sdk.forConsole.projects.updateAuthLimit({
+                projectId: $project?.$id,
+                limit: isLimited ? newLimit : 0
+            });
             await invalidate(Dependencies.PROJECT);
             addNotification({
                 type: 'success',
diff --git a/src/routes/(console)/project-[region]-[project]/auth/settings/+page.svelte b/src/routes/(console)/project-[region]-[project]/auth/settings/+page.svelte
index 4a9eceee2..5dbfdb576 100644
--- a/src/routes/(console)/project-[region]-[project]/auth/settings/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/auth/settings/+page.svelte
@@ -23,7 +23,11 @@
 
     async function authUpdate(box: AuthMethod) {
         try {
-            await sdk.forConsole.projects.updateAuthStatus(projectId, box.method, box.value);
+            await sdk.forConsole.projects.updateAuthStatus({
+                projectId,
+                method: box.method,
+                status: box.value
+            });
             addNotification({
                 type: 'success',
                 message: `${box.label} authentication has been updated`
diff --git a/src/routes/(console)/project-[region]-[project]/auth/teams/+page.ts b/src/routes/(console)/project-[region]-[project]/auth/teams/+page.ts
index 3f9e01793..5f3bd1418 100644
--- a/src/routes/(console)/project-[region]-[project]/auth/teams/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/auth/teams/+page.ts
@@ -15,8 +15,9 @@ export const load: PageLoad = async ({ url, route, params }) => {
         limit,
         search,
         page,
-        teams: await sdk
-            .forProject(params.region, params.project)
-            .teams.list([Query.limit(limit), Query.offset(offset), Query.orderDesc('')], search)
+        teams: await sdk.forProject(params.region, params.project).teams.list({
+            queries: [Query.limit(limit), Query.offset(offset), Query.orderDesc('')],
+            search
+        })
     };
 };
diff --git a/src/routes/(console)/project-[region]-[project]/auth/teams/team-[team]/+layout.ts b/src/routes/(console)/project-[region]-[project]/auth/teams/team-[team]/+layout.ts
index 6bd3c93ac..5dd8c4fa9 100644
--- a/src/routes/(console)/project-[region]-[project]/auth/teams/team-[team]/+layout.ts
+++ b/src/routes/(console)/project-[region]-[project]/auth/teams/team-[team]/+layout.ts
@@ -9,6 +9,6 @@ export const load: LayoutLoad = async ({ params, depends }) => {
     return {
         header: Header,
         breadcrumbs: Breadcrumbs,
-        team: await sdk.forProject(params.region, params.project).teams.get(params.team)
+        team: await sdk.forProject(params.region, params.project).teams.get({ teamId: params.team })
     };
 };
diff --git a/src/routes/(console)/project-[region]-[project]/auth/teams/team-[team]/activity/+page.ts b/src/routes/(console)/project-[region]-[project]/auth/teams/team-[team]/activity/+page.ts
index 7b33b57e8..be4e88ea2 100644
--- a/src/routes/(console)/project-[region]-[project]/auth/teams/team-[team]/activity/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/auth/teams/team-[team]/activity/+page.ts
@@ -14,6 +14,9 @@ export const load: PageLoad = async ({ params, url, route }) => {
         limit,
         logs: await sdk
             .forProject(params.region, params.project)
-            .teams.listLogs(params.team, [Query.limit(limit), Query.offset(offset)])
+            .teams.listLogs({
+                teamId: params.team,
+                queries: [Query.limit(limit), Query.offset(offset)]
+            })
     };
 };
diff --git a/src/routes/(console)/project-[region]-[project]/auth/teams/team-[team]/deleteMembership.svelte b/src/routes/(console)/project-[region]-[project]/auth/teams/team-[team]/deleteMembership.svelte
index 9aa4e6685..0d2cb25e2 100644
--- a/src/routes/(console)/project-[region]-[project]/auth/teams/team-[team]/deleteMembership.svelte
+++ b/src/routes/(console)/project-[region]-[project]/auth/teams/team-[team]/deleteMembership.svelte
@@ -20,7 +20,10 @@
         try {
             await sdk
                 .forProject(page.params.region, page.params.project)
-                .teams.deleteMembership(selectedMembership.teamId, selectedMembership.$id);
+                .teams.deleteMembership({
+                    teamId: selectedMembership.teamId,
+                    membershipId: selectedMembership.$id
+                });
             showDelete = false;
             dispatch('deleted');
             trackEvent(Submit.MemberDelete);
diff --git a/src/routes/(console)/project-[region]-[project]/auth/teams/team-[team]/deleteTeam.svelte b/src/routes/(console)/project-[region]-[project]/auth/teams/team-[team]/deleteTeam.svelte
index ff875ffc5..d50357374 100644
--- a/src/routes/(console)/project-[region]-[project]/auth/teams/team-[team]/deleteTeam.svelte
+++ b/src/routes/(console)/project-[region]-[project]/auth/teams/team-[team]/deleteTeam.svelte
@@ -15,7 +15,9 @@
 
     async function deleteTeam() {
         try {
-            await sdk.forProject(page.params.region, page.params.project).teams.delete(team.$id);
+            await sdk.forProject(page.params.region, page.params.project).teams.delete({
+                teamId: team.$id
+            });
             showDelete = false;
             trackEvent(Submit.TeamDelete);
             await goto(`${base}/project-${page.params.region}-${page.params.project}/auth/teams`);
diff --git a/src/routes/(console)/project-[region]-[project]/auth/teams/team-[team]/updateName.svelte b/src/routes/(console)/project-[region]-[project]/auth/teams/team-[team]/updateName.svelte
index 7e1e63d01..7bd7e3653 100644
--- a/src/routes/(console)/project-[region]-[project]/auth/teams/team-[team]/updateName.svelte
+++ b/src/routes/(console)/project-[region]-[project]/auth/teams/team-[team]/updateName.svelte
@@ -20,7 +20,7 @@
         try {
             await sdk
                 .forProject(page.params.region, page.params.project)
-                .teams.updateName(page.params.team, teamName);
+                .teams.updateName({ teamId: page.params.team, name: teamName });
             await invalidate(Dependencies.TEAM);
             addNotification({
                 message: 'Name has been updated',
diff --git a/src/routes/(console)/project-[region]-[project]/auth/teams/team-[team]/updatePrefs.svelte b/src/routes/(console)/project-[region]-[project]/auth/teams/team-[team]/updatePrefs.svelte
index 0bdac50dd..8c33d0230 100644
--- a/src/routes/(console)/project-[region]-[project]/auth/teams/team-[team]/updatePrefs.svelte
+++ b/src/routes/(console)/project-[region]-[project]/auth/teams/team-[team]/updatePrefs.svelte
@@ -40,7 +40,7 @@
 
             await sdk
                 .forProject(page.params.region, page.params.project)
-                .teams.updatePrefs($team.$id, updatedPrefs);
+                .teams.updatePrefs({ teamId: $team.$id, prefs: updatedPrefs });
             await invalidate(Dependencies.TEAM);
             arePrefsDisabled = true;
 
diff --git a/src/routes/(console)/project-[region]-[project]/auth/user-[user]/+layout.ts b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/+layout.ts
index 4a712271d..e3f091805 100644
--- a/src/routes/(console)/project-[region]-[project]/auth/user-[user]/+layout.ts
+++ b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/+layout.ts
@@ -8,8 +8,8 @@ export const load: LayoutLoad = async ({ params, depends }) => {
     depends(Dependencies.USER);
 
     const [user, userFactors] = await Promise.all([
-        sdk.forProject(params.region, params.project).users.get(params.user),
-        sdk.forProject(params.region, params.project).users.listMfaFactors(params.user)
+        sdk.forProject(params.region, params.project).users.get({ userId: params.user }),
+        sdk.forProject(params.region, params.project).users.listMfaFactors({ userId: params.user })
     ]);
 
     return {
diff --git a/src/routes/(console)/project-[region]-[project]/auth/user-[user]/activity/+page.ts b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/activity/+page.ts
index 29b004821..c2c1364b2 100644
--- a/src/routes/(console)/project-[region]-[project]/auth/user-[user]/activity/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/activity/+page.ts
@@ -13,6 +13,9 @@ export const load: PageLoad = async ({ params, url, route }) => {
         limit,
         logs: await sdk
             .forProject(params.region, params.project)
-            .users.listLogs(params.user, [Query.limit(limit), Query.offset(offset)])
+            .users.listLogs({
+                userId: params.user,
+                queries: [Query.limit(limit), Query.offset(offset)]
+            })
     };
 };
diff --git a/src/routes/(console)/project-[region]-[project]/auth/user-[user]/deleteAllSessions.svelte b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/deleteAllSessions.svelte
index d49156c53..1db6f5c9c 100644
--- a/src/routes/(console)/project-[region]-[project]/auth/user-[user]/deleteAllSessions.svelte
+++ b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/deleteAllSessions.svelte
@@ -16,7 +16,7 @@
         try {
             await sdk
                 .forProject(page.params.region, page.params.project)
-                .users.deleteSessions(page.params.user);
+                .users.deleteSessions({ userId: page.params.user });
             await invalidate(Dependencies.SESSIONS);
             showDeleteAll = false;
             addNotification({
diff --git a/src/routes/(console)/project-[region]-[project]/auth/user-[user]/deleteMembership.svelte b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/deleteMembership.svelte
index 88d2ebc1b..dada29ef5 100644
--- a/src/routes/(console)/project-[region]-[project]/auth/user-[user]/deleteMembership.svelte
+++ b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/deleteMembership.svelte
@@ -17,9 +17,10 @@
 
     async function deleteMembership() {
         try {
-            await sdk
-                .forProject(page.params.region, page.params.project)
-                .teams.deleteMembership(selectedMembership.teamId, selectedMembership.$id);
+            await sdk.forProject(page.params.region, page.params.project).teams.deleteMembership({
+                teamId: selectedMembership.teamId,
+                membershipId: selectedMembership.$id
+            });
             await invalidate(Dependencies.MEMBERSHIPS);
             showDelete = false;
             addNotification({
diff --git a/src/routes/(console)/project-[region]-[project]/auth/user-[user]/deleteMfa.svelte b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/deleteMfa.svelte
index e27a832e2..d238740bd 100644
--- a/src/routes/(console)/project-[region]-[project]/auth/user-[user]/deleteMfa.svelte
+++ b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/deleteMfa.svelte
@@ -17,7 +17,7 @@
         try {
             await sdk
                 .forProject(page.params.region, page.params.project)
-                .users.deleteMfaAuthenticator($user.$id, AuthenticatorType.Totp);
+                .users.deleteMfaAuthenticator({ userId: $user.$id, type: AuthenticatorType.Totp });
             await invalidate(Dependencies.USER);
             showDelete = false;
             addNotification({
diff --git a/src/routes/(console)/project-[region]-[project]/auth/user-[user]/deleteSession.svelte b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/deleteSession.svelte
index 808e8d46a..f84887778 100644
--- a/src/routes/(console)/project-[region]-[project]/auth/user-[user]/deleteSession.svelte
+++ b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/deleteSession.svelte
@@ -15,7 +15,7 @@
         try {
             await sdk
                 .forProject(page.params.region, page.params.project)
-                .users.deleteSession(page.params.user, selectedSessionId);
+                .users.deleteSession({ userId: page.params.user, sessionId: selectedSessionId });
             await invalidate(Dependencies.SESSIONS);
             showDelete = false;
             addNotification({
diff --git a/src/routes/(console)/project-[region]-[project]/auth/user-[user]/deleteUser.svelte b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/deleteUser.svelte
index 8c549865f..043cd64ac 100644
--- a/src/routes/(console)/project-[region]-[project]/auth/user-[user]/deleteUser.svelte
+++ b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/deleteUser.svelte
@@ -14,7 +14,9 @@
     let error: string;
     const deleteUser = async () => {
         try {
-            await sdk.forProject(page.params.region, page.params.project).users.delete($user.$id);
+            await sdk
+                .forProject(page.params.region, page.params.project)
+                .users.delete({ userId: $user.$id });
             showDelete = false;
             addNotification({
                 type: 'success',
diff --git a/src/routes/(console)/project-[region]-[project]/auth/user-[user]/identities/table.svelte b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/identities/table.svelte
index e48b29b72..812980fb7 100644
--- a/src/routes/(console)/project-[region]-[project]/auth/user-[user]/identities/table.svelte
+++ b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/identities/table.svelte
@@ -26,7 +26,9 @@
         showDelete = false;
 
         const promises = selectedIds.map((id) =>
-            sdk.forProject(page.params.region, page.params.project).users.deleteIdentity(id)
+            sdk
+                .forProject(page.params.region, page.params.project)
+                .users.deleteIdentity({ identityId: id })
         );
 
         try {
diff --git a/src/routes/(console)/project-[region]-[project]/auth/user-[user]/memberships/+page.ts b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/memberships/+page.ts
index 6aa400532..a1be3c971 100644
--- a/src/routes/(console)/project-[region]-[project]/auth/user-[user]/memberships/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/memberships/+page.ts
@@ -7,6 +7,6 @@ export const load: PageLoad = async ({ params }) => {
         localeCodes: codes.localeCodes,
         memberships: await sdk
             .forProject(params.region, params.project)
-            .users.listMemberships(params.user)
+            .users.listMemberships({ userId: params.user })
     };
 };
diff --git a/src/routes/(console)/project-[region]-[project]/auth/user-[user]/sessions/+page.svelte b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/sessions/+page.svelte
index f39e39bca..081b27097 100644
--- a/src/routes/(console)/project-[region]-[project]/auth/user-[user]/sessions/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/sessions/+page.svelte
@@ -28,7 +28,7 @@
         const code = clientCode.toLowerCase();
         if (!isValueOfStringEnum(Browser, code)) return '';
 
-        return sdk.forConsole.avatars.getBrowser(code, 40, 40);
+        return sdk.forConsole.avatars.getBrowser({ code, width: 40, height: 40 });
     }
 </script>
 
diff --git a/src/routes/(console)/project-[region]-[project]/auth/user-[user]/sessions/+page.ts b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/sessions/+page.ts
index 9d69ecb88..36690f58e 100644
--- a/src/routes/(console)/project-[region]-[project]/auth/user-[user]/sessions/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/sessions/+page.ts
@@ -8,6 +8,6 @@ export const load: PageLoad = async ({ params, depends }) => {
     return {
         sessions: await sdk
             .forProject(params.region, params.project)
-            .users.listSessions(params.user)
+            .users.listSessions({ userId: params.user })
     };
 };
diff --git a/src/routes/(console)/project-[region]-[project]/auth/user-[user]/targets/+page.ts b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/targets/+page.ts
index c3dab9c6a..54f0ece1d 100644
--- a/src/routes/(console)/project-[region]-[project]/auth/user-[user]/targets/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/targets/+page.ts
@@ -16,14 +16,15 @@ export const load: PageLoad = async ({ params, url, route, depends }) => {
     const parsedQueries = queryParamToMap(query || '[]');
     queries.set(parsedQueries);
 
-    const targets = await sdk
-        .forProject(params.region, params.project)
-        .users.listTargets(params.user, [
+    const targets = await sdk.forProject(params.region, params.project).users.listTargets({
+        userId: params.user,
+        queries: [
             Query.limit(limit),
             Query.offset(offset),
             Query.orderDesc(''),
             ...parsedQueries.values()
-        ]);
+        ]
+    });
 
     const promisesById: Record<string, Promise<Models.Provider>> = {};
     targets.targets.forEach((target) => {
diff --git a/src/routes/(console)/project-[region]-[project]/auth/user-[user]/targets/table.svelte b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/targets/table.svelte
index 88bb909a5..48f88f76f 100644
--- a/src/routes/(console)/project-[region]-[project]/auth/user-[user]/targets/table.svelte
+++ b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/targets/table.svelte
@@ -27,7 +27,7 @@
         const promises = selectedIds.map((id) =>
             sdk
                 .forProject(page.params.region, page.params.project)
-                .users.deleteTarget(page.params.user, id)
+                .users.deleteTarget({ userId: page.params.user, targetId: id })
         );
 
         try {
diff --git a/src/routes/(console)/project-[region]-[project]/auth/user-[user]/updateEmail.svelte b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/updateEmail.svelte
index 60be6fc0e..9d95c356c 100644
--- a/src/routes/(console)/project-[region]-[project]/auth/user-[user]/updateEmail.svelte
+++ b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/updateEmail.svelte
@@ -18,9 +18,10 @@
 
     async function updateEmail() {
         try {
-            await sdk
-                .forProject(page.params.region, page.params.project)
-                .users.updateEmail($user.$id, userEmail);
+            await sdk.forProject(page.params.region, page.params.project).users.updateEmail({
+                userId: $user.$id,
+                email: userEmail
+            });
             await invalidate(Dependencies.USER);
             addNotification({
                 message: 'Email has been updated',
diff --git a/src/routes/(console)/project-[region]-[project]/auth/user-[user]/updateLabels.svelte b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/updateLabels.svelte
index 7f9c2b2ab..a7ba203b2 100644
--- a/src/routes/(console)/project-[region]-[project]/auth/user-[user]/updateLabels.svelte
+++ b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/updateLabels.svelte
@@ -26,7 +26,7 @@
         try {
             await sdk
                 .forProject(page.params.region, page.params.project)
-                .users.updateLabels($user.$id, labels);
+                .users.updateLabels({ userId: $user.$id, labels });
             await invalidate(Dependencies.USER);
             isDisabled = true;
 
diff --git a/src/routes/(console)/project-[region]-[project]/auth/user-[user]/updateMfa.svelte b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/updateMfa.svelte
index b94606987..6d5cd1cea 100644
--- a/src/routes/(console)/project-[region]-[project]/auth/user-[user]/updateMfa.svelte
+++ b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/updateMfa.svelte
@@ -24,7 +24,7 @@
         try {
             await sdk
                 .forProject(page.params.region, page.params.project)
-                .users.updateMfa($user.$id, userMfa);
+                .users.updateMfa({ userId: $user.$id, mfa: userMfa });
             await invalidate(Dependencies.USER);
             addNotification({
                 message: `Multi-factor authentication has been ${userMfa ? 'enabled' : 'disabled'}`,
diff --git a/src/routes/(console)/project-[region]-[project]/auth/user-[user]/updateName.svelte b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/updateName.svelte
index fdf428105..8632ab1d8 100644
--- a/src/routes/(console)/project-[region]-[project]/auth/user-[user]/updateName.svelte
+++ b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/updateName.svelte
@@ -17,9 +17,10 @@
 
     async function updateName() {
         try {
-            await sdk
-                .forProject(page.params.region, page.params.project)
-                .users.updateName($user.$id, userName);
+            await sdk.forProject(page.params.region, page.params.project).users.updateName({
+                userId: $user.$id,
+                name: userName
+            });
             await invalidate(Dependencies.USER);
             addNotification({
                 message: 'Name has been updated',
diff --git a/src/routes/(console)/project-[region]-[project]/auth/user-[user]/updatePassword.svelte b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/updatePassword.svelte
index 159c94186..263144602 100644
--- a/src/routes/(console)/project-[region]-[project]/auth/user-[user]/updatePassword.svelte
+++ b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/updatePassword.svelte
@@ -13,7 +13,7 @@
         try {
             await sdk
                 .forProject(page.params.region, page.params.project)
-                .users.updatePassword($user.$id, newPassword);
+                .users.updatePassword({ userId: $user.$id, password: newPassword });
             newPassword = null;
             addNotification({
                 message: 'Password has been updated',
diff --git a/src/routes/(console)/project-[region]-[project]/auth/user-[user]/updatePhone.svelte b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/updatePhone.svelte
index 567e1e9a3..1906d2441 100644
--- a/src/routes/(console)/project-[region]-[project]/auth/user-[user]/updatePhone.svelte
+++ b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/updatePhone.svelte
@@ -17,9 +17,10 @@
 
     async function updatePhone() {
         try {
-            await sdk
-                .forProject(page.params.region, page.params.project)
-                .users.updatePhone($user.$id, userPhone);
+            await sdk.forProject(page.params.region, page.params.project).users.updatePhone({
+                userId: $user.$id,
+                number: userPhone
+            });
             await invalidate(Dependencies.USER);
             addNotification({
                 message: 'Phone has been updated',
diff --git a/src/routes/(console)/project-[region]-[project]/auth/user-[user]/updatePrefs.svelte b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/updatePrefs.svelte
index 09084666c..4cc1435c8 100644
--- a/src/routes/(console)/project-[region]-[project]/auth/user-[user]/updatePrefs.svelte
+++ b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/updatePrefs.svelte
@@ -36,7 +36,7 @@
 
             await sdk
                 .forProject(page.params.region, page.params.project)
-                .users.updatePrefs($user.$id, updatedPrefs);
+                .users.updatePrefs({ userId: $user.$id, prefs: updatedPrefs });
             await invalidate(Dependencies.USER);
             arePrefsDisabled = true;
 
diff --git a/src/routes/(console)/project-[region]-[project]/auth/user-[user]/updateStatus.svelte b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/updateStatus.svelte
index 229109f94..ffbd35e64 100644
--- a/src/routes/(console)/project-[region]-[project]/auth/user-[user]/updateStatus.svelte
+++ b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/updateStatus.svelte
@@ -20,7 +20,10 @@
         try {
             await sdk
                 .forProject(page.params.region, page.params.project)
-                .users.updateEmailVerification($user.$id, !$user.emailVerification);
+                .users.updateEmailVerification({
+                    userId: $user.$id,
+                    emailVerification: !$user.emailVerification
+                });
             await invalidate(Dependencies.USER);
             addNotification({
                 message: `${$user.name || $user.email || $user.phone || 'The account'} has been ${
@@ -42,7 +45,10 @@
         try {
             await sdk
                 .forProject(page.params.region, page.params.project)
-                .users.updatePhoneVerification($user.$id, !$user.phoneVerification);
+                .users.updatePhoneVerification({
+                    userId: $user.$id,
+                    phoneVerification: !$user.phoneVerification
+                });
             await invalidate(Dependencies.USER);
             addNotification({
                 message: `${$user.name || $user.email || $user.phone || 'The account'} has been ${
@@ -63,7 +69,7 @@
         try {
             await sdk
                 .forProject(page.params.region, page.params.project)
-                .users.updateStatus($user.$id, !$user.status);
+                .users.updateStatus({ userId: $user.$id, status: !$user.status });
             await invalidate(Dependencies.USER);
             addNotification({
                 message: `${$user.name || $user.email || $user.phone || 'The account'} has been ${
diff --git a/src/routes/(console)/project-[region]-[project]/databases/+page.ts b/src/routes/(console)/project-[region]-[project]/databases/+page.ts
index 7f336a173..fcb828ff8 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/databases/+page.ts
@@ -52,7 +52,7 @@ async function fetchDatabasesAndBackups(
 
     const projectSDK = sdk.forProject(params.region, params.project);
 
-    const databases = await projectSDK.tablesDb.list({
+    const databases = await projectSDK.tablesDB.list({
         queries: [Query.limit(limit), Query.offset(offset), Query.orderDesc('$createdAt')],
         search: search || undefined
     });
@@ -62,7 +62,7 @@ async function fetchDatabasesAndBackups(
     await Promise.all(
         // TODO: backend should allow `Query.select` for perf!
         databases.databases.map(async ({ $id }) => {
-            const res = await projectSDK.tablesDb.listTables({
+            const res = await projectSDK.tablesDB.listTables({
                 databaseId: $id,
                 queries: [Query.limit(1), Query.orderDesc('')]
             });
diff --git a/src/routes/(console)/project-[region]-[project]/databases/create.svelte b/src/routes/(console)/project-[region]-[project]/databases/create.svelte
index 5e4e00475..4c4842282 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/create.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/create.svelte
@@ -83,7 +83,7 @@
             const databaseId = id ? id : ID.unique();
             const database = await sdk
                 .forProject(page.params.region, page.params.project)
-                .tablesDb.create({
+                .tablesDB.create({
                     databaseId,
                     name
                 });
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 8e2726f6b..ac97110f0 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
@@ -8,7 +8,7 @@ import SubNavigation from './subNavigation.svelte';
 export const load: LayoutLoad = async ({ params, depends }) => {
     depends(Dependencies.DATABASE);
 
-    const database = await sdk.forProject(params.region, params.project).tablesDb.get({
+    const database = await sdk.forProject(params.region, params.project).tablesDB.get({
         databaseId: params.database
     });
 
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 304e08a71..475ed13fe 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
@@ -13,7 +13,7 @@ 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({
+    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
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/createTable.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/createTable.svelte
index 2c35ef111..4e42ee442 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/createTable.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/createTable.svelte
@@ -29,7 +29,7 @@
         try {
             const table = await sdk
                 .forProject(page.params.region, page.params.project)
-                .tablesDb.createTable({
+                .tablesDB.createTable({
                     databaseId,
                     tableId: id ? id : ID.unique(),
                     name
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 5133dc7d5..47a70368a 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
@@ -47,7 +47,10 @@
 
             tables = await sdk
                 .forProject(page.params.region, page.params.project)
-                .tablesDb.listTables(databaseId, queries);
+                .tablesDB.listTables({
+                    databaseId,
+                    queries
+                });
 
             const tablePromises = tables.tables.map(async (table) => {
                 return {
@@ -69,7 +72,7 @@
         try {
             await sdk
                 .forProject(page.params.region, page.params.project)
-                .tablesDb.delete({ databaseId });
+                .tablesDB.delete({ databaseId });
             showDelete = false;
             addNotification({
                 type: 'success',
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 c3030ea9b..65e6c2b07 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
@@ -28,7 +28,10 @@
     async function loadTableCount() {
         const { total } = await sdk
             .forProject(page.params.region, page.params.project)
-            .tablesDb.listTables($database.$id, [Query.limit(1)]);
+            .tablesDB.listTables({
+                databaseId: $database.$id,
+                queries: [Query.limit(1)]
+            });
         return total;
     }
 
@@ -40,7 +43,7 @@
 
     async function updateName() {
         try {
-            await sdk.forProject(page.params.region, page.params.project).tablesDb.update({
+            await sdk.forProject(page.params.region, page.params.project).tablesDB.update({
                 databaseId: page.params.database,
                 name: databaseName
             });
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/string.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/string.svelte
index 7ca97fa44..04fef2c39 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/string.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/string.svelte
@@ -11,7 +11,7 @@
     ) {
         await sdk
             .forProject(page.params.region, page.params.project)
-            .tablesDb.createStringColumn(
+            .tablesDB.createStringColumn(
                 databaseId,
                 tableId,
                 key,
@@ -29,7 +29,7 @@
     ) {
         await sdk
             .forProject(page.params.region, page.params.project)
-            .tablesDb.updateStringColumn(
+            .tablesDB.updateStringColumn(
                 databaseId,
                 tableId,
                 originalKey,
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 88be28369..26ee8f530 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
@@ -42,7 +42,7 @@
     );
 
     async function loadTables() {
-        tables = await sdk.forProject(region, project).tablesDb.listTables({
+        tables = await sdk.forProject(region, project).tablesDB.listTables({
             databaseId: databaseId,
             queries: [Query.orderDesc(''), Query.limit(100)]
         });
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 d1670e2a1..48776f44a 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
@@ -273,7 +273,7 @@
 
             rowIds = ids;
 
-            await sdk.forProject(page.params.region, page.params.project).tablesDb.createRows({
+            await sdk.forProject(page.params.region, page.params.project).tablesDB.createRows({
                 databaseId: page.params.database,
                 tableId: page.params.table,
                 rows
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 675da6e3a..2a34aa22f 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
@@ -10,7 +10,7 @@ export const load: LayoutLoad = async ({ params, depends }) => {
     return {
         header: Header,
         breadcrumbs: Breadcrumbs,
-        table: await sdk.forProject(params.region, params.project).tablesDb.getTable({
+        table: await sdk.forProject(params.region, params.project).tablesDB.getTable({
             databaseId: params.database,
             tableId: params.table
         })
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 1c5509cf2..aa0de01a2 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
@@ -30,7 +30,7 @@ export const load: PageLoad = async ({ params, depends, url, route, parent }) =>
         view,
         query,
         currentSort,
-        rows: await sdk.forProject(params.region, params.project).tablesDb.listRows({
+        rows: await sdk.forProject(params.region, params.project).tablesDB.listRows({
             databaseId: params.database,
             tableId: params.table,
             queries: buildGridQueries(limit, offset, parsedQueries, table)
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/activity/+page.ts b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/activity/+page.ts
index 5b3ab3668..fd816c1c0 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/activity/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/activity/+page.ts
@@ -12,11 +12,10 @@ export const load: PageLoad = async ({ params, url, route }) => {
     return {
         offset,
         limit,
-        logs: await sdk
-            .forProject(params.region, params.project)
-            .tablesDb.listTableLogs(params.database, params.table, [
-                Query.limit(limit),
-                Query.offset(offset)
-            ])
+        logs: await sdk.forProject(params.region, params.project).tablesDB.listTableLogs({
+            databaseId: params.database,
+            tableId: params.table,
+            queries: [Query.limit(limit), Query.offset(offset)]
+        })
     };
 };
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/boolean.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/boolean.svelte
index 169e3d146..cd09096a4 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/boolean.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/boolean.svelte
@@ -9,16 +9,14 @@
         key: string,
         data: Partial<Models.ColumnBoolean>
     ) {
-        await sdk
-            .forProject(page.params.region, page.params.project)
-            .tablesDb.createBooleanColumn(
-                databaseId,
-                tableId,
-                key,
-                data.required,
-                data.default,
-                data.array
-            );
+        await sdk.forProject(page.params.region, page.params.project).tablesDB.createBooleanColumn({
+            databaseId,
+            tableId,
+            key,
+            required: data.required,
+            xdefault: data.default,
+            array: data.array
+        });
     }
     export async function updateBoolean(
         databaseId: string,
@@ -26,16 +24,14 @@
         data: Partial<Models.ColumnBoolean>,
         originalKey?: string
     ) {
-        await sdk
-            .forProject(page.params.region, page.params.project)
-            .tablesDb.updateBooleanColumn(
-                databaseId,
-                tableId,
-                originalKey,
-                data.required,
-                data.default,
-                data.key !== originalKey ? data.key : undefined
-            );
+        await sdk.forProject(page.params.region, page.params.project).tablesDB.updateBooleanColumn({
+            databaseId,
+            tableId,
+            key: originalKey,
+            required: data.required,
+            xdefault: data.default,
+            newKey: data.key !== originalKey ? data.key : undefined
+        });
     }
 </script>
 
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/datetime.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/datetime.svelte
index 31681062d..c1c3cbeae 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/datetime.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/datetime.svelte
@@ -11,14 +11,14 @@
     ) {
         await sdk
             .forProject(page.params.region, page.params.project)
-            .tablesDb.createDatetimeColumn(
+            .tablesDB.createDatetimeColumn({
                 databaseId,
                 tableId,
                 key,
-                data.required,
-                data.default,
-                data.array
-            );
+                required: data.required,
+                xdefault: data.default,
+                array: data.array
+            });
     }
 
     export async function updateDatetime(
@@ -29,14 +29,14 @@
     ) {
         await sdk
             .forProject(page.params.region, page.params.project)
-            .tablesDb.updateDatetimeColumn(
+            .tablesDB.updateDatetimeColumn({
                 databaseId,
                 tableId,
-                originalKey,
-                data.required,
-                data.default,
-                data.key !== originalKey ? data.key : undefined
-            );
+                key: originalKey,
+                required: data.required,
+                xdefault: data.default,
+                newKey: data.key !== originalKey ? data.key : undefined
+            });
     }
 </script>
 
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 5e498e5fd..190c7ba81 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
@@ -45,7 +45,7 @@
 
             await Promise.all(
                 selectedKeys.map((key) =>
-                    client.tablesDb.deleteColumn({
+                    client.tablesDB.deleteColumn({
                         databaseId: page.params.database,
                         tableId: page.params.table,
                         key
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/email.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/email.svelte
index 138e4261d..c3f7a0f74 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/email.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/email.svelte
@@ -9,16 +9,14 @@
         key: string,
         data: Partial<Models.ColumnEmail>
     ) {
-        await sdk
-            .forProject(page.params.region, page.params.project)
-            .tablesDb.createEmailColumn(
-                databaseId,
-                tableId,
-                key,
-                data.required,
-                data.default,
-                data.array
-            );
+        await sdk.forProject(page.params.region, page.params.project).tablesDB.createEmailColumn({
+            databaseId,
+            tableId,
+            key,
+            required: data.required,
+            xdefault: data.default,
+            array: data.array
+        });
     }
 
     export async function updateEmail(
@@ -27,16 +25,14 @@
         data: Partial<Models.ColumnEmail>,
         originalKey?: string
     ) {
-        await sdk
-            .forProject(page.params.region, page.params.project)
-            .tablesDb.updateEmailColumn(
-                databaseId,
-                tableId,
-                originalKey,
-                data.required,
-                data.default,
-                data.key !== originalKey ? data.key : undefined
-            );
+        await sdk.forProject(page.params.region, page.params.project).tablesDB.updateEmailColumn({
+            databaseId,
+            tableId,
+            key: originalKey,
+            required: data.required,
+            xdefault: data.default,
+            newKey: data.key !== originalKey ? data.key : undefined
+        });
     }
 </script>
 
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/enum.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/enum.svelte
index b5e1aa8d1..51c7f24e3 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/enum.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/enum.svelte
@@ -9,17 +9,15 @@
         key: string,
         data: Partial<Models.ColumnEnum>
     ) {
-        await sdk
-            .forProject(page.params.region, page.params.project)
-            .tablesDb.createEnumColumn(
-                databaseId,
-                tableId,
-                key,
-                data.elements,
-                data.required,
-                data.default,
-                data.array
-            );
+        await sdk.forProject(page.params.region, page.params.project).tablesDB.createEnumColumn({
+            databaseId,
+            tableId,
+            key,
+            elements: data.elements,
+            required: data.required,
+            xdefault: data.default,
+            array: data.array
+        });
     }
 
     export async function updateEnum(
@@ -28,17 +26,15 @@
         data: Partial<Models.ColumnEnum>,
         originalKey?: string
     ) {
-        await sdk
-            .forProject(page.params.region, page.params.project)
-            .tablesDb.updateEnumColumn(
-                databaseId,
-                tableId,
-                originalKey,
-                data.elements,
-                data.required,
-                data.default,
-                data.key !== originalKey ? data.key : undefined
-            );
+        await sdk.forProject(page.params.region, page.params.project).tablesDB.updateEnumColumn({
+            databaseId,
+            tableId,
+            key: originalKey,
+            elements: data.elements,
+            required: data.required,
+            xdefault: data.default,
+            newKey: data.key !== originalKey ? data.key : undefined
+        });
     }
 </script>
 
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/float.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/float.svelte
index 33026cab5..cae8a573f 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/float.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/float.svelte
@@ -9,18 +9,16 @@
         key: string,
         data: Partial<Models.ColumnFloat>
     ) {
-        await sdk
-            .forProject(page.params.region, page.params.project)
-            .tablesDb.createFloatColumn(
-                databaseId,
-                tableId,
-                key,
-                data.required,
-                data.min,
-                data.max,
-                data.default,
-                data.array
-            );
+        await sdk.forProject(page.params.region, page.params.project).tablesDB.createFloatColumn({
+            databaseId,
+            tableId,
+            key,
+            required: data.required,
+            min: data.min,
+            max: data.max,
+            xdefault: data.default,
+            array: data.array
+        });
     }
 
     export async function updateFloat(
@@ -29,18 +27,16 @@
         data: Partial<Models.ColumnFloat>,
         originalKey?: string
     ) {
-        await sdk
-            .forProject(page.params.region, page.params.project)
-            .tablesDb.updateFloatColumn(
-                databaseId,
-                tableId,
-                originalKey,
-                data.required,
-                data.default,
-                data.min,
-                data.max,
-                data.key !== originalKey ? data.key : undefined
-            );
+        await sdk.forProject(page.params.region, page.params.project).tablesDB.updateFloatColumn({
+            databaseId,
+            tableId,
+            key: originalKey,
+            required: data.required,
+            xdefault: data.default,
+            min: data.min,
+            max: data.max,
+            newKey: data.key !== originalKey ? data.key : undefined
+        });
     }
 </script>
 
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/integer.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/integer.svelte
index 94908c1ac..74f9e2aa9 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/integer.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/integer.svelte
@@ -9,18 +9,16 @@
         key: string,
         data: Partial<Models.ColumnInteger>
     ) {
-        await sdk
-            .forProject(page.params.region, page.params.project)
-            .tablesDb.createIntegerColumn(
-                databaseId,
-                tableId,
-                key,
-                data.required,
-                data.min,
-                data.max,
-                data.default,
-                data.array
-            );
+        await sdk.forProject(page.params.region, page.params.project).tablesDB.createIntegerColumn({
+            databaseId,
+            tableId,
+            key,
+            required: data.required,
+            min: data.min,
+            max: data.max,
+            xdefault: data.default,
+            array: data.array
+        });
     }
 
     export async function updateInteger(
@@ -29,18 +27,16 @@
         data: Partial<Models.ColumnInteger>,
         originalKey?: string
     ) {
-        await sdk
-            .forProject(page.params.region, page.params.project)
-            .tablesDb.updateIntegerColumn(
-                databaseId,
-                tableId,
-                originalKey,
-                data.required,
-                data.default,
-                Math.abs(data.min) > Number.MAX_SAFE_INTEGER ? undefined : data.min,
-                Math.abs(data.max) > Number.MAX_SAFE_INTEGER ? undefined : data.max,
-                data.key !== originalKey ? data.key : undefined
-            );
+        await sdk.forProject(page.params.region, page.params.project).tablesDB.updateIntegerColumn({
+            databaseId,
+            tableId,
+            key: originalKey,
+            required: data.required,
+            xdefault: data.default,
+            min: Math.abs(data.min) > Number.MAX_SAFE_INTEGER ? undefined : data.min,
+            max: Math.abs(data.max) > Number.MAX_SAFE_INTEGER ? undefined : data.max,
+            newKey: data.key !== originalKey ? data.key : undefined
+        });
     }
 </script>
 
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/ip.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/ip.svelte
index c974a6b08..b73411ffa 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/ip.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/ip.svelte
@@ -9,16 +9,14 @@
         key: string,
         data: Partial<Models.ColumnIp>
     ) {
-        await sdk
-            .forProject(page.params.region, page.params.project)
-            .tablesDb.createIpColumn(
-                databaseId,
-                tableId,
-                key,
-                data.required,
-                data.default,
-                data.array
-            );
+        await sdk.forProject(page.params.region, page.params.project).tablesDB.createIpColumn({
+            databaseId,
+            tableId,
+            key,
+            required: data.required,
+            xdefault: data.default,
+            array: data.array
+        });
     }
     export async function updateIp(
         databaseId: string,
@@ -26,16 +24,14 @@
         data: Partial<Models.ColumnIp>,
         originalKey?: string
     ) {
-        await sdk
-            .forProject(page.params.region, page.params.project)
-            .tablesDb.updateIpColumn(
-                databaseId,
-                tableId,
-                originalKey,
-                data.required,
-                data.default,
-                data.key !== originalKey ? data.key : undefined
-            );
+        await sdk.forProject(page.params.region, page.params.project).tablesDB.updateIpColumn({
+            databaseId,
+            tableId,
+            key: originalKey,
+            required: data.required,
+            xdefault: data.default,
+            newKey: data.key !== originalKey ? data.key : undefined
+        });
     }
 </script>
 
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 d564584fe..195a640d1 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
@@ -21,16 +21,16 @@
 
         await sdk
             .forProject(page.params.region, page.params.project)
-            .tablesDb.createRelationshipColumn(
+            .tablesDB.createRelationshipColumn({
                 databaseId,
                 tableId,
-                data.relatedTable,
-                data.relationType,
-                data.twoWay,
-                data.key,
-                data.twoWayKey ?? ID.unique(),
-                data.onDelete
-            );
+                relatedTableId: data.relatedTable,
+                type: data.relationType,
+                twoWay: data.twoWay,
+                key: data.key,
+                twoWayKey: data.twoWayKey ?? ID.unique(),
+                onDelete: data.onDelete
+            });
     }
 
     export async function updateRelationship(
@@ -45,13 +45,13 @@
 
         await sdk
             .forProject(page.params.region, page.params.project)
-            .tablesDb.updateRelationshipColumn(
+            .tablesDB.updateRelationshipColumn({
                 databaseId,
                 tableId,
-                originalKey,
-                data.onDelete,
-                data.key !== originalKey ? data.key : undefined
-            );
+                key: originalKey,
+                onDelete: data.onDelete,
+                newKey: data.key !== originalKey ? data.key : undefined
+            });
     }
 </script>
 
@@ -95,9 +95,11 @@
     // Lifecycle hooks
     async function getTables() {
         const queries = [Query.limit(100)];
-        return sdk
-            .forProject(page.params.region, page.params.project)
-            .tablesDb.listTables(databaseId, queries, search);
+        return sdk.forProject(page.params.region, page.params.project).tablesDB.listTables({
+            databaseId,
+            queries,
+            search
+        });
     }
 
     const debouncedFetchTables = debounce(async () => {
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/string.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/string.svelte
index b4cd0349d..cc631ae82 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/string.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/string.svelte
@@ -9,18 +9,16 @@
         key: string,
         data: Partial<Models.ColumnString>
     ) {
-        await sdk
-            .forProject(page.params.region, page.params.project)
-            .tablesDb.createStringColumn(
-                databaseId,
-                tableId,
-                key,
-                data.size,
-                data.required,
-                data.default,
-                data.array,
-                data.encrypt
-            );
+        await sdk.forProject(page.params.region, page.params.project).tablesDB.createStringColumn({
+            databaseId,
+            tableId,
+            key,
+            size: data.size,
+            required: data.required,
+            xdefault: data.default,
+            array: data.array,
+            encrypt: data.encrypt
+        });
     }
     export async function updateString(
         databaseId: string,
@@ -28,17 +26,15 @@
         data: Partial<Models.ColumnString>,
         originalKey?: string
     ) {
-        await sdk
-            .forProject(page.params.region, page.params.project)
-            .tablesDb.updateStringColumn(
-                databaseId,
-                tableId,
-                originalKey,
-                data.required,
-                data.default,
-                data.size,
-                data.key !== originalKey ? data.key : undefined
-            );
+        await sdk.forProject(page.params.region, page.params.project).tablesDB.updateStringColumn({
+            databaseId,
+            tableId,
+            key: originalKey,
+            required: data.required,
+            xdefault: data.default,
+            size: data.size,
+            newKey: data.key !== originalKey ? data.key : undefined
+        });
     }
 </script>
 
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/url.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/url.svelte
index 3a2a68557..bd43e177f 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/url.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/url.svelte
@@ -9,16 +9,14 @@
         key: string,
         data: Partial<Models.ColumnUrl>
     ) {
-        await sdk
-            .forProject(page.params.region, page.params.project)
-            .tablesDb.createUrlColumn(
-                databaseId,
-                tableId,
-                key,
-                data.required,
-                data.default,
-                data.array
-            );
+        await sdk.forProject(page.params.region, page.params.project).tablesDB.createUrlColumn({
+            databaseId,
+            tableId,
+            key,
+            required: data.required,
+            xdefault: data.default,
+            array: data.array
+        });
     }
 
     export async function updateUrl(
@@ -27,16 +25,14 @@
         data: Partial<Models.ColumnUrl>,
         originalKey?: string
     ) {
-        await sdk
-            .forProject(page.params.region, page.params.project)
-            .tablesDb.updateUrlColumn(
-                databaseId,
-                tableId,
-                originalKey,
-                data.required,
-                data.default,
-                data.key !== originalKey ? data.key : undefined
-            );
+        await sdk.forProject(page.params.region, page.params.project).tablesDB.updateUrlColumn({
+            databaseId,
+            tableId,
+            key: originalKey,
+            required: data.required,
+            xdefault: data.default,
+            newKey: data.key !== originalKey ? data.key : undefined
+        });
     }
 </script>
 
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]/table-[table]/indexes/createIndex.svelte
index be71a24d7..5a79122cb 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]/table-[table]/indexes/createIndex.svelte
@@ -86,7 +86,7 @@
         }
 
         try {
-            await sdk.forProject(page.params.region, page.params.project).tablesDb.createIndex({
+            await sdk.forProject(page.params.region, page.params.project).tablesDB.createIndex({
                 databaseId,
                 tableId: $table.$id,
                 key,
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]/table-[table]/indexes/deleteIndex.svelte
index 0ab9f57d4..956bb1b6a 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]/table-[table]/indexes/deleteIndex.svelte
@@ -27,9 +27,11 @@
         try {
             await Promise.all(
                 selectedKeys.map((key) =>
-                    sdk
-                        .forProject(page.params.region, page.params.project)
-                        .tablesDb.deleteIndex(page.params.database, page.params.table, key)
+                    sdk.forProject(page.params.region, page.params.project).tablesDB.deleteIndex({
+                        databaseId: page.params.database,
+                        tableId: page.params.table,
+                        key
+                    })
                 )
             );
             await invalidate(Dependencies.TABLE);
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/rows/activity.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/rows/activity.svelte
index ed12af801..d7d37451f 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/rows/activity.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/rows/activity.svelte
@@ -26,7 +26,7 @@
 
         rowActivityLogs = await sdk
             .forProject(page.params.region, page.params.project)
-            .tablesDb.listRowLogs({
+            .tablesDB.listRowLogs({
                 databaseId: row.$databaseId,
                 tableId: row.$tableId,
                 rowId: row.$id,
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 cfd77969b..67aabd2fb 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
@@ -61,7 +61,7 @@
             ? [Query.select(displayNames), Query.startsWith('$id', search), Query.orderDesc('')]
             : [Query.select(displayNames)];
 
-        return await sdk.forProject(page.params.region, page.params.project).tablesDb.listRows({
+        return await sdk.forProject(page.params.region, page.params.project).tablesDB.listRows({
             databaseId,
             tableId: column.relatedTable,
             queries
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 ebc46bbaf..aec5e8ad4 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
@@ -65,7 +65,7 @@
         isSubmitting = true;
 
         try {
-            await sdk.forProject(page.params.region, page.params.project).tablesDb.createRow({
+            await sdk.forProject(page.params.region, page.params.project).tablesDB.createRow({
                 databaseId: page.params.database,
                 tableId: page.params.table,
                 rowId: $createRow.id ?? ID.unique(),
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 301f023e0..c82c61672 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
@@ -82,7 +82,7 @@
 
     export async function update() {
         try {
-            await sdk.forProject(page.params.region, page.params.project).tablesDb.updateRow({
+            await sdk.forProject(page.params.region, page.params.project).tablesDB.updateRow({
                 databaseId,
                 tableId,
                 rowId: row.$id,
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 2ac5b22a4..eb3f0d653 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
@@ -29,7 +29,7 @@
         try {
             const { $databaseId: databaseId, $tableId: tableId, $id: rowId } = row;
 
-            await sdk.forProject(page.params.region, page.params.project).tablesDb.updateRow({
+            await sdk.forProject(page.params.region, page.params.project).tablesDB.updateRow({
                 databaseId,
                 tableId,
                 rowId,
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 77b0f0a40..e8c604002 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
@@ -37,14 +37,14 @@
         try {
             relatedTable =
                 page.data.tables?.[tableId] ??
-                (await sdk.forProject(page.params.region, page.params.project).tablesDb.getTable({
+                (await sdk.forProject(page.params.region, page.params.project).tablesDB.getTable({
                     databaseId,
                     tableId: tableId
                 }));
 
             fetchedRow = await sdk
                 .forProject(page.params.region, page.params.project)
-                .tablesDb.getRow({
+                .tablesDB.getRow({
                     databaseId,
                     tableId: tableId,
                     rowId: rowId,
@@ -116,7 +116,7 @@
 
     export async function update() {
         try {
-            await sdk.forProject(page.params.region, page.params.project).tablesDb.updateRow({
+            await sdk.forProject(page.params.region, page.params.project).tablesDB.updateRow({
                 databaseId,
                 tableId: relatedTable.$id,
                 rowId: fetchedRow.$id,
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
index a317e00e6..697dd7962 100644
--- 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
@@ -21,7 +21,7 @@
         const databaseId = page.params.database;
 
         try {
-            await sdk.forProject(page.params.region, page.params.project).tablesDb.deleteTable({
+            await sdk.forProject(page.params.region, page.params.project).tablesDB.deleteTable({
                 databaseId,
                 tableId
             });
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
index 09a176104..45ad32ed0 100644
--- 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
@@ -21,7 +21,7 @@
 
     async function updateName() {
         try {
-            await sdk.forProject(page.params.region, page.params.project).tablesDb.updateTable({
+            await sdk.forProject(page.params.region, page.params.project).tablesDB.updateTable({
                 databaseId,
                 tableId: $table.$id,
                 name: tableName,
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
index 8d88ba719..8041cb2c2 100644
--- 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
@@ -25,16 +25,14 @@
 
     async function updatePermissions() {
         try {
-            await sdk
-                .forProject(page.params.region, page.params.project)
-                .tablesDb.updateTable(
-                    databaseId,
-                    $table.$id,
-                    $table.name,
-                    tablePermissions,
-                    $table.rowSecurity,
-                    $table.enabled
-                );
+            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',
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
index 0d88082b6..1b92ad059 100644
--- 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
@@ -20,16 +20,14 @@
 
     async function updateSecurity() {
         try {
-            await sdk
-                .forProject(page.params.region, page.params.project)
-                .tablesDb.updateTable(
-                    databaseId,
-                    $table.$id,
-                    $table.name,
-                    $table.$permissions,
-                    tableRowSecurity,
-                    $table.enabled
-                );
+            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',
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
index 06f85c785..8d91f266e 100644
--- 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
@@ -21,16 +21,14 @@
 
     async function toggleTable() {
         try {
-            await sdk
-                .forProject(page.params.region, page.params.project)
-                .tablesDb.updateTable(
-                    databaseId,
-                    $table.$id,
-                    $table.name,
-                    $table.$permissions,
-                    $table.rowSecurity,
-                    enabled
-                );
+            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`,
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 8f967221b..b68b3138c 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
@@ -339,7 +339,7 @@
         showDelete = false;
         try {
             if (selectedRowForDelete) {
-                await sdk.forProject(page.params.region, page.params.project).tablesDb.deleteRow({
+                await sdk.forProject(page.params.region, page.params.project).tablesDB.deleteRow({
                     databaseId,
                     tableId,
                     rowId: selectedRowForDelete
@@ -355,7 +355,7 @@
                         batches.map((batch) =>
                             sdk
                                 .forProject(page.params.region, page.params.project)
-                                .tablesDb.deleteRows({
+                                .tablesDB.deleteRows({
                                     databaseId,
                                     tableId,
                                     queries: [Query.equal('$id', batch)]
@@ -393,7 +393,7 @@
         showColumnDelete = false;
 
         try {
-            await sdk.forProject(page.params.region, page.params.project).tablesDb.deleteColumn({
+            await sdk.forProject(page.params.region, page.params.project).tablesDB.deleteColumn({
                 databaseId,
                 tableId,
                 key: $databaseColumnSheetOptions.column.key
@@ -522,7 +522,7 @@
             );
 
             // TODO | BUG: related rows still have `system` columns atm!
-            await sdk.forProject(page.params.region, page.params.project).tablesDb.updateRow({
+            await sdk.forProject(page.params.region, page.params.project).tablesDB.updateRow({
                 databaseId,
                 tableId: $table.$id,
                 rowId: row.$id,
@@ -563,7 +563,7 @@
         $paginatedRowsLoading = true;
         const loadedRows = await sdk
             .forProject(page.params.region, page.params.project)
-            .tablesDb.listRows({
+            .tablesDB.listRows({
                 databaseId,
                 tableId,
                 queries: [
@@ -589,7 +589,7 @@
 
             const loadedRows = await sdk
                 .forProject(page.params.region, page.params.project)
-                .tablesDb.listRows({
+                .tablesDB.listRows({
                     databaseId,
                     tableId,
                     queries: [
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/usage/[[period]]/+page.ts b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/usage/[[period]]/+page.ts
index 5f56b5011..0380ffe09 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/usage/[[period]]/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/usage/[[period]]/+page.ts
@@ -8,7 +8,7 @@ export const load: PageLoad = async ({ params }) => {
         ? params.period
         : UsageRange.ThirtyDays;
 
-    return sdk.forProject(params.region, params.project).tablesDb.getTableUsage({
+    return sdk.forProject(params.region, params.project).tablesDB.getTableUsage({
         databaseId: params.database,
         tableId: params.table,
         range: period
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 2561294b5..76334874f 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
@@ -26,7 +26,7 @@
         showDelete = false;
 
         const promises = selectedTables.map((tableId) =>
-            sdk.forProject(page.params.region, page.params.project).tablesDb.deleteTable({
+            sdk.forProject(page.params.region, page.params.project).tablesDB.deleteTable({
                 databaseId,
                 tableId
             })
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/usage/[[period]]/+page.ts b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/usage/[[period]]/+page.ts
index bd946b4d5..d89015e81 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/usage/[[period]]/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/usage/[[period]]/+page.ts
@@ -7,7 +7,7 @@ export const load: PageLoad = async ({ params }) => {
     const period = isValueOfStringEnum(UsageRange, params.period)
         ? params.period
         : UsageRange.ThirtyDays;
-    return sdk.forProject(params.region, params.project).tablesDb.getUsage({
+    return sdk.forProject(params.region, params.project).tablesDB.getUsage({
         databaseId: params.database,
         range: period
     });
diff --git a/src/routes/(console)/project-[region]-[project]/databases/usage/[[period]]/+page.ts b/src/routes/(console)/project-[region]-[project]/databases/usage/[[period]]/+page.ts
index ea6adbd92..de54f4074 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/usage/[[period]]/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/databases/usage/[[period]]/+page.ts
@@ -8,5 +8,5 @@ export const load: PageLoad = async ({ params }) => {
         ? params.period
         : UsageRange.ThirtyDays;
 
-    return sdk.forProject(params.region, params.project).tablesDb.listUsage({ range: period });
+    return sdk.forProject(params.region, params.project).tablesDB.listUsage({ range: period });
 };
diff --git a/src/routes/(console)/project-[region]-[project]/functions/+layout.ts b/src/routes/(console)/project-[region]-[project]/functions/+layout.ts
index 4cc6fe3d9..1afe03dd3 100644
--- a/src/routes/(console)/project-[region]-[project]/functions/+layout.ts
+++ b/src/routes/(console)/project-[region]-[project]/functions/+layout.ts
@@ -10,7 +10,9 @@ export const load: LayoutLoad = async ({ depends, params }) => {
 
     const [runtimesList, installations, specificationsList] = await Promise.all([
         sdk.forProject(params.region, params.project).functions.listRuntimes(),
-        sdk.forProject(params.region, params.project).vcs.listInstallations([Query.limit(100)]),
+        sdk
+            .forProject(params.region, params.project)
+            .vcs.listInstallations({ queries: [Query.limit(100)] }),
         sdk.forProject(params.region, params.project).functions.listSpecifications()
     ]);
 
diff --git a/src/routes/(console)/project-[region]-[project]/functions/create-function/manual/+page.svelte b/src/routes/(console)/project-[region]-[project]/functions/create-function/manual/+page.svelte
index 53020863c..7d3c47d29 100644
--- a/src/routes/(console)/project-[region]-[project]/functions/create-function/manual/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/functions/create-function/manual/+page.svelte
@@ -108,7 +108,11 @@
 
             await sdk
                 .forProject(page.params.region, page.params.project)
-                .functions.createDeployment(func.$id, files[0], true, undefined, undefined);
+                .functions.createDeployment({
+                    functionId: func.$id,
+                    code: files[0],
+                    activate: true
+                });
 
             trackEvent(Submit.FunctionCreate, {
                 source: 'repository',
diff --git a/src/routes/(console)/project-[region]-[project]/functions/create-function/repository-[repository]/+page.ts b/src/routes/(console)/project-[region]-[project]/functions/create-function/repository-[repository]/+page.ts
index 66fc213fa..3877ae8a4 100644
--- a/src/routes/(console)/project-[region]-[project]/functions/create-function/repository-[repository]/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/functions/create-function/repository-[repository]/+page.ts
@@ -3,9 +3,10 @@ import { sdk } from '$lib/stores/sdk';
 export const load = async ({ parent, params, url }) => {
     const { installations, runtimesList, specificationsList } = await parent();
 
-    const repository = await sdk
-        .forProject(params.region, params.project)
-        .vcs.getRepository(url.searchParams.get('installation'), params.repository);
+    const repository = await sdk.forProject(params.region, params.project).vcs.getRepository({
+        installationId: url.searchParams.get('installation'),
+        providerRepositoryId: params.repository
+    });
 
     const installation = installations.installations.find(
         (installation) => installation.$id === url.searchParams.get('installation')
diff --git a/src/routes/(console)/project-[region]-[project]/functions/create-function/template-[template]/+page.ts b/src/routes/(console)/project-[region]-[project]/functions/create-function/template-[template]/+page.ts
index 047a9521c..203b9e4a6 100644
--- a/src/routes/(console)/project-[region]-[project]/functions/create-function/template-[template]/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/functions/create-function/template-[template]/+page.ts
@@ -4,7 +4,7 @@ export const load = async ({ parent, params }) => {
     const { installations, runtimesList, specificationsList } = await parent();
     const template = await sdk
         .forProject(params.region, params.project)
-        .functions.getTemplate(params.template);
+        .functions.getTemplate({ templateId: params.template });
 
     return {
         installations,
diff --git a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/+layout.ts b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/+layout.ts
index bf8d68f8c..459919508 100644
--- a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/+layout.ts
+++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/+layout.ts
@@ -10,18 +10,22 @@ export const load: LayoutLoad = async ({ params, depends }) => {
     depends(Dependencies.FUNCTION);
     depends(Dependencies.DEPLOYMENTS);
 
-    const func = await sdk.forProject(params.region, params.project).functions.get(params.function);
+    const func = await sdk
+        .forProject(params.region, params.project)
+        .functions.get({ functionId: params.function });
 
     //TODO remove rule limit of 1 and display extra rules
     const proxyRuleList = await sdk
         .forProject(params.region, params.project)
-        .proxy.listRules([
-            Query.equal('type', RuleType.DEPLOYMENT),
-            Query.equal('deploymentResourceType', DeploymentResourceType.FUNCTION),
-            Query.equal('deploymentResourceId', params.function),
-            Query.equal('deploymentId', func.deploymentId),
-            Query.limit(1)
-        ]);
+        .proxy.listRules({
+            queries: [
+                Query.equal('type', RuleType.DEPLOYMENT),
+                Query.equal('deploymentResourceType', DeploymentResourceType.FUNCTION),
+                Query.equal('deploymentResourceId', params.function),
+                Query.equal('deploymentId', func.deploymentId),
+                Query.limit(1)
+            ]
+        });
 
     return {
         header: Header,
diff --git a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/add-domain/+page.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/add-domain/+page.svelte
index 66faf1e8d..4fbea54f2 100644
--- a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/add-domain/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/add-domain/+page.svelte
@@ -52,7 +52,10 @@
 
         if (apexDomain && !domain && isCloud) {
             try {
-                domain = await sdk.forConsole.domains.create($project.teamId, apexDomain);
+                domain = await sdk.forConsole.domains.create({
+                    teamId: $project.teamId,
+                    domain: apexDomain
+                });
             } catch (error) {
                 // apex might already be added on organization level, skip.
                 const alreadyAdded = error?.type === 'domain_already_exists';
diff --git a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/add-domain/+page.ts b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/add-domain/+page.ts
index 5de7f51a8..d326aabd6 100644
--- a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/add-domain/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/add-domain/+page.ts
@@ -17,7 +17,7 @@ export const load = async ({ parent, depends, params }) => {
             ]),
         sdk.forProject(params.region, params.project).vcs.listInstallations(),
         isCloud
-            ? sdk.forConsole.domains.list([Query.equal('teamId', organization.$id)])
+            ? sdk.forConsole.domains.list({ queries: [Query.equal('teamId', organization.$id)] })
             : Promise.resolve(null)
     ]);
 
diff --git a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/add-domain/verify-[domain]/+page.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/add-domain/verify-[domain]/+page.svelte
index d8d044ef1..15efd05a8 100644
--- a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/add-domain/verify-[domain]/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/add-domain/verify-[domain]/+page.svelte
@@ -92,7 +92,9 @@
 
     async function back() {
         if (ruleId) {
-            await sdk.forProject(page.params.region, page.params.project).proxy.deleteRule(ruleId);
+            await sdk
+                .forProject(page.params.region, page.params.project)
+                .proxy.deleteRule({ ruleId });
         }
         await goto(`${routeBase}/add-domain?domain=${page.params.domain}`);
     }
diff --git a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/+page.ts b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/+page.ts
index cfccabca9..1f8ab2937 100644
--- a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/+page.ts
@@ -9,7 +9,9 @@ export const load = async ({ params, depends, parent }) => {
 
     const [globalVariables, variables] = await Promise.all([
         sdk.forProject(params.region, params.project).projectApi.listVariables(),
-        sdk.forProject(params.region, params.project).functions.listVariables(params.function)
+        sdk
+            .forProject(params.region, params.project)
+            .functions.listVariables({ functionId: params.function })
     ]);
 
     // Conflicting variables first
diff --git a/src/routes/(console)/project-[region]-[project]/functions/templates/+page.ts b/src/routes/(console)/project-[region]-[project]/functions/templates/+page.ts
index b4e940b6a..ac1f11157 100644
--- a/src/routes/(console)/project-[region]-[project]/functions/templates/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/functions/templates/+page.ts
@@ -14,7 +14,11 @@ export const load: PageLoad = async ({ url, depends, params }) => {
 
     const { templates: allTemplates } = await sdk
         .forProject(params.region, params.project)
-        .functions.listTemplates(undefined, undefined, 100);
+        .functions.listTemplates({
+            runtimes: undefined,
+            useCases: undefined,
+            limit: 100
+        });
 
     const runtimes = new Set<string>();
     const useCases = new Set<string>();
diff --git a/src/routes/(console)/project-[region]-[project]/functions/templates/template-[template]/+page.ts b/src/routes/(console)/project-[region]-[project]/functions/templates/template-[template]/+page.ts
index eb5dc99bf..ba18f317c 100644
--- a/src/routes/(console)/project-[region]-[project]/functions/templates/template-[template]/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/functions/templates/template-[template]/+page.ts
@@ -6,8 +6,8 @@ export const load: PageLoad = async ({ params, depends }) => {
     depends(Dependencies.FUNCTIONS);
 
     return {
-        template: await sdk
-            .forProject(params.region, params.project)
-            .functions.getTemplate(params.template)
+        template: await sdk.forProject(params.region, params.project).functions.getTemplate({
+            templateId: params.template
+        })
     };
 };
diff --git a/src/routes/(console)/project-[region]-[project]/messaging/+page.svelte b/src/routes/(console)/project-[region]-[project]/messaging/+page.svelte
index 12821a0bf..1931f56ff 100644
--- a/src/routes/(console)/project-[region]-[project]/messaging/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/messaging/+page.svelte
@@ -61,7 +61,9 @@
     async function handleDelete() {
         showDelete = false;
 
-        const promises = selected.map((id) => sdk.forProject(region, project).messaging.delete(id));
+        const promises = selected.map((id) =>
+            sdk.forProject(region, project).messaging.delete({ messageId: id })
+        );
 
         try {
             await Promise.all(promises);
diff --git a/src/routes/(console)/project-[region]-[project]/messaging/+page.ts b/src/routes/(console)/project-[region]-[project]/messaging/+page.ts
index 0436e02e7..ff1051b47 100644
--- a/src/routes/(console)/project-[region]-[project]/messaging/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/messaging/+page.ts
@@ -33,17 +33,15 @@ export const load: PageLoad = async ({ depends, url, route, params }) => {
         query,
         page,
         view,
-        messages: (await sdk
-            .forProject(params.region, params.project)
-            .messaging.listMessages(
-                [
-                    Query.limit(limit),
-                    Query.offset(offset),
-                    Query.orderDesc(''),
-                    ...parsedQueries.values()
-                ],
-                search || undefined
-            )) as {
+        messages: (await sdk.forProject(params.region, params.project).messaging.listMessages({
+            queries: [
+                Query.limit(limit),
+                Query.offset(offset),
+                Query.orderDesc(''),
+                ...parsedQueries.values()
+            ],
+            search: search || undefined
+        })) as {
             total: number;
             messages: (Models.Message & { data: Record<string, string> })[]; // Add typing for message.data
         }
diff --git a/src/routes/(console)/project-[region]-[project]/messaging/helper.ts b/src/routes/(console)/project-[region]-[project]/messaging/helper.ts
index 608558146..21957cd8d 100644
--- a/src/routes/(console)/project-[region]-[project]/messaging/helper.ts
+++ b/src/routes/(console)/project-[region]-[project]/messaging/helper.ts
@@ -21,7 +21,7 @@ const messageIntervals = new Map<string, ReturnType<typeof setInterval>>();
 /** Checks the status of a message and stops polling if it's no longer processing. */
 function checkMessageStatus(message: Models.Message) {
     sdk.forProject(page.params.region, page.params.project)
-        .messaging.getMessage(message.$id)
+        .messaging.getMessage({ messageId: message.$id })
         .then((msg) => {
             if (msg.status !== 'processing') {
                 clearPolling(message.$id);
diff --git a/src/routes/(console)/project-[region]-[project]/messaging/message-[message]/+layout.ts b/src/routes/(console)/project-[region]-[project]/messaging/message-[message]/+layout.ts
index 355a93be1..75650f25b 100644
--- a/src/routes/(console)/project-[region]-[project]/messaging/message-[message]/+layout.ts
+++ b/src/routes/(console)/project-[region]-[project]/messaging/message-[message]/+layout.ts
@@ -10,12 +10,12 @@ export const load: LayoutLoad = async ({ params, depends }) => {
 
     const message = await sdk
         .forProject(params.region, params.project)
-        .messaging.getMessage(params.message);
+        .messaging.getMessage({ messageId: params.message });
 
     const topicsById: Record<string, Models.Topic> = {};
     const topicsPromise = Promise.allSettled(
         message.topics.map((topicId) =>
-            sdk.forProject(params.region, params.project).messaging.getTopic(topicId)
+            sdk.forProject(params.region, params.project).messaging.getTopic({ topicId })
         )
     ).then((results) => {
         results.forEach((result) => {
@@ -28,7 +28,7 @@ export const load: LayoutLoad = async ({ params, depends }) => {
     const targetsById: Record<string, Models.Target> = {};
     const targetsPromise = sdk
         .forProject(params.region, params.project)
-        .messaging.listTargets(params.message)
+        .messaging.listTargets({ messageId: params.message })
         .then((response) => {
             response.targets.forEach((target) => {
                 targetsById[target.$id] = target;
@@ -41,7 +41,7 @@ export const load: LayoutLoad = async ({ params, depends }) => {
     const usersPromise = Object.values(targetsById).map((target) =>
         sdk
             .forProject(params.region, params.project)
-            .users.get(target.userId)
+            .users.get({ userId: target.userId })
             .then((user) => {
                 usersById[user.$id] = user;
             })
@@ -51,7 +51,7 @@ export const load: LayoutLoad = async ({ params, depends }) => {
     const messageRecipientsPromise = Object.values(message.users).map((userId) =>
         sdk
             .forProject(params.region, params.project)
-            .users.get(userId)
+            .users.get({ userId })
             .then((user) => {
                 messageRecipients[user.$id] = user;
             })
diff --git a/src/routes/(console)/project-[region]-[project]/messaging/message-[message]/deleteModal.svelte b/src/routes/(console)/project-[region]-[project]/messaging/message-[message]/deleteModal.svelte
index ce46b9da0..4753a5f63 100644
--- a/src/routes/(console)/project-[region]-[project]/messaging/message-[message]/deleteModal.svelte
+++ b/src/routes/(console)/project-[region]-[project]/messaging/message-[message]/deleteModal.svelte
@@ -18,7 +18,7 @@
         try {
             await sdk
                 .forProject(page.params.region, page.params.project)
-                .messaging.delete(message.$id);
+                .messaging.delete({ messageId: message.$id });
             show = false;
             let notificationMessage = '';
             switch (message.status) {
diff --git a/src/routes/(console)/project-[region]-[project]/messaging/message-[message]/pushMessage.svelte b/src/routes/(console)/project-[region]-[project]/messaging/message-[message]/pushMessage.svelte
index 7e7e2a930..6726b3a54 100644
--- a/src/routes/(console)/project-[region]-[project]/messaging/message-[message]/pushMessage.svelte
+++ b/src/routes/(console)/project-[region]-[project]/messaging/message-[message]/pushMessage.svelte
@@ -27,9 +27,10 @@
         title = message.data.title;
         body = message.data.body;
         if (message.data?.image) {
-            file = await sdk
-                .forProject(page.params.region, page.params.project)
-                .storage.getFile(message.data.image?.bucketId, message.data.image?.fileId);
+            file = await sdk.forProject(page.params.region, page.params.project).storage.getFile({
+                bucketId: message.data.image?.bucketId,
+                fileId: message.data.image?.fileId
+            });
         }
 
         const dataEntries: [string, string][] = [];
diff --git a/src/routes/(console)/project-[region]-[project]/messaging/message-[message]/updateTopics.svelte b/src/routes/(console)/project-[region]-[project]/messaging/message-[message]/updateTopics.svelte
index c0dd34cba..41a5cf189 100644
--- a/src/routes/(console)/project-[region]-[project]/messaging/message-[message]/updateTopics.svelte
+++ b/src/routes/(console)/project-[region]-[project]/messaging/message-[message]/updateTopics.svelte
@@ -46,15 +46,15 @@
             if (message.providerType == MessagingProviderType.Email) {
                 await sdk
                     .forProject(page.params.region, page.params.project)
-                    .messaging.updateEmail(message.$id, topicIds);
+                    .messaging.updateEmail({ messageId: message.$id, topics: topicIds });
             } else if (message.providerType == MessagingProviderType.Sms) {
                 await sdk
                     .forProject(page.params.region, page.params.project)
-                    .messaging.updateSms(message.$id, topicIds);
+                    .messaging.updateSms({ messageId: message.$id, topics: topicIds });
             } else if (message.providerType == MessagingProviderType.Push) {
                 await sdk
                     .forProject(page.params.region, page.params.project)
-                    .messaging.updatePush(message.$id, topicIds);
+                    .messaging.updatePush({ messageId: message.$id, topics: topicIds });
             }
             await invalidate(Dependencies.MESSAGING_MESSAGE);
             addNotification({
diff --git a/src/routes/(console)/project-[region]-[project]/messaging/providers/+page.ts b/src/routes/(console)/project-[region]-[project]/messaging/providers/+page.ts
index e8f6bf337..88a69c619 100644
--- a/src/routes/(console)/project-[region]-[project]/messaging/providers/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/messaging/providers/+page.ts
@@ -33,16 +33,14 @@ export const load: PageLoad = async ({ depends, url, route, params }) => {
         query,
         page,
         view,
-        providers: await sdk
-            .forProject(params.region, params.project)
-            .messaging.listProviders(
-                [
-                    Query.limit(limit),
-                    Query.offset(offset),
-                    Query.orderDesc(''),
-                    ...parsedQueries.values()
-                ],
-                search || undefined
-            )
+        providers: await sdk.forProject(params.region, params.project).messaging.listProviders({
+            queries: [
+                Query.limit(limit),
+                Query.offset(offset),
+                Query.orderDesc(''),
+                ...parsedQueries.values()
+            ],
+            search: search || undefined
+        })
     };
 };
diff --git a/src/routes/(console)/project-[region]-[project]/messaging/providers/create.svelte b/src/routes/(console)/project-[region]-[project]/messaging/providers/create.svelte
index 5b8cef881..cbcaa0196 100644
--- a/src/routes/(console)/project-[region]-[project]/messaging/providers/create.svelte
+++ b/src/routes/(console)/project-[region]-[project]/messaging/providers/create.svelte
@@ -29,136 +29,138 @@
                 case Providers.Twilio:
                     response = await sdk
                         .forProject(page.params.region, page.params.project)
-                        .messaging.createTwilioProvider(
+                        .messaging.createTwilioProvider({
                             providerId,
-                            $providerParams[$provider].name,
-                            $providerParams[$provider].from,
-                            $providerParams[$provider].accountSid,
-                            $providerParams[$provider].authToken,
-                            $providerParams[$provider].enabled
-                        );
+                            name: $providerParams[$provider].name,
+                            from: $providerParams[$provider].from,
+                            accountSid: $providerParams[$provider].accountSid,
+                            authToken: $providerParams[$provider].authToken,
+                            enabled: $providerParams[$provider].enabled
+                        });
                     break;
                 case Providers.Msg91:
                     response = await sdk
                         .forProject(page.params.region, page.params.project)
-                        .messaging.createMsg91Provider(
+                        .messaging.createMsg91Provider({
                             providerId,
-                            $providerParams[$provider].name,
-                            $providerParams[$provider].templateId,
-                            $providerParams[$provider].senderId,
-                            $providerParams[$provider].authKey,
-                            $providerParams[$provider].enabled
-                        );
+                            name: $providerParams[$provider].name,
+                            templateId: $providerParams[$provider].templateId,
+                            senderId: $providerParams[$provider].senderId,
+                            authKey: $providerParams[$provider].authKey,
+                            enabled: $providerParams[$provider].enabled
+                        });
                     break;
                 case Providers.Telesign:
                     response = await sdk
                         .forProject(page.params.region, page.params.project)
-                        .messaging.createTelesignProvider(
+                        .messaging.createTelesignProvider({
                             providerId,
-                            $providerParams[$provider].name,
-                            $providerParams[$provider].from,
-                            $providerParams[$provider].customerId,
-                            $providerParams[$provider].apiKey,
-                            $providerParams[$provider].enabled
-                        );
+                            name: $providerParams[$provider].name,
+                            from: $providerParams[$provider].from,
+                            customerId: $providerParams[$provider].customerId,
+                            apiKey: $providerParams[$provider].apiKey,
+                            enabled: $providerParams[$provider].enabled
+                        });
                     break;
                 case Providers.Textmagic:
                     response = await sdk
                         .forProject(page.params.region, page.params.project)
-                        .messaging.createTextmagicProvider(
+                        .messaging.createTextmagicProvider({
                             providerId,
-                            $providerParams[$provider].name,
-                            $providerParams[$provider].from,
-                            $providerParams[$provider].username,
-                            $providerParams[$provider].apiKey,
-                            $providerParams[$provider].enabled
-                        );
+                            name: $providerParams[$provider].name,
+                            from: $providerParams[$provider].from,
+                            username: $providerParams[$provider].username,
+                            apiKey: $providerParams[$provider].apiKey,
+                            enabled: $providerParams[$provider].enabled
+                        });
                     break;
                 case Providers.Vonage:
                     response = await sdk
                         .forProject(page.params.region, page.params.project)
-                        .messaging.createVonageProvider(
+                        .messaging.createVonageProvider({
                             providerId,
-                            $providerParams[$provider].name,
-                            $providerParams[$provider].from,
-                            $providerParams[$provider].apiKey,
-                            $providerParams[$provider].apiSecret,
-                            $providerParams[$provider].enabled
-                        );
+                            name: $providerParams[$provider].name,
+                            from: $providerParams[$provider].from,
+                            apiKey: $providerParams[$provider].apiKey,
+                            apiSecret: $providerParams[$provider].apiSecret,
+                            enabled: $providerParams[$provider].enabled
+                        });
                     break;
                 case Providers.Mailgun:
                     response = await sdk
                         .forProject(page.params.region, page.params.project)
-                        .messaging.createMailgunProvider(
+                        .messaging.createMailgunProvider({
                             providerId,
-                            $providerParams[$provider].name,
-                            $providerParams[$provider].apiKey,
-                            $providerParams[$provider].domain,
-                            $providerParams[$provider].isEuRegion,
-                            $providerParams[$provider].fromName || undefined,
-                            $providerParams[$provider].fromEmail,
-                            $providerParams[$provider].replyToName || undefined,
-                            $providerParams[$provider].replyToEmail || undefined,
-                            $providerParams[$provider].enabled
-                        );
+                            name: $providerParams[$provider].name,
+                            apiKey: $providerParams[$provider].apiKey,
+                            domain: $providerParams[$provider].domain,
+                            isEuRegion: $providerParams[$provider].isEuRegion,
+                            fromName: $providerParams[$provider].fromName || undefined,
+                            fromEmail: $providerParams[$provider].fromEmail,
+                            replyToName: $providerParams[$provider].replyToName || undefined,
+                            replyToEmail: $providerParams[$provider].replyToEmail || undefined,
+                            enabled: $providerParams[$provider].enabled
+                        });
                     break;
                 case Providers.Sendgrid:
                     response = await sdk
                         .forProject(page.params.region, page.params.project)
-                        .messaging.createSendgridProvider(
+                        .messaging.createSendgridProvider({
                             providerId,
-                            $providerParams[$provider].name,
-                            $providerParams[$provider].apiKey,
-                            $providerParams[$provider].fromName || undefined,
-                            $providerParams[$provider].fromEmail,
-                            $providerParams[$provider].replyToName || undefined,
-                            $providerParams[$provider].replyToEmail || undefined,
-                            $providerParams[$provider].enabled
-                        );
+                            name: $providerParams[$provider].name,
+                            apiKey: $providerParams[$provider].apiKey,
+                            fromName: $providerParams[$provider].fromName || undefined,
+                            fromEmail: $providerParams[$provider].fromEmail,
+                            replyToName: $providerParams[$provider].replyToName || undefined,
+                            replyToEmail: $providerParams[$provider].replyToEmail || undefined,
+                            enabled: $providerParams[$provider].enabled
+                        });
                     break;
                 case Providers.SMTP:
                     response = await sdk
                         .forProject(page.params.region, page.params.project)
-                        .messaging.createSmtpProvider(
+                        .messaging.createSmtpProvider({
                             providerId,
-                            $providerParams[$provider].name,
-                            $providerParams[$provider].host,
-                            $providerParams[$provider].port || undefined,
-                            $providerParams[$provider].username || undefined,
-                            $providerParams[$provider].password || undefined,
-                            $providerParams[$provider].encryption,
-                            $providerParams[$provider].autoTLS,
-                            $providerParams[$provider].mailer || undefined,
-                            $providerParams[$provider].fromName || undefined,
-                            $providerParams[$provider].fromEmail,
-                            $providerParams[$provider].replyToName || undefined,
-                            $providerParams[$provider].replyToEmail || undefined,
-                            $providerParams[$provider].enabled
-                        );
+                            name: $providerParams[$provider].name,
+                            host: $providerParams[$provider].host,
+                            port: $providerParams[$provider].port || undefined,
+                            username: $providerParams[$provider].username || undefined,
+                            password: $providerParams[$provider].password || undefined,
+                            encryption: $providerParams[$provider].encryption,
+                            autoTLS: $providerParams[$provider].autoTLS,
+                            mailer: $providerParams[$provider].mailer || undefined,
+                            fromName: $providerParams[$provider].fromName || undefined,
+                            fromEmail: $providerParams[$provider].fromEmail,
+                            replyToName: $providerParams[$provider].replyToName || undefined,
+                            replyToEmail: $providerParams[$provider].replyToEmail || undefined,
+                            enabled: $providerParams[$provider].enabled
+                        });
                     break;
                 case Providers.FCM:
                     response = await sdk
                         .forProject(page.params.region, page.params.project)
-                        .messaging.createFcmProvider(
+                        .messaging.createFcmProvider({
                             providerId,
-                            $providerParams[$provider].name,
-                            JSON.parse($providerParams[$provider].serviceAccountJSON),
-                            $providerParams[$provider].enabled
-                        );
+                            name: $providerParams[$provider].name,
+                            serviceAccountJSON: JSON.parse(
+                                $providerParams[$provider].serviceAccountJSON
+                            ),
+                            enabled: $providerParams[$provider].enabled
+                        });
                     break;
                 case Providers.APNS:
                     response = await sdk
                         .forProject(page.params.region, page.params.project)
-                        .messaging.createApnsProvider(
+                        .messaging.createApnsProvider({
                             providerId,
-                            $providerParams[$provider].name,
-                            $providerParams[$provider].authKey,
-                            $providerParams[$provider].authKeyId,
-                            $providerParams[$provider].teamId,
-                            $providerParams[$provider].bundleId,
-                            $providerParams[$provider].sandbox,
-                            $providerParams[$provider].enabled
-                        );
+                            name: $providerParams[$provider].name,
+                            authKey: $providerParams[$provider].authKey,
+                            authKeyId: $providerParams[$provider].authKeyId,
+                            teamId: $providerParams[$provider].teamId,
+                            bundleId: $providerParams[$provider].bundleId,
+                            sandbox: $providerParams[$provider].sandbox,
+                            enabled: $providerParams[$provider].enabled
+                        });
                     break;
             }
             wizard.hide();
diff --git a/src/routes/(console)/project-[region]-[project]/messaging/providers/provider-[provider]/updateName.svelte b/src/routes/(console)/project-[region]-[project]/messaging/providers/provider-[provider]/updateName.svelte
index 9c4170675..daf7e28d7 100644
--- a/src/routes/(console)/project-[region]-[project]/messaging/providers/provider-[provider]/updateName.svelte
+++ b/src/routes/(console)/project-[region]-[project]/messaging/providers/provider-[provider]/updateName.svelte
@@ -24,37 +24,58 @@
                 case Providers.Twilio:
                     response = await sdk
                         .forProject(page.params.region, page.params.project)
-                        .messaging.updateTwilioProvider(providerId, providerName);
+                        .messaging.updateTwilioProvider({
+                            providerId,
+                            name: providerName
+                        });
                     break;
                 case Providers.Msg91:
                     response = await sdk
                         .forProject(page.params.region, page.params.project)
-                        .messaging.updateMsg91Provider(providerId, providerName);
+                        .messaging.updateMsg91Provider({
+                            providerId,
+                            name: providerName
+                        });
                     break;
                 case Providers.Telesign:
                     response = await sdk
                         .forProject(page.params.region, page.params.project)
-                        .messaging.updateTelesignProvider(providerId, providerName);
+                        .messaging.updateTelesignProvider({
+                            providerId,
+                            name: providerName
+                        });
                     break;
                 case Providers.Textmagic:
                     response = await sdk
                         .forProject(page.params.region, page.params.project)
-                        .messaging.updateTextmagicProvider(providerId, providerName);
+                        .messaging.updateTextmagicProvider({
+                            providerId,
+                            name: providerName
+                        });
                     break;
                 case Providers.Vonage:
                     response = await sdk
                         .forProject(page.params.region, page.params.project)
-                        .messaging.updateVonageProvider(providerId, providerName);
+                        .messaging.updateVonageProvider({
+                            providerId,
+                            name: providerName
+                        });
                     break;
                 case Providers.Mailgun:
                     response = await sdk
                         .forProject(page.params.region, page.params.project)
-                        .messaging.updateMailgunProvider(providerId, providerName);
+                        .messaging.updateMailgunProvider({
+                            providerId,
+                            name: providerName
+                        });
                     break;
                 case Providers.Sendgrid:
                     response = await sdk
                         .forProject(page.params.region, page.params.project)
-                        .messaging.updateSendgridProvider(providerId, providerName);
+                        .messaging.updateSendgridProvider({
+                            providerId,
+                            name: providerName
+                        });
                     break;
                 case Providers.SMTP:
                     response = await sdk
diff --git a/src/routes/(console)/project-[region]-[project]/messaging/providers/table.svelte b/src/routes/(console)/project-[region]-[project]/messaging/providers/table.svelte
index 47f1b776e..b65093f6e 100644
--- a/src/routes/(console)/project-[region]-[project]/messaging/providers/table.svelte
+++ b/src/routes/(console)/project-[region]-[project]/messaging/providers/table.svelte
@@ -28,7 +28,9 @@
         showDelete = false;
 
         const promises = selectedIds.map((id) =>
-            sdk.forProject(page.params.region, page.params.project).messaging.deleteProvider(id)
+            sdk
+                .forProject(page.params.region, page.params.project)
+                .messaging.deleteProvider({ providerId: id })
         );
 
         try {
diff --git a/src/routes/(console)/project-[region]-[project]/messaging/topics/+page.ts b/src/routes/(console)/project-[region]-[project]/messaging/topics/+page.ts
index 8ae6d78f3..7b0af2795 100644
--- a/src/routes/(console)/project-[region]-[project]/messaging/topics/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/messaging/topics/+page.ts
@@ -22,16 +22,14 @@ export const load: PageLoad = async ({ depends, url, route, params }) => {
         search,
         query,
         page,
-        topics: await sdk
-            .forProject(params.region, params.project)
-            .messaging.listTopics(
-                [
-                    Query.limit(limit),
-                    Query.offset(offset),
-                    Query.orderDesc(''),
-                    ...parsedQueries.values()
-                ],
-                search || undefined
-            )
+        topics: await sdk.forProject(params.region, params.project).messaging.listTopics({
+            queries: [
+                Query.limit(limit),
+                Query.offset(offset),
+                Query.orderDesc(''),
+                ...parsedQueries.values()
+            ],
+            search: search || undefined
+        })
     };
 };
diff --git a/src/routes/(console)/project-[region]-[project]/messaging/topics/create.svelte b/src/routes/(console)/project-[region]-[project]/messaging/topics/create.svelte
index 623b45a58..13ac3800b 100644
--- a/src/routes/(console)/project-[region]-[project]/messaging/topics/create.svelte
+++ b/src/routes/(console)/project-[region]-[project]/messaging/topics/create.svelte
@@ -21,7 +21,10 @@
         try {
             const topic = await sdk
                 .forProject(page.params.region, page.params.project)
-                .messaging.createTopic(id ?? ID.unique(), name);
+                .messaging.createTopic({
+                    topicId: id ?? ID.unique(),
+                    name
+                });
             name = '';
             showCreate = false;
             showCustomId = false;
diff --git a/src/routes/(console)/project-[region]-[project]/messaging/topics/table.svelte b/src/routes/(console)/project-[region]-[project]/messaging/topics/table.svelte
index 6a99009d2..697b54933 100644
--- a/src/routes/(console)/project-[region]-[project]/messaging/topics/table.svelte
+++ b/src/routes/(console)/project-[region]-[project]/messaging/topics/table.svelte
@@ -26,7 +26,9 @@
         showDelete = false;
 
         const promises = selectedIds.map((id) =>
-            sdk.forProject(page.params.region, page.params.project).messaging.deleteTopic(id)
+            sdk
+                .forProject(page.params.region, page.params.project)
+                .messaging.deleteTopic({ topicId: id })
         );
 
         try {
diff --git a/src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/+layout.ts b/src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/+layout.ts
index 595659ee3..641c49623 100644
--- a/src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/+layout.ts
+++ b/src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/+layout.ts
@@ -10,6 +10,8 @@ export const load: LayoutLoad = async ({ params, depends }) => {
     return {
         header: Header,
         breadcrumbs: Breadcrumbs,
-        topic: await sdk.forProject(params.region, params.project).messaging.getTopic(params.topic)
+        topic: await sdk
+            .forProject(params.region, params.project)
+            .messaging.getTopic({ topicId: params.topic })
     };
 };
diff --git a/src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/+page.svelte b/src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/+page.svelte
index 11abad571..90a5871f8 100644
--- a/src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/+page.svelte
@@ -59,7 +59,11 @@
         const promises = targetIds.map(async (targetId) => {
             const subscriber = await sdk
                 .forProject(page.params.region, page.params.project)
-                .messaging.createSubscriber(page.params.topic, ID.unique(), targetId);
+                .messaging.createSubscriber({
+                    topicId: page.params.topic,
+                    subscriberId: ID.unique(),
+                    targetId
+                });
             subscribersByTargetId[targetId] = subscriber;
         });
 
diff --git a/src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/activity/+page.ts b/src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/activity/+page.ts
index 933026955..ddcb1c47a 100644
--- a/src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/activity/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/activity/+page.ts
@@ -14,6 +14,9 @@ export const load: PageLoad = async ({ params, url, route }) => {
         limit,
         logs: await sdk
             .forProject(params.region, params.project)
-            .messaging.listTopicLogs(params.topic, [Query.limit(limit), Query.offset(offset)])
+            .messaging.listTopicLogs({
+                topicId: params.topic,
+                queries: [Query.limit(limit), Query.offset(offset)]
+            })
     };
 };
diff --git a/src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/deleteTopic.svelte b/src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/deleteTopic.svelte
index 192f6c07f..83952b8ae 100644
--- a/src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/deleteTopic.svelte
+++ b/src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/deleteTopic.svelte
@@ -15,7 +15,7 @@
         try {
             await sdk
                 .forProject(page.params.region, page.params.project)
-                .messaging.deleteTopic($topic.$id);
+                .messaging.deleteTopic({ topicId: $topic.$id });
 
             showDelete = false;
             addNotification({
diff --git a/src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/settings/updateName.svelte b/src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/settings/updateName.svelte
index 007705655..d08876378 100644
--- a/src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/settings/updateName.svelte
+++ b/src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/settings/updateName.svelte
@@ -18,9 +18,10 @@
 
     async function updateName() {
         try {
-            await sdk
-                .forProject(page.params.region, page.params.project)
-                .messaging.updateTopic($topic.$id, name);
+            await sdk.forProject(page.params.region, page.params.project).messaging.updateTopic({
+                topicId: $topic.$id,
+                name
+            });
             await invalidate(Dependencies.MESSAGING_TOPIC);
             addNotification({
                 message: 'Name has been updated',
diff --git a/src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/settings/updatePermissions.svelte b/src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/settings/updatePermissions.svelte
index 38d2cfd71..5749cd19a 100644
--- a/src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/settings/updatePermissions.svelte
+++ b/src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/settings/updatePermissions.svelte
@@ -25,7 +25,7 @@
         try {
             await sdk
                 .forProject(page.params.region, page.params.project)
-                .messaging.updateTopic(topicId, undefined, permissions);
+                .messaging.updateTopic({ topicId, subscribe: permissions });
             await invalidate(Dependencies.MESSAGING_TOPIC);
             addNotification({
                 message: 'Permissions have been updated',
diff --git a/src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/table.svelte b/src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/table.svelte
index 63c8ff2f7..af75f0e76 100644
--- a/src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/table.svelte
+++ b/src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/table.svelte
@@ -33,7 +33,10 @@
         async function deleteSubscriber(subscriberId: string) {
             await sdk
                 .forProject(page.params.region, page.params.project)
-                .messaging.deleteSubscriber(page.params.topic, subscriberId);
+                .messaging.deleteSubscriber({
+                    topicId: page.params.topic,
+                    subscriberId
+                });
             const { target } = subscribers[subscriberId];
             const { [target.$id]: _, ...rest } = $targetsById;
             $targetsById = rest;
diff --git a/src/routes/(console)/project-[region]-[project]/messaging/topicsModal.svelte b/src/routes/(console)/project-[region]-[project]/messaging/topicsModal.svelte
index b5080fcd1..bd24b5cd3 100644
--- a/src/routes/(console)/project-[region]-[project]/messaging/topicsModal.svelte
+++ b/src/routes/(console)/project-[region]-[project]/messaging/topicsModal.svelte
@@ -49,7 +49,7 @@
 
         const response = await sdk
             .forProject(page.params.region, page.params.project)
-            .messaging.listTopics(queries, search || undefined);
+            .messaging.listTopics({ queries, search: search || undefined });
 
         if (response.total !== 0) {
             switch (providerType) {
diff --git a/src/routes/(console)/project-[region]-[project]/messaging/userTargetsModal.svelte b/src/routes/(console)/project-[region]-[project]/messaging/userTargetsModal.svelte
index dbc58a0bb..adb1fd09a 100644
--- a/src/routes/(console)/project-[region]-[project]/messaging/userTargetsModal.svelte
+++ b/src/routes/(console)/project-[region]-[project]/messaging/userTargetsModal.svelte
@@ -46,9 +46,10 @@
             queries.push(Query.notEqual('phone', ''));
         }
 
-        const response = await sdk
-            .forProject(page.params.region, page.params.project)
-            .users.list(queries, search || undefined);
+        const response = await sdk.forProject(page.params.region, page.params.project).users.list({
+            queries,
+            search: search || undefined
+        });
 
         totalResults = response.total;
         userResultsById = {};
diff --git a/src/routes/(console)/project-[region]-[project]/overview/(components)/delete.svelte b/src/routes/(console)/project-[region]-[project]/overview/(components)/delete.svelte
index 179388099..705551837 100644
--- a/src/routes/(console)/project-[region]-[project]/overview/(components)/delete.svelte
+++ b/src/routes/(console)/project-[region]-[project]/overview/(components)/delete.svelte
@@ -26,8 +26,14 @@
     async function handleDelete() {
         try {
             isApiKey
-                ? await sdk.forConsole.projects.deleteKey(projectId, key.$id)
-                : await sdk.forConsole.projects.deleteDevKey(projectId, key.$id);
+                ? await sdk.forConsole.projects.deleteKey({
+                      projectId,
+                      keyId: key.$id
+                  })
+                : await sdk.forConsole.projects.deleteDevKey({
+                      projectId,
+                      keyId: key.$id
+                  });
 
             await invalidate(dependency);
             showDelete = false;
diff --git a/src/routes/(console)/project-[region]-[project]/overview/(components)/deleteBatch.svelte b/src/routes/(console)/project-[region]-[project]/overview/(components)/deleteBatch.svelte
index c7048f7da..ff694c3cd 100644
--- a/src/routes/(console)/project-[region]-[project]/overview/(components)/deleteBatch.svelte
+++ b/src/routes/(console)/project-[region]-[project]/overview/(components)/deleteBatch.svelte
@@ -27,8 +27,14 @@
             await Promise.all(
                 keyIds.map((key) =>
                     isApiKey
-                        ? sdk.forConsole.projects.deleteKey(projectId, key)
-                        : sdk.forConsole.projects.deleteDevKey(projectId, key)
+                        ? sdk.forConsole.projects.deleteKey({
+                              projectId,
+                              keyId: key
+                          })
+                        : sdk.forConsole.projects.deleteDevKey({
+                              projectId,
+                              keyId: key
+                          })
                 )
             );
 
diff --git a/src/routes/(console)/project-[region]-[project]/overview/dev-keys/action.svelte b/src/routes/(console)/project-[region]-[project]/overview/dev-keys/action.svelte
index 027c36c40..5dda98b43 100644
--- a/src/routes/(console)/project-[region]-[project]/overview/dev-keys/action.svelte
+++ b/src/routes/(console)/project-[region]-[project]/overview/dev-keys/action.svelte
@@ -21,7 +21,11 @@
     async function create() {
         try {
             isSubmitting = true;
-            const { $id } = await sdk.forConsole.projects.createDevKey(projectId, name, expire);
+            const { $id } = await sdk.forConsole.projects.createDevKey({
+                projectId,
+                name,
+                expire
+            });
 
             $showDevKeysCreateModal = false;
             trackEvent(Submit.DevKeyCreate);
diff --git a/src/routes/(console)/project-[region]-[project]/overview/platforms/[platform]/delete.svelte b/src/routes/(console)/project-[region]-[project]/overview/platforms/[platform]/delete.svelte
index dcc39086e..0b14c84c7 100644
--- a/src/routes/(console)/project-[region]-[project]/overview/platforms/[platform]/delete.svelte
+++ b/src/routes/(console)/project-[region]-[project]/overview/platforms/[platform]/delete.svelte
@@ -13,7 +13,10 @@
     let error: string;
     async function handleDelete() {
         try {
-            await sdk.forConsole.projects.deletePlatform($project.$id, $platform.$id);
+            await sdk.forConsole.projects.deletePlatform({
+                projectId: $project.$id,
+                platformId: $platform.$id
+            });
             await invalidate(Dependencies.PLATFORMS);
             showDelete = false;
             addNotification({
diff --git a/src/routes/(console)/project-[region]-[project]/settings/deleteProject.svelte b/src/routes/(console)/project-[region]-[project]/settings/deleteProject.svelte
index f724fe07c..0af70f008 100644
--- a/src/routes/(console)/project-[region]-[project]/settings/deleteProject.svelte
+++ b/src/routes/(console)/project-[region]-[project]/settings/deleteProject.svelte
@@ -31,7 +31,9 @@
     const handleDelete = async () => {
         try {
             // send the project to correct region pool for deletion!
-            await sdk.forConsoleIn($project.region).projects.delete($project.$id);
+            await sdk.forConsoleIn($project.region).projects.delete({
+                projectId: $project.$id
+            });
             await finishAndRedirect();
         } catch (e) {
             error = e.message;
diff --git a/src/routes/(console)/project-[region]-[project]/settings/domains/add-domain/+page.svelte b/src/routes/(console)/project-[region]-[project]/settings/domains/add-domain/+page.svelte
index 7a07027c3..0ae3718ef 100644
--- a/src/routes/(console)/project-[region]-[project]/settings/domains/add-domain/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/settings/domains/add-domain/+page.svelte
@@ -34,7 +34,10 @@
 
         if (apexDomain && !domain && isCloud) {
             try {
-                domain = await sdk.forConsole.domains.create($project.teamId, apexDomain);
+                domain = await sdk.forConsole.domains.create({
+                    teamId: $project.teamId,
+                    domain: apexDomain
+                });
             } catch (error) {
                 // apex might already be added on organization level, skip.
                 const alreadyAdded = error?.type === 'domain_already_exists';
diff --git a/src/routes/(console)/project-[region]-[project]/settings/domains/add-domain/+page.ts b/src/routes/(console)/project-[region]-[project]/settings/domains/add-domain/+page.ts
index 5226f40dc..b22b0ad83 100644
--- a/src/routes/(console)/project-[region]-[project]/settings/domains/add-domain/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/settings/domains/add-domain/+page.ts
@@ -16,7 +16,7 @@ export const load = async ({ depends, params, parent }) => {
                 Query.equal('trigger', RuleTrigger.MANUAL)
             ]),
         isCloud
-            ? sdk.forConsole.domains.list([Query.equal('teamId', organization.$id)])
+            ? sdk.forConsole.domains.list({ queries: [Query.equal('teamId', organization.$id)] })
             : Promise.resolve(null)
     ]);
 
diff --git a/src/routes/(console)/project-[region]-[project]/settings/domains/add-domain/verify-[domain]/+page.svelte b/src/routes/(console)/project-[region]-[project]/settings/domains/add-domain/verify-[domain]/+page.svelte
index 594c4f4e2..18883e72d 100644
--- a/src/routes/(console)/project-[region]-[project]/settings/domains/add-domain/verify-[domain]/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/settings/domains/add-domain/verify-[domain]/+page.svelte
@@ -66,7 +66,9 @@
                 );
                 verified = domainData.nameservers.toLowerCase() === 'appwrite';
             } else if (!isNewDomain && isCloud) {
-                const domain = await sdk.forConsole.domains.updateNameservers(domainId);
+                const domain = await sdk.forConsole.domains.updateNameservers({
+                    domainId
+                });
                 verified = domain.nameservers.toLowerCase() === 'appwrite';
                 if (!verified)
                     throw new Error(
@@ -92,7 +94,9 @@
 
     async function back() {
         if (ruleId) {
-            await sdk.forProject(page.params.region, page.params.project).proxy.deleteRule(ruleId);
+            await sdk
+                .forProject(page.params.region, page.params.project)
+                .proxy.deleteRule({ ruleId });
         }
         await goto(`${routeBase}/add-domain?domain=${page.params.domain}`);
     }
diff --git a/src/routes/(console)/project-[region]-[project]/settings/domains/add-domain/verify-[domain]/+page.ts b/src/routes/(console)/project-[region]-[project]/settings/domains/add-domain/verify-[domain]/+page.ts
index 8f49a7343..b89c93330 100644
--- a/src/routes/(console)/project-[region]-[project]/settings/domains/add-domain/verify-[domain]/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/settings/domains/add-domain/verify-[domain]/+page.ts
@@ -9,7 +9,9 @@ export const load = async ({ depends, parent }) => {
 
     let domainsList: Models.DomainsList;
     if (isCloud) {
-        domainsList = await sdk.forConsole.domains.list([Query.equal('teamId', organization.$id)]);
+        domainsList = await sdk.forConsole.domains.list({
+            queries: [Query.equal('teamId', organization.$id)]
+        });
     }
 
     return {
diff --git a/src/routes/(console)/project-[region]-[project]/settings/migrations/+page.ts b/src/routes/(console)/project-[region]-[project]/settings/migrations/+page.ts
index 36b470e5c..d93dbba35 100644
--- a/src/routes/(console)/project-[region]-[project]/settings/migrations/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/settings/migrations/+page.ts
@@ -6,14 +6,16 @@ export async function load({ depends, params }) {
     depends(Dependencies.MIGRATIONS);
 
     try {
-        const { migrations } = await sdk.forProject(params.region, params.project).migrations.list([
-            // hides backups/restorations from migrations page.
-            Query.equal('source', ['Appwrite', 'Firebase', 'NHost', 'Supabase']),
-            Query.or([
-                Query.equal('destination', ['Appwrite', 'Firebase', 'NHost', 'Supabase']),
-                Query.isNull('destination')
-            ])
-        ]);
+        const { migrations } = await sdk.forProject(params.region, params.project).migrations.list({
+            queries: [
+                // hides backups/restorations from migrations page.
+                Query.equal('source', ['Appwrite', 'Firebase', 'NHost', 'Supabase']),
+                Query.or([
+                    Query.equal('destination', ['Appwrite', 'Firebase', 'NHost', 'Supabase']),
+                    Query.isNull('destination')
+                ])
+            ]
+        });
 
         return {
             migrations
diff --git a/src/routes/(console)/project-[region]-[project]/settings/transferProject.svelte b/src/routes/(console)/project-[region]-[project]/settings/transferProject.svelte
index 3ad4c9e72..b09bb20f2 100644
--- a/src/routes/(console)/project-[region]-[project]/settings/transferProject.svelte
+++ b/src/routes/(console)/project-[region]-[project]/settings/transferProject.svelte
@@ -15,7 +15,10 @@
 
     const handleTransfer = async () => {
         try {
-            await sdk.forConsole.projects.updateTeam($project.$id, teamId);
+            await sdk.forConsole.projects.updateTeam({
+                projectId: $project.$id,
+                teamId
+            });
             show = false;
             addNotification({
                 type: 'success',
diff --git a/src/routes/(console)/project-[region]-[project]/settings/updateName.svelte b/src/routes/(console)/project-[region]-[project]/settings/updateName.svelte
index b9affbece..7b9091cce 100644
--- a/src/routes/(console)/project-[region]-[project]/settings/updateName.svelte
+++ b/src/routes/(console)/project-[region]-[project]/settings/updateName.svelte
@@ -21,7 +21,10 @@
 
     async function updateName() {
         try {
-            await sdk.forConsole.projects.update($project.$id, name);
+            await sdk.forConsole.projects.update({
+                projectId: $project.$id,
+                name
+            });
             await invalidate(Dependencies.PROJECT);
             await invalidate(Dependencies.ORGANIZATION);
             addNotification({
diff --git a/src/routes/(console)/project-[region]-[project]/settings/usage/[[invoice]]/+page.ts b/src/routes/(console)/project-[region]-[project]/settings/usage/[[invoice]]/+page.ts
index c432d29b8..4afa9181a 100644
--- a/src/routes/(console)/project-[region]-[project]/settings/usage/[[invoice]]/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/settings/usage/[[invoice]]/+page.ts
@@ -26,7 +26,7 @@ export const load: PageLoad = async ({ params, parent }) => {
 
     const [invoices, usage] = await Promise.all([
         sdk.forConsole.billing.listInvoices(organization.$id, [Query.orderDesc('from')]),
-        sdk.forProject(region, project).project.getUsage(startDate, endDate)
+        sdk.forProject(region, project).project.getUsage({ startDate, endDate })
     ]);
 
     if (invoice) {
diff --git a/src/routes/(console)/project-[region]-[project]/sites/(components)/openOnMobileModal.svelte b/src/routes/(console)/project-[region]-[project]/sites/(components)/openOnMobileModal.svelte
index 928694053..2cf360119 100644
--- a/src/routes/(console)/project-[region]-[project]/sites/(components)/openOnMobileModal.svelte
+++ b/src/routes/(console)/project-[region]-[project]/sites/(components)/openOnMobileModal.svelte
@@ -33,7 +33,9 @@
     let tooltipMessage = $state('Copy');
 
     function getImage(url: string) {
-        return sdk.forProject(page.params.region, page.params.project).avatars.getQR(url, 352);
+        return sdk
+            .forProject(page.params.region, page.params.project)
+            .avatars.getQR({ text: url, size: 352 });
     }
 </script>
 
diff --git a/src/routes/(console)/project-[region]-[project]/sites/(components)/siteCard.svelte b/src/routes/(console)/project-[region]-[project]/sites/(components)/siteCard.svelte
index d5c0e5ed8..95562c0ad 100644
--- a/src/routes/(console)/project-[region]-[project]/sites/(components)/siteCard.svelte
+++ b/src/routes/(console)/project-[region]-[project]/sites/(components)/siteCard.svelte
@@ -46,23 +46,13 @@
     }
 
     function getFilePreview(fileId: string) {
-        return sdk
-            .forConsoleIn(page.params.region)
-            .storage.getFilePreview(
-                'screenshots',
-                fileId,
-                1024,
-                576,
-                undefined,
-                undefined,
-                undefined,
-                undefined,
-                undefined,
-                undefined,
-                undefined,
-                undefined,
-                ImageFormat.Webp
-            );
+        return sdk.forConsoleIn(page.params.region).storage.getFilePreview({
+            bucketId: 'screenshots',
+            fileId,
+            width: 1024,
+            height: 576,
+            output: ImageFormat.Webp
+        });
     }
 </script>
 
diff --git a/src/routes/(console)/project-[region]-[project]/sites/create-site/deploying/+page.ts b/src/routes/(console)/project-[region]-[project]/sites/create-site/deploying/+page.ts
index 239290177..7ad810fb4 100644
--- a/src/routes/(console)/project-[region]-[project]/sites/create-site/deploying/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/sites/create-site/deploying/+page.ts
@@ -12,8 +12,13 @@ export const load: PageLoad = async ({ url, depends, params }) => {
     const siteId = url.searchParams.get('site');
     const deploymentId = url.searchParams.get('deployment');
     const [site, deployment, proxyRuleList] = await Promise.all([
-        sdk.forProject(params.region, params.project).sites.get(siteId),
-        sdk.forProject(params.region, params.project).sites.getDeployment(siteId, deploymentId),
+        sdk.forProject(params.region, params.project).sites.get({
+            siteId
+        }),
+        sdk.forProject(params.region, params.project).sites.getDeployment({
+            siteId,
+            deploymentId
+        }),
         sdk
             .forProject(params.region, params.project)
             .proxy.listRules([
diff --git a/src/routes/(console)/project-[region]-[project]/sites/create-site/finish/+page.ts b/src/routes/(console)/project-[region]-[project]/sites/create-site/finish/+page.ts
index cbd0c2d61..20c2cce2d 100644
--- a/src/routes/(console)/project-[region]-[project]/sites/create-site/finish/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/sites/create-site/finish/+page.ts
@@ -8,20 +8,22 @@ export const load = async ({ url, depends, params }) => {
     depends(Dependencies.SITE);
     if (!url.searchParams.has('site')) error(404, 'Deployment is not optional');
     const siteId = url.searchParams.get('site');
-    const site = await sdk.forProject(params.region, params.project).sites.get(siteId);
+    const site = await sdk.forProject(params.region, params.project).sites.get({ siteId });
     const proxyRuleList = await sdk
         .forProject(params.region, params.project)
-        .proxy.listRules([
-            Query.equal('type', RuleType.DEPLOYMENT),
-            Query.equal('deploymentResourceType', DeploymentResourceType.SITE),
-            Query.equal('deploymentResourceId', siteId),
-            Query.equal('deploymentId', site.deploymentId)
-        ]);
+        .proxy.listRules({
+            queries: [
+                Query.equal('type', RuleType.DEPLOYMENT),
+                Query.equal('deploymentResourceType', DeploymentResourceType.SITE),
+                Query.equal('deploymentResourceId', siteId),
+                Query.equal('deploymentId', site.deploymentId)
+            ]
+        });
     return {
         site,
         deployment: await sdk
             .forProject(params.region, params.project)
-            .sites.getDeployment(siteId, site.deploymentId),
+            .sites.getDeployment({ siteId, deploymentId: site.deploymentId }),
         proxyRuleList
     };
 };
diff --git a/src/routes/(console)/project-[region]-[project]/sites/create-site/repositories/repository-[repository]/+page.svelte b/src/routes/(console)/project-[region]-[project]/sites/create-site/repositories/repository-[repository]/+page.svelte
index f08f635a1..d13dfd98c 100644
--- a/src/routes/(console)/project-[region]-[project]/sites/create-site/repositories/repository-[repository]/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/sites/create-site/repositories/repository-[repository]/+page.svelte
@@ -139,7 +139,12 @@
 
             const deployment = await sdk
                 .forProject(page.params.region, page.params.project)
-                .sites.createVcsDeployment(site.$id, VCSDeploymentType.Branch, branch, true);
+                .sites.createVcsDeployment({
+                    siteId: site.$id,
+                    type: VCSDeploymentType.Branch,
+                    reference: branch,
+                    activate: true
+                });
 
             trackEvent(Submit.SiteCreate, {
                 source: 'repository',
diff --git a/src/routes/(console)/project-[region]-[project]/sites/create-site/repositories/repository-[repository]/+page.ts b/src/routes/(console)/project-[region]-[project]/sites/create-site/repositories/repository-[repository]/+page.ts
index de559a2f3..86dac0083 100644
--- a/src/routes/(console)/project-[region]-[project]/sites/create-site/repositories/repository-[repository]/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/sites/create-site/repositories/repository-[repository]/+page.ts
@@ -6,9 +6,10 @@ export const load = async ({ parent, params, url }) => {
     const { installations, frameworks, project, organization, regionalConsoleVariables } =
         await parent();
 
-    const repository = await sdk
-        .forProject(params.region, params.project)
-        .vcs.getRepository(url.searchParams.get('installation'), params.repository);
+    const repository = await sdk.forProject(params.region, params.project).vcs.getRepository({
+        installationId: url.searchParams.get('installation'),
+        providerRepositoryId: params.repository
+    });
 
     const installation = installations.installations.find(
         (installation) => installation.$id === url.searchParams.get('installation')
diff --git a/src/routes/(console)/project-[region]-[project]/sites/create-site/templates/+page.ts b/src/routes/(console)/project-[region]-[project]/sites/create-site/templates/+page.ts
index b8a017de5..c4a2f694e 100644
--- a/src/routes/(console)/project-[region]-[project]/sites/create-site/templates/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/sites/create-site/templates/+page.ts
@@ -10,7 +10,9 @@ export const load = async ({ url, params }) => {
 
     const siteTemplatesList = await sdk
         .forProject(params.region, params.project)
-        .sites.listTemplates(undefined, undefined, 100);
+        .sites.listTemplates({
+            limit: 100
+        });
 
     const useCasesSet = new Set<string>();
     const frameworksSet = new Set<string>();
diff --git a/src/routes/(console)/project-[region]-[project]/sites/grid.svelte b/src/routes/(console)/project-[region]-[project]/sites/grid.svelte
index 8621aa9ef..46b68f7cc 100644
--- a/src/routes/(console)/project-[region]-[project]/sites/grid.svelte
+++ b/src/routes/(console)/project-[region]-[project]/sites/grid.svelte
@@ -33,23 +33,13 @@
     }
 
     function getFilePreview(fileId: string) {
-        return sdk
-            .forConsoleIn(page.params.region)
-            .storage.getFilePreview(
-                'screenshots',
-                fileId,
-                1024,
-                576,
-                undefined,
-                undefined,
-                undefined,
-                undefined,
-                undefined,
-                undefined,
-                undefined,
-                undefined,
-                ImageFormat.Webp
-            );
+        return sdk.forConsoleIn(page.params.region).storage.getFilePreview({
+            bucketId: 'screenshots',
+            fileId,
+            width: 1024,
+            height: 576,
+            output: ImageFormat.Webp
+        });
     }
 </script>
 
diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/+layout.ts b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/+layout.ts
index b05c763f8..67abddfdf 100644
--- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/+layout.ts
+++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/+layout.ts
@@ -6,7 +6,7 @@ import { sdk } from '$lib/stores/sdk';
 export const load = async ({ depends, params }) => {
     depends(Dependencies.SITE);
     const [site] = await Promise.all([
-        sdk.forProject(params.region, params.project).sites.get(params.site)
+        sdk.forProject(params.region, params.project).sites.get({ siteId: params.site })
     ]);
 
     return {
diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/+page.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/+page.svelte
index af66889d3..1d2aa5569 100644
--- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/+page.svelte
@@ -63,7 +63,10 @@
 
         if (isCloud && apexDomain && !domain && !isSiteDomain) {
             try {
-                domain = await sdk.forConsole.domains.create($project.teamId, apexDomain);
+                domain = await sdk.forConsole.domains.create({
+                    teamId: $project.teamId,
+                    domain: apexDomain
+                });
             } catch (error) {
                 // apex might already be added on organization level, skip.
                 const alreadyAdded = error?.type === 'domain_already_exists';
diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/verify-[domain]/+page.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/verify-[domain]/+page.svelte
index 51ebc1552..eba843031 100644
--- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/verify-[domain]/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/verify-[domain]/+page.svelte
@@ -91,7 +91,9 @@
 
     async function back() {
         if (ruleId) {
-            await sdk.forProject(page.params.region, page.params.project).proxy.deleteRule(ruleId);
+            await sdk
+                .forProject(page.params.region, page.params.project)
+                .proxy.deleteRule({ ruleId });
         }
         await goto(`${routeBase}/add-domain?domain=${page.params.domain}`);
     }
diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/settings/+page.ts b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/settings/+page.ts
index 7d63b0597..1d856b016 100644
--- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/settings/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/settings/+page.ts
@@ -9,7 +9,9 @@ export const load = async ({ params, depends, parent }) => {
     const [globalVariables, variables, frameworks, installations, specificationsList] =
         await Promise.all([
             sdk.forProject(params.region, params.project).projectApi.listVariables(),
-            sdk.forProject(params.region, params.project).sites.listVariables(params.site),
+            sdk
+                .forProject(params.region, params.project)
+                .sites.listVariables({ siteId: params.site }),
             sdk.forProject(params.region, params.project).sites.listFrameworks(),
             sdk.forProject(params.region, params.project).vcs.listInstallations(),
             sdk.forProject(params.region, params.project).sites.listSpecifications()
diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/settings/deleteModal.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/settings/deleteModal.svelte
index a702286fd..5d0d7e284 100644
--- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/settings/deleteModal.svelte
+++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/settings/deleteModal.svelte
@@ -14,7 +14,9 @@
     let error: string;
     const handleSubmit = async () => {
         try {
-            await sdk.forProject(page.params.region, page.params.project).sites.delete(site.$id);
+            await sdk
+                .forProject(page.params.region, page.params.project)
+                .sites.delete({ siteId: site.$id });
             showDelete = false;
             addNotification({
                 type: 'success',
diff --git a/src/routes/(console)/project-[region]-[project]/storage/+page.ts b/src/routes/(console)/project-[region]-[project]/storage/+page.ts
index b68f763af..f83547708 100644
--- a/src/routes/(console)/project-[region]-[project]/storage/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/storage/+page.ts
@@ -10,12 +10,10 @@ export const load: PageLoad = async ({ url, route, params }) => {
     const view = getView(url, route, View.Grid);
     const limit = getLimit(url, route, CARD_LIMIT);
     const offset = pageToOffset(page, limit);
-    const buckets = await sdk
-        .forProject(params.region, params.project)
-        .storage.listBuckets(
-            [Query.limit(limit), Query.offset(offset), Query.orderDesc('')],
-            search || undefined
-        );
+    const buckets = await sdk.forProject(params.region, params.project).storage.listBuckets({
+        queries: [Query.limit(limit), Query.offset(offset), Query.orderDesc('')],
+        search: search || undefined
+    });
 
     return {
         offset,
diff --git a/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/+layout.ts b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/+layout.ts
index 776b5506f..f200e7eb6 100644
--- a/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/+layout.ts
+++ b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/+layout.ts
@@ -10,6 +10,8 @@ export const load: LayoutLoad = async ({ params, depends }) => {
     return {
         header: Header,
         breadcrumbs: Breadcrumbs,
-        bucket: await sdk.forProject(params.region, params.project).storage.getBucket(params.bucket)
+        bucket: await sdk.forProject(params.region, params.project).storage.getBucket({
+            bucketId: params.bucket
+        })
     };
 };
diff --git a/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/+page.ts b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/+page.ts
index 5c1076987..9ced56632 100644
--- a/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/+page.ts
@@ -11,13 +11,11 @@ export const load: PageLoad = async ({ params, depends, url, route }) => {
     const limit = getLimit(url, route, PAGE_LIMIT);
     const offset = pageToOffset(page, limit);
 
-    const files = await sdk
-        .forProject(params.region, params.project)
-        .storage.listFiles(
-            params.bucket,
-            [Query.limit(limit), Query.offset(offset), Query.orderDesc('')],
-            search
-        );
+    const files = await sdk.forProject(params.region, params.project).storage.listFiles({
+        bucketId: params.bucket,
+        queries: [Query.limit(limit), Query.offset(offset), Query.orderDesc('')],
+        search
+    });
 
     return {
         offset,
diff --git a/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/deleteBucket.svelte b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/deleteBucket.svelte
index b7053609b..36f31bcb5 100644
--- a/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/deleteBucket.svelte
+++ b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/deleteBucket.svelte
@@ -15,7 +15,7 @@
         try {
             await sdk
                 .forProject(page.params.region, page.params.project)
-                .storage.deleteBucket($bucket.$id);
+                .storage.deleteBucket({ bucketId: $bucket.$id });
             showDelete = false;
             addNotification({
                 type: 'success',
diff --git a/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/deleteFile.svelte b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/deleteFile.svelte
index 2008ccdc4..700768bb1 100644
--- a/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/deleteFile.svelte
+++ b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/deleteFile.svelte
@@ -14,9 +14,10 @@
 
     const onSubmit = async () => {
         try {
-            await sdk
-                .forProject(page.params.region, page.params.project)
-                .storage.deleteFile(file.bucketId, file.$id);
+            await sdk.forProject(page.params.region, page.params.project).storage.deleteFile({
+                bucketId: file.bucketId,
+                fileId: file.$id
+            });
             showDelete = false;
             dispatch('deleted', file);
             addNotification({
diff --git a/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/file-[file]/+layout.ts b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/file-[file]/+layout.ts
index 78eb76daf..673b97e75 100644
--- a/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/file-[file]/+layout.ts
+++ b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/file-[file]/+layout.ts
@@ -13,9 +13,9 @@ export const load: LayoutLoad = async ({ params, depends }) => {
         breadcrumbs: Breadcrumbs,
         file: await sdk
             .forProject(params.region, params.project)
-            .storage.getFile(params.bucket, params.file),
+            .storage.getFile({ bucketId: params.bucket, fileId: params.file }),
         tokens: await sdk
             .forProject(params.region, params.project)
-            .tokens.list(params.bucket, params.file)
+            .tokens.list({ bucketId: params.bucket, fileId: params.file })
     };
 };
diff --git a/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/file-[file]/+page.svelte b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/file-[file]/+page.svelte
index 56f178098..00e6cd2fd 100644
--- a/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/file-[file]/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/file-[file]/+page.svelte
@@ -99,7 +99,9 @@
 
     async function deleteFileToken(token: Models.ResourceToken) {
         try {
-            await sdk.forProject(page.params.region, page.params.project).tokens.delete(token.$id);
+            await sdk
+                .forProject(page.params.region, page.params.project)
+                .tokens.delete({ tokenId: token.$id });
             await invalidate(Dependencies.FILE_TOKENS);
             addNotification({
                 message: 'File token deleted',
@@ -144,7 +146,10 @@
         try {
             await sdk
                 .forProject(page.params.region, page.params.project)
-                .tokens.update(selectedFileToken.$id, fileToken.expire ? fileToken.expire : null);
+                .tokens.update({
+                    tokenId: selectedFileToken.$id,
+                    expire: fileToken.expire ? fileToken.expire : null
+                });
             await invalidate(Dependencies.FILE_TOKENS);
             addNotification({
                 message: 'File token updated',
diff --git a/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/file-[file]/deleteFile.svelte b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/file-[file]/deleteFile.svelte
index f560b76d3..4b086a222 100644
--- a/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/file-[file]/deleteFile.svelte
+++ b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/file-[file]/deleteFile.svelte
@@ -16,7 +16,7 @@
             const fileName = $file.name;
             await sdk
                 .forProject(page.params.region, page.params.project)
-                .storage.deleteFile($file.bucketId, $file.$id);
+                .storage.deleteFile({ bucketId: $file.bucketId, fileId: $file.$id });
             showDelete = false;
 
             addNotification({
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 07c8a40e8..fa736724f 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
@@ -22,20 +22,18 @@
         }
 
         try {
-            await sdk
-                .forProject(page.params.region, page.params.project)
-                .storage.updateBucket(
-                    values.$id,
-                    values.name,
-                    values.$permissions,
-                    values.fileSecurity,
-                    values.enabled,
-                    values.maximumFileSize,
-                    values.allowedFileExtensions,
-                    values.compression,
-                    values.encryption,
-                    values.antivirus
-                );
+            await sdk.forProject(page.params.region, page.params.project).storage.updateBucket({
+                bucketId: values.$id,
+                name: values.name,
+                permissions: values.$permissions,
+                fileSecurity: values.fileSecurity,
+                enabled: values.enabled,
+                maximumFileSize: values.maximumFileSize,
+                allowedFileExtensions: values.allowedFileExtensions,
+                compression: values.compression,
+                encryption: values.encryption,
+                antivirus: values.antivirus
+            });
 
             await invalidate(Dependencies.BUCKET);
 
diff --git a/src/routes/(public)/(guest)/login/+page.svelte b/src/routes/(public)/(guest)/login/+page.svelte
index 5baf2d4ec..db965e912 100644
--- a/src/routes/(public)/(guest)/login/+page.svelte
+++ b/src/routes/(public)/(guest)/login/+page.svelte
@@ -21,7 +21,10 @@
     async function login() {
         try {
             disabled = true;
-            await sdk.forConsole.account.createEmailPasswordSession(mail, pass);
+            await sdk.forConsole.account.createEmailPasswordSession({
+                email: mail,
+                password: pass
+            });
 
             if ($user) {
                 trackEvent(Submit.AccountLogin, { mfa_used: 'none' });
diff --git a/src/routes/(public)/(guest)/register/+page.svelte b/src/routes/(public)/(guest)/register/+page.svelte
index 37faff2df..dd36f0e62 100644
--- a/src/routes/(public)/(guest)/register/+page.svelte
+++ b/src/routes/(public)/(guest)/register/+page.svelte
@@ -29,8 +29,16 @@
     async function register() {
         try {
             disabled = true;
-            await sdk.forConsole.account.create(ID.unique(), mail, pass, name ?? '');
-            await sdk.forConsole.account.createEmailPasswordSession(mail, pass);
+            await sdk.forConsole.account.create({
+                userId: ID.unique(),
+                email: mail,
+                password: pass,
+                name: name ?? ''
+            });
+            await sdk.forConsole.account.createEmailPasswordSession({
+                email: mail,
+                password: pass
+            });
 
             trackEvent(Submit.AccountCreate, {
                 campaign_name: data?.couponData?.code,
diff --git a/src/routes/(public)/(guest)/register/invite/[slug]/+page.svelte b/src/routes/(public)/(guest)/register/invite/[slug]/+page.svelte
index 54a49e6c1..898d16358 100644
--- a/src/routes/(public)/(guest)/register/invite/[slug]/+page.svelte
+++ b/src/routes/(public)/(guest)/register/invite/[slug]/+page.svelte
@@ -71,11 +71,14 @@
             if (!res.ok) {
                 throw new Error((await res.json()).message);
             } else {
-                await sdk.forConsole.account.createEmailPasswordSession(mail, pass);
+                await sdk.forConsole.account.createEmailPasswordSession({
+                    email: mail,
+                    password: pass
+                });
                 const prefs = await sdk.forConsole.account.getPrefs();
                 const newPrefs = { ...prefs, code };
                 await Promise.all([
-                    sdk.forConsole.account.updatePrefs(newPrefs),
+                    sdk.forConsole.account.updatePrefs({ prefs: newPrefs }),
                     invalidate(Dependencies.ACCOUNT)
                 ]);
                 await goto(base);
diff --git a/src/routes/(public)/auth/preview/+page.svelte b/src/routes/(public)/auth/preview/+page.svelte
index 576f712ed..cda7409af 100644
--- a/src/routes/(public)/auth/preview/+page.svelte
+++ b/src/routes/(public)/auth/preview/+page.svelte
@@ -12,7 +12,7 @@
         const origin = params.get('origin');
         const path = params.get('path');
         try {
-            await sdk.forConsole.projects.get(projectId);
+            await sdk.forConsole.projects.get({ projectId });
             const jwt = await sdk.forConsole.account.createJWT();
             window.location.href = `${origin}/_appwrite/authorize?jwt=${jwt.jwt}&path=${path}`;
         } catch {
diff --git a/src/routes/(public)/auth/preview/access/+page.svelte b/src/routes/(public)/auth/preview/access/+page.svelte
index 568442923..33aa9b1b5 100644
--- a/src/routes/(public)/auth/preview/access/+page.svelte
+++ b/src/routes/(public)/auth/preview/access/+page.svelte
@@ -50,7 +50,10 @@
 
     async function login() {
         try {
-            await sdk.forConsole.account.createEmailPasswordSession(mail, pass);
+            await sdk.forConsole.account.createEmailPasswordSession({
+                email: mail,
+                password: pass
+            });
             await invalidate(Dependencies.ACCOUNT);
             trackEvent(Submit.AccountLogin);
 
@@ -63,8 +66,16 @@
 
     async function register() {
         try {
-            await sdk.forConsole.account.create(ID.unique(), mail, pass, name ?? '');
-            await sdk.forConsole.account.createEmailPasswordSession(mail, pass);
+            await sdk.forConsole.account.create({
+                userId: ID.unique(),
+                email: mail,
+                password: pass,
+                name: name ?? ''
+            });
+            await sdk.forConsole.account.createEmailPasswordSession({
+                email: mail,
+                password: pass
+            });
 
             await invalidate(Dependencies.ACCOUNT);
             trackEvent(Submit.AccountCreate);
diff --git a/src/routes/(public)/invite/+page.svelte b/src/routes/(public)/invite/+page.svelte
index cf4b837c4..99b77f1f3 100644
--- a/src/routes/(public)/invite/+page.svelte
+++ b/src/routes/(public)/invite/+page.svelte
@@ -22,7 +22,12 @@
 
     const acceptInvite = async () => {
         try {
-            await sdk.forConsole.teams.updateMembershipStatus(teamId, membershipId, userId, secret);
+            await sdk.forConsole.teams.updateMembershipStatus({
+                teamId,
+                membershipId,
+                userId,
+                secret
+            });
             addNotification({
                 type: 'success',
                 message: 'Successfully joined the organization.'
diff --git a/src/routes/(public)/recover/+page.svelte b/src/routes/(public)/recover/+page.svelte
index 1eac648d5..1fb21d9b8 100644
--- a/src/routes/(public)/recover/+page.svelte
+++ b/src/routes/(public)/recover/+page.svelte
@@ -24,7 +24,10 @@
 
     async function recover() {
         try {
-            await sdk.forConsole.account.createRecovery(email, window.location.toString());
+            await sdk.forConsole.account.createRecovery({
+                email,
+                url: window.location.toString()
+            });
             addNotification({
                 type: 'success',
                 message: 'We have sent you an email with a password reset link'
@@ -44,7 +47,11 @@
             if (password !== confirmPassword) {
                 throw new Error('Passwords do not match');
             }
-            await sdk.forConsole.account.updateRecovery(userId, secret, password);
+            await sdk.forConsole.account.updateRecovery({
+                userId,
+                secret,
+                password
+            });
             await goto(`${base}/login`);
             addNotification({
                 type: 'success',
diff --git a/src/routes/(public)/template-[template]/+page.svelte b/src/routes/(public)/template-[template]/+page.svelte
index 33d4d6ed6..b0e51481e 100644
--- a/src/routes/(public)/template-[template]/+page.svelte
+++ b/src/routes/(public)/template-[template]/+page.svelte
@@ -54,10 +54,9 @@
     }
 
     async function fetchProjects() {
-        projects = await sdk.forConsole.projects.list([
-            Query.equal('teamId', selectedOrg),
-            Query.orderDesc('')
-        ]);
+        projects = await sdk.forConsole.projects.list({
+            queries: [Query.equal('teamId', selectedOrg), Query.orderDesc('')]
+        });
         selectedProject = projects?.total ? projects.projects[0].$id : null;
     }
 
diff --git a/src/routes/(public)/template-[template]/+page.ts b/src/routes/(public)/template-[template]/+page.ts
index dad1d1a06..89e28c005 100644
--- a/src/routes/(public)/template-[template]/+page.ts
+++ b/src/routes/(public)/template-[template]/+page.ts
@@ -23,10 +23,14 @@ export const load = async ({ parent, url, params }) => {
 
     switch (product) {
         case 'function':
-            template = await sdk.forConsole.functions.getTemplate(params.template);
+            template = await sdk.forConsole.functions.getTemplate({
+                templateId: params.template
+            });
             break;
         case 'site':
-            template = await sdk.forConsole.sites.getTemplate(params.template);
+            template = await sdk.forConsole.sites.getTemplate({
+                templateId: params.template
+            });
             break;
         default:
             error(404, 'Type is not valid');
diff --git a/src/routes/+page.ts b/src/routes/+page.ts
index 436b401f7..ea9e97cb8 100644
--- a/src/routes/+page.ts
+++ b/src/routes/+page.ts
@@ -10,7 +10,7 @@ const handleGithubEducationMembership = async (name: string, email: string) => {
         if (result.error.code === 409) {
             redirect(303, `${base}/account/organizations`);
         } else {
-            await sdk.forConsole.account.deleteSession('current');
+            await sdk.forConsole.account.deleteSession({ sessionId: 'current' });
             redirect(
                 303,
                 `${base}/education/error?message=${result.error.message}&code=${result.error.code}`