diff --git a/docs/docs/03-sdk/01-overview.md b/docs/docs/03-sdk/01-overview.md
index 4449abc..1889033 100644
--- a/docs/docs/03-sdk/01-overview.md
+++ b/docs/docs/03-sdk/01-overview.md
@@ -36,10 +36,10 @@ import { Sprinter } from '@chainsafe/sprinter-sdk';
 
 ### 2. Initialize the Sprinter SDK
 
-To initialize the SDK, create a new instance of the `Sprinter` class with an Ethereum provider:
+To initialize the SDK, create a new instance of the `Sprinter` class:
 
 ```typescript
-const sprinter = new Sprinter(window.ethereum);
+const sprinter = new Sprinter();
 ```
 
 ### 3. Fetch User Balances
@@ -47,7 +47,8 @@ const sprinter = new Sprinter(window.ethereum);
 Once initialized, you can fetch the user's balances across multiple blockchains:
 
 ```typescript
-sprinter.getUserBalances().then(console.log);
+const ownerAddress = "0x3E101Ec02e7A48D16DADE204C96bFF842E7E2519";
+sprinter.getUserBalances(ownerAddress).then(console.log);
 ```
 
 ### 4. Get Solution
@@ -69,14 +70,17 @@ Here's a more detailed example that combines all the basic operations:
 ```typescript
 import { Sprinter } from '@chainsafe/sprinter-sdk';
 
-const sprinter = new Sprinter(window.ethereum);
+const sprinter = new Sprinter();
+
+const ownerAddress = "0x3E101Ec02e7A48D16DADE204C96bFF842E7E2519";
 
 // Fetch user balances
-sprinter.getUserBalances().then(balances => {
+sprinter.getUserBalances(ownerAddress).then(balances => {
   console.log('User balances:', balances);
 
   // Get solution for transactions
   return sprinter.getSolution({
+    account: ownerAddress,
     token: "USDC",
     destinationChain: 42161,  // Destination chain ID
     amount: "1000000000"      // Amount in the smallest unit (e.g., wei)
diff --git a/docs/docs/03-sdk/02-advanced-usage.md b/docs/docs/03-sdk/02-advanced-usage.md
index d4b4c6f..3cf8960 100644
--- a/docs/docs/03-sdk/02-advanced-usage.md
+++ b/docs/docs/03-sdk/02-advanced-usage.md
@@ -11,7 +11,8 @@ The dApp is responsible for handling errors that occur during the transaction pr
 ### Example
 
 ```typescript
-sprinter.getUserBalances()
+const ownerAddress = "0x3E101Ec02e7A48D16DADE204C96bFF842E7E2519";
+sprinter.getUserBalances(ownerAddress)
   .then(balances => {
     console.log('User balances:', balances);
   })
@@ -31,7 +32,9 @@ The Sprinter SDK allows you to customize requests to suit your application's nee
 ### Example
 
 ```typescript
+const ownerAddress = "0x3E101Ec02e7A48D16DADE204C96bFF842E7E2519";
 sprinter.getSolution({
+  account: ownerAddress,
   token: "USDC",
   destinationChain: 42161,  // Destination chain ID
   amount: "1000000000"      // Amount in the smallest unit (e.g., wei)
@@ -58,12 +61,13 @@ async function integrateWithWeb3() {
   const web3 = new Web3(window.ethereum);
   const accounts = await web3.eth.requestAccounts();
 
-  const sprinter = new Sprinter(window.ethereum);
+  const sprinter = new Sprinter();
 
-  const balances = await sprinter.getUserBalances();
+  const balances = await sprinter.getUserBalances(accounts[0]);
   console.log('User balances:', balances);
 
   const solution = await sprinter.getSolution({
+    account: accounts[0],
     token: "USDC",
     destinationChain: 42161,
     amount: "1000000000"
diff --git a/docs/docs/03-sdk/03-class-reference.md b/docs/docs/03-sdk/03-class-reference.md
index 70e23b7..edba76a 100644
--- a/docs/docs/03-sdk/03-class-reference.md
+++ b/docs/docs/03-sdk/03-class-reference.md
@@ -8,18 +8,18 @@ This section details the methods available to the `Sprinter` class in the Sprint
 
 ## Methods
 
-### `constructor(provider: EIP1193Provider)`
+### `constructor(fetchOptions: Omit<FetchOptions, "signal">)`
 
 Initializes the SDK with the given Ethereum provider.
 
 #### Parameters
 
-- `provider`: An Ethereum provider instance conforming to the EIP-1193 standard (e.g., `window.ethereum`).
+- `fetchOptions`: TODO :Sad:
 
 #### Example
 
 ```typescript
-const sprinter = new Sprinter(window.ethereum);
+const sprinter = new Sprinter();
 ```
 
 ### `getAvailableTokens(): Promise<FungibleToken[]>`
@@ -54,12 +54,13 @@ sprinter.getAvailableChains().then(chains => {
 });
 ```
 
-### `getUserBalances(tokens?: FungibleToken[]): Promise<{ [symbol: TokenSymbol]: { balances: FungibleTokenBalance[]; total: string } }>`
+### `getUserBalances(account: Address, tokens?: FungibleToken[]): Promise<{ [symbol: TokenSymbol]: { balances: FungibleTokenBalance[]; total: string } }>`
 
 Fetches the user's balances for specified tokens across multiple blockchains. If no tokens are specified, it fetches balances for all available tokens.
 
 #### Parameters
 
+- `account`: Targeted account address.
 - `tokens`: An optional array of fungible token objects.
 
 #### Returns
@@ -69,24 +70,25 @@ Fetches the user's balances for specified tokens across multiple blockchains. If
 #### Example
 
 ```typescript
-sprinter.getUserBalances().then(balances => {
+const ownerAddress = "0x3E101Ec02e7A48D16DADE204C96bFF842E7E2519";
+sprinter.getUserBalances(ownerAddress).then(balances => {
   console.log('User balances:', balances);
 });
 ```
 
-### `getSolution(settings: Omit<SolutionOptions, "account">, targetAccount?: Address): Promise<SolutionResponse>`
+### `getSolution(settings: SolutionOptions): Promise<SolutionResponse>`
 
 Retrieves the optimal solution for managing cross-chain transactions based on the provided settings.
 
 #### Parameters
 
 - `settings`: An object containing the parameters for the solution request, excluding the account.
-    - `token`: The token symbol (e.g., "USDC").
-    - `destinationChain`: The ID of the destination blockchain.
-    - `amount`: The amount to be transferred.
-    - `threshold?`: An optional threshold parameter.
-    - `whitelistedSourceChains?`: An optional array of whitelisted source chain IDs.
-- `targetAccount`: An optional account address. If not provided, the current account will be used.
+  - `account`: Targeted account address.
+  - `token`: The token symbol (e.g., "USDC").
+  - `destinationChain`: The ID of the destination blockchain.
+  - `amount`: The amount to be transferred.
+  - `threshold?`: An optional threshold parameter.
+  - `whitelistedSourceChains?`: An optional array of whitelisted source chain IDs.
 
 #### Returns
 
@@ -95,7 +97,9 @@ Retrieves the optimal solution for managing cross-chain transactions based on th
 #### Example
 
 ```typescript
+const ownerAddress = "0x3E101Ec02e7A48D16DADE204C96bFF842E7E2519";
 sprinter.getSolution({
+  account: ownerAddress,
   token: "USDC",
   destinationChain: 42161,  // Destination chain ID
   amount: 1000000000        // Amount in the smallest unit (e.g., wei)
diff --git a/packages/sdk/README.md b/packages/sdk/README.md
index a505544..e3bbf07 100644
--- a/packages/sdk/README.md
+++ b/packages/sdk/README.md
@@ -25,9 +25,10 @@ The `Sprinter` class provides a convenient interface for interacting with the bl
 ```typescript
 import { Sprinter } from '@chainsafe/sprinter-sdk';
 
-const sprinter = new Sprinter(window.ethereum);
+const sprinter = new Sprinter();
 
-sprinter.getUserBalances().then(console.log);
+const ownerAddress = "0x3E101Ec02e7A48D16DADE204C96bFF842E7E2519";
+sprinter.getUserBalances(ownerAddress).then(console.log);
 ```
 
 ### Calling API Endpoints Directly
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index babc2ab..f02df56 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -13,7 +13,6 @@
   "devDependencies": {
     "@types/eslint": "^8.56.11",
     "@types/node": "18.19.42",
-    "eip1193-types": "^0.2.1",
     "eslint": "^8.57.0",
     "typescript": "^5.0.3"
   }
diff --git a/packages/sdk/src/index.ts b/packages/sdk/src/index.ts
index c4ec052..215090f 100644
--- a/packages/sdk/src/index.ts
+++ b/packages/sdk/src/index.ts
@@ -1,5 +1,3 @@
-import { EIP1193Provider } from "eip1193-types";
-
 import {
   getFungibleTokens,
   getSolution,
@@ -27,19 +25,13 @@ export * as api from "./api";
 export * from "./enums";
 
 class Sprinter {
-  #provider: EIP1193Provider;
-
-  // local "cache"
+  // in memory "cache"
   #tokens?: FungibleToken[];
   #chains?: Chain[];
 
   #fetchOptions: Omit<FetchOptions, "signal">;
 
-  constructor(
-    provider: EIP1193Provider,
-    fetchOptions: Omit<FetchOptions, "signal"> = {},
-  ) {
-    this.#provider = provider;
+  constructor(fetchOptions: Omit<FetchOptions, "signal"> = {}) {
     this.#fetchOptions = fetchOptions;
   }
 
@@ -60,13 +52,12 @@ class Sprinter {
   }
 
   public async getUserBalances(
+    account: Address,
     tokens?: FungibleToken[],
     options: FetchOptions = {},
   ): Promise<{
     [sybol: TokenSymbol]: { balances: FungibleTokenBalance[]; total: string };
   }> {
-    const account = await this.getAccount();
-
     const tokenList = tokens || (await this.getAvailableTokens(options));
 
     const balances = await Promise.all(
@@ -98,72 +89,47 @@ class Sprinter {
   }
 
   public async getSolution(
-    settings: Omit<ContractSolutionOptions, "account">,
-    targetAccount?: Address,
+    settings: ContractSolutionOptions,
     options?: FetchOptions,
   ): Promise<SolutionResponse>;
   public async getSolution(
-    settings: Omit<SolutionOptions, "account">,
-    targetAccount?: Address,
+    settings: SolutionOptions,
     options?: FetchOptions,
   ): Promise<SolutionResponse>;
   public async getSolution(
     settings: unknown,
-    targetAccount?: Address,
     options?: FetchOptions,
   ): Promise<SolutionResponse> {
-    const account = targetAccount || (await this.getAccount());
-
     if (typeof settings !== "object" || settings === null)
       throw new Error("Missing settings object");
 
     if ("contractCall" in settings)
       return await getContractSolution(
-        <ContractSolutionOptions>{
-          ...settings,
-          account,
-        },
+        <ContractSolutionOptions>settings,
         this.makeFetchOptions(options || {}),
       );
     return await getSolution(
-      <SolutionOptions>{ ...settings, account },
+      <SolutionOptions>settings,
       this.makeFetchOptions(options || {}),
     );
   }
 
   public async getCallSolution(
-    settings: Omit<ContractSolutionOptions, "account">,
-    targetAccount?: Address,
+    settings: ContractSolutionOptions,
     options?: FetchOptions,
   ): Promise<SolutionResponse> {
-    const account = targetAccount || (await this.getAccount());
-
     if (typeof settings !== "object" || settings === null)
       throw new Error("Missing settings object");
 
     return await getContractCallSolution(
-      <ContractSolutionOptions>{
-        ...settings,
-        account,
-      },
+      settings,
       this.makeFetchOptions(options || {}),
     );
   }
 
-  private async getAccount(): Promise<Address> {
-    const [account] = (await this.#provider.request({
-      method: "eth_requestAccounts",
-      params: [],
-    })) as Address[];
-    if (!account)
-      throw new Error("No available account! Check your provider or something");
-
-    return account;
-  }
-
   private makeFetchOptions(options: FetchOptions): FetchOptions {
     return { ...this.#fetchOptions, ...options };
   }
 }
 
-export { Sprinter, setBaseUrl, BASE_URL, EIP1193Provider };
+export { Sprinter, setBaseUrl, BASE_URL };
diff --git a/web/src/lib/components/Account.svelte b/web/src/lib/components/Account.svelte
index 4992e5b..c3727a7 100644
--- a/web/src/lib/components/Account.svelte
+++ b/web/src/lib/components/Account.svelte
@@ -1,5 +1,4 @@
 <script lang="ts">
-	import { selectedProvider } from '$lib/stores/wallet';
 	import {
 		type DrawerSettings,
 		getDrawerStore,
@@ -10,10 +9,10 @@
 	import { sprinterNameServiceAbi } from '$lib/sprinterNameService.abi';
 	import UpdateNameModal from '$lib/components/UpdateNameModal.svelte';
 	import { SPRINTER_SEPOLIA_ADDRESS } from '$lib/stores/sprinter';
+	import { selectedAccount } from '$lib/stores/wallet';
+	import type { Address } from '@chainsafe/sprinter-sdk';
 
-	$: address = $selectedProvider.provider.request({ method: 'eth_requestAccounts', params: [] });
-
-	async function getSprinterName(address: string): Promise<string> {
+	async function getSprinterName(): Promise<string> {
 		const SEPOLIA_RPC_PROVIDER = 'https://ethereum-sepolia-rpc.publicnode.com';
 		const web3 = new Web3(SEPOLIA_RPC_PROVIDER);
 
@@ -22,7 +21,7 @@
 			SPRINTER_SEPOLIA_ADDRESS
 		);
 
-		const name = await sprinterNameService.methods.names(address).call();
+		const name = await sprinterNameService.methods.names($selectedAccount as Address).call();
 		if (!name) throw new Error('Name not found!');
 		return name;
 	}
@@ -59,18 +58,12 @@
 		<div class="self-stretch justify-start items-start gap-2.5 inline-flex">
 			<div class="text-black dark:text-white text-xl font-medium font-['Inter'] leading-7">
 				Hello
-				{#await address}
-					0x....
-				{:then result}
-					{#await getSprinterName(result[0])}
-						{result[0]}
-					{:then name}
-						{name}
-					{:catch}
-						{result[0]}
-					{/await}
-				{:catch error}
-					- {JSON.stringify(error)}
+				{#await getSprinterName()}
+					{$selectedAccount}
+				{:then name}
+					{name}
+				{:catch}
+					{$selectedAccount}
 				{/await}
 			</div>
 		</div>
diff --git a/web/src/lib/components/Portfolio.svelte b/web/src/lib/components/Portfolio.svelte
index 404cb58..5dc1e76 100644
--- a/web/src/lib/components/Portfolio.svelte
+++ b/web/src/lib/components/Portfolio.svelte
@@ -4,11 +4,13 @@
 	import { getModalStore, type ModalSettings } from '@skeletonlabs/skeleton';
 	import TokenModal from '$lib/components/TokenModal.svelte';
 	import { sprinter } from '$lib/stores/sprinter';
+	import { selectedAccount } from '$lib/stores/wallet';
+	import type { Address } from '@chainsafe/sprinter-sdk';
 
 	const modalStore = getModalStore();
 
 	const tokens = $sprinter.getAvailableTokens();
-	const balances = $sprinter.getUserBalances();
+	const balances = $sprinter.getUserBalances($selectedAccount as Address);
 	const chains = $sprinter.getAvailableChains();
 
 	$: total = balances.then((b) =>
diff --git a/web/src/lib/components/SendTokensDrawer.svelte b/web/src/lib/components/SendTokensDrawer.svelte
index b60c392..e652f1c 100644
--- a/web/src/lib/components/SendTokensDrawer.svelte
+++ b/web/src/lib/components/SendTokensDrawer.svelte
@@ -14,9 +14,11 @@
 	import { sprinter } from '$lib/stores/sprinter';
 	import { getNetworkByChainId, getTokenBySymbol } from '$lib/utils';
 	import { type FungibleToken, type FungibleTokenBalance } from '@chainsafe/sprinter-sdk';
+	import { selectedAccount } from '$lib/stores/wallet';
+	import type { Address } from '@chainsafe/sprinter-sdk';
 
 	const tokens = $sprinter.getAvailableTokens();
-	const allBalances = $sprinter.getUserBalances();
+	const allBalances = $sprinter.getUserBalances($selectedAccount as Address);
 	const chains = $sprinter.getAvailableChains();
 
 	const drawerStore = getDrawerStore();
@@ -67,6 +69,7 @@
 				chains: await chains,
 				balances,
 				quota: {
+					account: $selectedAccount,
 					token: selectedToken,
 					destinationChain: selectedNetwork,
 					whitelisted,
diff --git a/web/src/lib/components/UpdateNameModal.svelte b/web/src/lib/components/UpdateNameModal.svelte
index c5e9973..f925744 100644
--- a/web/src/lib/components/UpdateNameModal.svelte
+++ b/web/src/lib/components/UpdateNameModal.svelte
@@ -3,13 +3,14 @@
 	import { getModalStore } from '@skeletonlabs/skeleton';
 	import { type Solution } from '@chainsafe/sprinter-sdk';
 	import { Contract } from 'web3';
-	import { selectedProvider } from '$lib/stores/wallet';
 	import { fromWei, toWei } from 'web3-utils';
 	import { sprinter, SPRINTER_SEPOLIA_ADDRESS } from '$lib/stores/sprinter';
 	import TransactionCard from '$lib/components/TransactionCard.svelte';
 	import { getNetworkByChainId, getTokenBySymbol } from '$lib/utils';
 	import SkullCrossbonesSolid from '$lib/icons/SkullCrossbonesSolid.svelte';
 	import { sprinterNameServiceAbi } from '$lib/sprinterNameService.abi';
+	import { selectedAccount } from '$lib/stores/wallet';
+	import type { Address } from '@chainsafe/sprinter-sdk';
 
 	// Props
 	/** Exposes parent props to this component. */
@@ -20,7 +21,9 @@
 	const token = $sprinter
 		.getAvailableTokens()
 		.then((response) => getTokenBySymbol(response, 'USDC'));
-	const balances = $sprinter.getUserBalances().then((response) => response['USDC'].balances ?? []);
+	const balances = $sprinter
+		.getUserBalances($selectedAccount as Address)
+		.then((response) => response['USDC'].balances ?? []);
 	const chains = $sprinter.getAvailableChains();
 
 	let name = '';
@@ -36,17 +39,17 @@
 
 	async function onNameSubmit() {
 		fetching = true;
-		const address = (
-			await $selectedProvider.provider.request({ method: 'eth_requestAccounts', params: [] })
-		)[0];
 
 		const amount = Number(toWei(donation, 6));
 		const sprinterNameService = new Contract(sprinterNameServiceAbi);
 
-		const data = sprinterNameService.methods.claimName(name, address, amount).encodeABI();
+		const data = sprinterNameService.methods
+			.claimName(name, $selectedAccount as Address, amount)
+			.encodeABI();
 
 		const response = await $sprinter.getCallSolution({
 			amount: amount,
+			account: $selectedAccount as Address,
 			token: 'USDC',
 			destinationChain: 11155111,
 			contractCall: {
diff --git a/web/src/lib/stores/wallet.ts b/web/src/lib/stores/wallet.ts
index 8e5f9f9..9dfa409 100644
--- a/web/src/lib/stores/wallet.ts
+++ b/web/src/lib/stores/wallet.ts
@@ -3,5 +3,7 @@ import { createStore, type EIP6963ProviderDetail } from 'mipd';
 
 export const selectedProvider = writable<false | EIP6963ProviderDetail>();
 
+export const selectedAccount = writable<false | string>();
+
 const store = createStore();
 export const providers = readable(store.getProviders(), store.subscribe);
diff --git a/web/src/routes/+layout.svelte b/web/src/routes/+layout.svelte
index 9874a83..d577a20 100644
--- a/web/src/routes/+layout.svelte
+++ b/web/src/routes/+layout.svelte
@@ -27,7 +27,7 @@
 	// Import the header and other components
 	import Header from '$lib/components/Header.svelte';
 
-	import { providers, selectedProvider } from '$lib/stores/wallet';
+	import { providers, selectedAccount, selectedProvider } from '$lib/stores/wallet';
 	import type { EIP6963ProviderDetail } from 'mipd';
 	import DrawerManager from '$lib/components/DrawerManager.svelte';
 
@@ -37,8 +37,12 @@
 
 		selecting = true;
 		try {
-			await provider.provider.request({ method: 'eth_requestAccounts', params: [] });
+			const accounts = await provider.provider.request({
+				method: 'eth_requestAccounts',
+				params: []
+			});
 
+			selectedAccount.set(accounts[0]);
 			selectedProvider.set(provider);
 		} finally {
 			selecting = false;
diff --git a/yarn.lock b/yarn.lock
index 0c21a60..8da5eb5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1790,7 +1790,6 @@ __metadata:
   dependencies:
     "@types/eslint": "npm:^8.56.11"
     "@types/node": "npm:18.19.42"
-    eip1193-types: "npm:^0.2.1"
     eslint: "npm:^8.57.0"
     typescript: "npm:^5.0.3"
   languageName: unknown
@@ -8313,13 +8312,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"eip1193-types@npm:^0.2.1":
-  version: 0.2.1
-  resolution: "eip1193-types@npm:0.2.1"
-  checksum: 10c0/423723535a890ab44d6b7c88815b9c8df48ec269f3386943fd37e6db55fcca11f9bc8b9fbae30f821db18c1b95d4a0631aa51d9a99a82d4f09bdcd43a766e2fc
-  languageName: node
-  linkType: hard
-
 "electron-to-chromium@npm:^1.5.4":
   version: 1.5.5
   resolution: "electron-to-chromium@npm:1.5.5"