diff --git a/examples/vue/src/views/ibc-transfer.vue b/examples/vue/src/views/ibc-transfer.vue
index 3f16e3377..512b92674 100644
--- a/examples/vue/src/views/ibc-transfer.vue
+++ b/examples/vue/src/views/ibc-transfer.vue
@@ -3,7 +3,6 @@ import { ref, computed } from 'vue'
 import { useChain, useWalletManager } from '@interchain-kit/vue';
 import { ibc } from 'osmojs'
 import { SigningStargateClient } from '@cosmjs/stargate'
-import { ExtensionWallet } from '@interchain-kit/core';
 
 const chainName = ref("cosmoshub")
 const { rpcEndpoint, chain } = useChain(chainName)
@@ -12,8 +11,7 @@ const signer = computed(() => {
   if (!chain.value.chainId) {
     return
   }
-  const wallet = wm.getCurrentWallet() as ExtensionWallet
-  return wallet.getOfflineSigner(chain.value.chainId, 'direct') // cosmoshub-4
+  return wm.value.getOfflineSigner(wm.value.currentWalletName, chainName.value) // cosmoshub-4
 })
 
 const transferMsg = ibc.applications.transfer.v1.MessageComposer.withTypeUrl.transfer({
diff --git a/examples/vue/src/views/use-chain-wallet.vue b/examples/vue/src/views/use-chain-wallet.vue
index 8337287f3..33f9fa6ed 100644
--- a/examples/vue/src/views/use-chain-wallet.vue
+++ b/examples/vue/src/views/use-chain-wallet.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { ref } from 'vue'
-import { useChainWallet, useWalletManager } from '@interchain-kit/vue';
+import { useChainWallet } from '@interchain-kit/vue';
 const junoChainName = ref('juno')
 const stargazeChainName = ref('stargaze')
 const keplrWalletName = ref('keplr-extension')
diff --git a/examples/vue/src/views/use-config.vue b/examples/vue/src/views/use-config.vue
index d7bb8aa1b..34da12346 100644
--- a/examples/vue/src/views/use-config.vue
+++ b/examples/vue/src/views/use-config.vue
@@ -1,20 +1,11 @@
 <script setup lang="ts">
-import { watch } from 'vue'
-import { useConfig, useWalletManager } from '@interchain-kit/vue';
+import { useConfig } from '@interchain-kit/vue';
 import { chain as stargazeChain, assetList as stargazeAssetList } from "chain-registry/mainnet/stargaze";
 
-const { updateChains, updateAssetLists } = useConfig()
-const walletManager = useWalletManager()
-
-const { chains, assetLists } = walletManager
-
-watch(walletManager, (wm) => {
-  console.log('wm>', wm)
-})
+const { addChains } = useConfig()
 
 const handleUpdate = () => {
-  updateChains([stargazeChain, ...chains])
-  updateAssetLists([stargazeAssetList, ...assetLists])
+  addChains([stargazeChain], [stargazeAssetList])
 }
 </script>
 
diff --git a/examples/vue/src/views/wallet-connect.vue b/examples/vue/src/views/wallet-connect.vue
index 7426ae4e7..1ffaa6e1a 100644
--- a/examples/vue/src/views/wallet-connect.vue
+++ b/examples/vue/src/views/wallet-connect.vue
@@ -1,25 +1,19 @@
 <script setup lang="ts">
 import { useAccount, useWalletManager } from '@interchain-kit/vue';
-import { BaseWallet, WCWallet } from '@interchain-kit/core';
 import VueQrcode from '@chenfengyuan/vue-qrcode';
-import { ref, computed, watch } from 'vue';
+import { ref, computed } from 'vue';
 
 const walletManager = useWalletManager()
 const chainName = ref('osmosis')
-const currentWallet = ref<WCWallet>(walletManager.wallets.find((w: BaseWallet) => w.info?.name === 'WalletConnect') as WCWallet)
-const walletName = computed(() => {
-  return currentWallet.value?.info?.name || ''
-})
-watch(walletManager, (wm: any) => {
-  currentWallet.value = wm.wallets.find((w: BaseWallet) => w.info?.name === 'WalletConnect')
-})
+const walletName = ref('WalletConnect')
+const pairingUri = computed(() => walletManager.value.walletConnectQRCodeUri)
 const account = useAccount(chainName, walletName)
 const connect = async() => {
-  await walletManager.connect('WalletConnect')
+  await walletManager.value.connect(walletName.value, chainName.value)
 }
 
 const disconnect = async() => {
-  await walletManager.disconnect('WalletConnect')
+  await walletManager.value.disconnect(walletName.value, chainName.value)
 }
 </script>
 
@@ -28,7 +22,7 @@ const disconnect = async() => {
     address: {{ account?.address }}
     <button @click="connect">connect</button>
     <button @click="disconnect">disconnect</button>
-    <vue-qrcode v-if="currentWallet?.pairingUri" :value="currentWallet?.pairingUri" :options="{ width: 200 }"></vue-qrcode>
+    <vue-qrcode v-if="pairingUri" :value="pairingUri" :options="{ width: 200 }"></vue-qrcode>
   </div>
 </template>
 
diff --git a/packages/vue/README.md b/packages/vue/README.md
index 75a148c4f..1d46a366d 100644
--- a/packages/vue/README.md
+++ b/packages/vue/README.md
@@ -184,10 +184,10 @@ const stargaze = useChainWallet(stargazeChainName, leapWalletName);
 const walletManager = useWalletManager()
 	
 const connectKeplr = async() => {
-  await walletManager.connect('keplr-extension')
+  await walletManager.value.connect('keplr-extension', 'juno')
 }
 const connectLeap = async() => {
-  await walletManager.connect('leap-extension')
+  await walletManager.value.connect('leap-extension', 'stargaze')
 }
 </script>
 
diff --git a/packages/vue/package.json b/packages/vue/package.json
index cce8dae75..105a6bdcd 100644
--- a/packages/vue/package.json
+++ b/packages/vue/package.json
@@ -29,6 +29,7 @@
   "dependencies": {
     "@chain-registry/types": "^2.0.1",
     "@interchain-kit/core": "workspace:*",
+    "@interchain-kit/store": "workspace:*",
     "@interchain-ui/vue": "^1.4.1",
     "@interchainjs/cosmos": "1.21.0",
     "@interchainjs/cosmos-types": "1.21.0",
diff --git a/packages/vue/src/ChainProvider.vue b/packages/vue/src/ChainProvider.vue
index 9d47ecc2b..74974f138 100644
--- a/packages/vue/src/ChainProvider.vue
+++ b/packages/vue/src/ChainProvider.vue
@@ -1,13 +1,13 @@
 <script setup lang="ts">
-import { ref, provide, defineProps, reactive } from 'vue'
+import { ref, provide, defineProps, shallowRef, triggerRef, onMounted, onUnmounted } from 'vue'
 import { Modal } from './modal'
 import { AssetList, Chain } from "@chain-registry/types";
 import {
   BaseWallet,
   SignerOptions,
-  WalletManager,
   EndpointOptions,
 } from "@interchain-kit/core";
+import { WalletManagerStore } from "@interchain-kit/store";
 import { WALLET_MANAGER_KEY, OPEN_MODAL_KEY, CLOSE_MODAL_KEY } from './utils/index'
 
 type InterchainWalletProviderProps = {
@@ -34,17 +34,21 @@ provide(CLOSE_MODAL_KEY, closeModal);
 
 const { chains, assetLists, wallets, signerOptions, endpointOptions } = props;
 
-// Make the walletManager instance reactive 
-// so that changes to any property of walletManager will immediately update currentWallet.
-// without needing to rerender the whole app like in React.
-const walletManager = reactive(new WalletManager(
+// State lives in the WalletManagerStore; every store update re-triggers the ref
+// so computeds reading through it re-evaluate.
+const walletManager = shallowRef(new WalletManagerStore(
   chains,
   assetLists,
   wallets,
   signerOptions,
   endpointOptions,
 ));
-walletManager.init();
+const unsubscribe = walletManager.value.subscribe(() => triggerRef(walletManager));
+
+onMounted(() => {
+  walletManager.value.init();
+});
+onUnmounted(unsubscribe);
 
 // injected globally
 provide(WALLET_MANAGER_KEY, walletManager)
diff --git a/packages/vue/src/composables/useAccount.ts b/packages/vue/src/composables/useAccount.ts
index 49100d1cc..05058c8a0 100644
--- a/packages/vue/src/composables/useAccount.ts
+++ b/packages/vue/src/composables/useAccount.ts
@@ -1,52 +1,9 @@
-import { ChainNameNotExist, WalletAccount, WalletState } from '@interchain-kit/core';
-import { computed, Ref, ref, watch } from 'vue';
-import { onMounted } from 'vue';
+import { WalletAccount } from '@interchain-kit/core';
+import { computed, ComputedRef, Ref } from 'vue';
 
 import { useWalletManager } from './useWalletManager';
 
-export const useAccount = (chainName: Ref<string>, walletName: Ref<string>): Ref<WalletAccount | null> => {
-  let account = ref<WalletAccount | null>(null);
+export const useAccount = (chainName: Ref<string>, walletName: Ref<string>): ComputedRef<WalletAccount | null> => {
   const walletManager = useWalletManager();
-
-  const wallet = computed(() => {
-    return walletManager.wallets.find(w => w.info.name === walletName.value);
-  });
-
-  const chain = computed(() => {
-    return walletManager.chains.find(c => c.chainName === chainName.value);
-  });
-
-  const getAccount = async () => {
-    if (!chain.value) {
-      console.error(`[useAccount] error: the chain ${chainName.value} was not found, please check if it was registered in ChainProvider`);
-      throw new ChainNameNotExist(chainName.value);
-    }
-    if (wallet.value && chain.value) {
-      if (wallet.value.walletState === WalletState.Connected) {
-        const act = await wallet.value.getAccount(chain.value.chainId) as WalletAccount;
-        account.value = act;
-      }
-      if (wallet.value.walletState === WalletState.Disconnected) {
-        account.value = null;
-      }
-    }
-    if (!wallet.value) {
-      account.value = null;
-    }
-  };
-
-  watch([wallet, chain, walletManager], getAccount);
-  watch(wallet, (newWt, oldWt) => {
-    if (newWt) {
-      oldWt?.events.off('accountChanged', getAccount);
-      newWt?.events.on('accountChanged', getAccount);
-    }
-  });
-  getAccount();
-
-  onMounted(() => {
-    wallet.value?.events.on('accountChanged', getAccount);
-  });
-
-  return account;
-};
\ No newline at end of file
+  return computed(() => walletManager.value.getChainWalletState(walletName.value, chainName.value)?.account ?? null);
+};
diff --git a/packages/vue/src/composables/useChain.ts b/packages/vue/src/composables/useChain.ts
index 3190184d9..33e8ad7a8 100644
--- a/packages/vue/src/composables/useChain.ts
+++ b/packages/vue/src/composables/useChain.ts
@@ -1,75 +1,51 @@
-import { AssetList, Chain } from '@chain-registry/types';
 import { ChainNameNotExist, WalletState } from '@interchain-kit/core';
-import { computed, inject, Ref, ref, watch } from 'vue';
+import { computed, inject, Ref } from 'vue';
 
 import { CosmosKitUseChainReturnType, UseChainReturnType } from '../types/chain';
 import { CLOSE_MODAL_KEY, OPEN_MODAL_KEY } from '../utils';
-import { useAccount } from './useAccount';
-import { useCurrentWallet } from './useCurrentWallet';
 import { useInterchainClient } from './useInterchainClient';
 import { useWalletManager } from './useWalletManager';
 
 export const useChain = (chainName: Ref<string>): UseChainReturnType => {
   const walletManager = useWalletManager();
-  const chainToShow = ref<Chain>();
-  const assetList = ref<AssetList>();
-  const getRpcEndpoint = ref();
-  const currentWallet = useCurrentWallet();
-  const walletName = computed<string>(() => currentWallet.value?.info?.name);
+  const walletName = computed<string>(() => walletManager.value.currentWalletName);
   const interchainClient = useInterchainClient(chainName, walletName);
-  const logoUrl = ref<string>('');
-  const account = useAccount(chainName, walletName);
-  const _setValuesByChainName = () => {
-    chainToShow.value = walletManager.chains.find((c: Chain) => c.chainName === chainName.value);
-    if (!chainToShow.value) {
+
+  const chain = computed(() => {
+    const c = walletManager.value.getChainByName(chainName.value);
+    if (!c) {
       throw new ChainNameNotExist(chainName.value);
     }
-    assetList.value = walletManager.assetLists.find((a: AssetList) => a.chainName === chainName.value);
-    logoUrl.value = walletManager.getChainLogoUrl(chainName.value);
-    getRpcEndpoint.value = async () => {
-      return await walletManager.getRpcEndpoint(currentWallet.value, chainName.value);
-    };
-  };
-
-  watch([chainName, walletManager], () => {
-    _setValuesByChainName();
+    return c;
   });
-  _setValuesByChainName();
+  const chainWalletState = computed(() => walletManager.value.getChainWalletState(walletName.value, chainName.value));
 
   const open = inject<() => void>(OPEN_MODAL_KEY);
   const close = inject<() => void>(CLOSE_MODAL_KEY);
 
-  const disconnect = computed(() => {
-    return () => {
-      walletManager.disconnect(currentWallet.value?.info?.name);
-    };
-  });
+  const openView = () => {
+    walletManager.value.setCurrentChainName(chainName.value);
+    open();
+  };
 
-  const cosmosKitUserChainReturnType: CosmosKitUseChainReturnType = {
-    connect: computed(() => {
-      return () => {
-        if (currentWallet.value?.walletState === WalletState.Connected) {
-          return;
-        }
-        open();
-      };
-    }),
-    disconnect,
-    openView: open,
+  const cosmosKitUseChainReturnType: CosmosKitUseChainReturnType = {
+    connect: computed(() => openView),
+    disconnect: computed(() => () => walletManager.value.disconnect(walletName.value, chainName.value)),
+    openView,
     closeView: close,
-    getRpcEndpoint,
-    status: computed(() => currentWallet.value?.walletState),
-    username: computed(() => account.value?.username),
-    message: computed(() => currentWallet.value?.errorMessage),
+    getRpcEndpoint: computed(() => () => walletManager.value.getRpcEndpoint(walletName.value, chainName.value)),
+    status: computed(() => chainWalletState.value?.walletState || WalletState.Disconnected),
+    username: computed(() => chainWalletState.value?.account?.username),
+    message: computed(() => chainWalletState.value?.errorMessage),
   };
 
   return {
-    logoUrl,
-    chain: chainToShow,
-    assetList,
-    address: computed(() => account.value?.address),
-    wallet: currentWallet,
+    logoUrl: computed(() => walletManager.value.getChainLogoUrl(chainName.value)),
+    chain,
+    assetList: computed(() => walletManager.value.getAssetListByName(chainName.value)),
+    address: computed(() => chainWalletState.value?.account?.address),
+    wallet: computed(() => walletManager.value.getChainWalletByName(walletName.value, chainName.value)),
     ...interchainClient,
-    ...cosmosKitUserChainReturnType,
+    ...cosmosKitUseChainReturnType,
   };
-};
\ No newline at end of file
+};
diff --git a/packages/vue/src/composables/useChainWallet.ts b/packages/vue/src/composables/useChainWallet.ts
index 1f6aa567a..52936ecb2 100644
--- a/packages/vue/src/composables/useChainWallet.ts
+++ b/packages/vue/src/composables/useChainWallet.ts
@@ -1,56 +1,31 @@
-import { AssetList, Chain } from '@chain-registry/types';
-import { BaseWallet } from '@interchain-kit/core';
-import { computed, Ref, ref, watch } from 'vue';
+import { computed, Ref } from 'vue';
 
 import { UseChainWalletReturnType } from '../types/chain';
-import { useAccount } from './useAccount';
 import { useInterchainClient } from './useInterchainClient';
 import { useWalletManager } from './useWalletManager';
 
 export const useChainWallet = (chainName: Ref<string>, walletName: Ref<string>): UseChainWalletReturnType => {
-  const logoUrl = ref<string>('');
   const walletManager = useWalletManager();
-  const chainToShow = ref<Chain>();
-  const assetList = ref<AssetList>();
-  const account = useAccount(chainName, walletName);
   const interchainClient = useInterchainClient(chainName, walletName);
-  const getRpcEndpoint = ref();
 
-  const wallet = computed(() => {
-    return walletManager.wallets.find((w: BaseWallet) => w.info.name === walletName.value);
-  });
-
-  const _setValues = () => {
-    logoUrl.value = walletManager.getChainLogoUrl(chainName.value);
-    chainToShow.value = walletManager.chains.find((c: Chain) => c.chainName === chainName.value);
-    assetList.value = walletManager.assetLists.find((a: AssetList) => a.chainName === chainName.value);
-    getRpcEndpoint.value = async () => {
-      await walletManager.getRpcEndpoint(wallet.value, walletName.value);
-    };
-  };
-
-  const connect = computed(() => {
-    return () => walletManager.connect(walletName.value);
-  });
-  const disconnect = computed(() => {
-    return () => walletManager.disconnect(walletName.value);
-  });
-
-  watch([chainName, walletName, walletManager], _setValues);
-  _setValues();
+  const chainWalletState = computed(() => walletManager.value.getChainWalletState(walletName.value, chainName.value));
 
   return {
-    connect,
-    disconnect,
-    getRpcEndpoint,
-    status: computed(() => wallet.value?.walletState),
-    username: computed(() => account.value?.username),
-    message: computed(() => wallet.value?.errorMessage),
-    logoUrl,
-    chain: chainToShow,
-    assetList,
-    address: computed(() => account.value?.address),
-    wallet,
+    connect: computed(() => async () => {
+      walletManager.value.setCurrentWalletName(walletName.value);
+      walletManager.value.setCurrentChainName(chainName.value);
+      await walletManager.value.connect(walletName.value, chainName.value);
+    }),
+    disconnect: computed(() => () => walletManager.value.disconnect(walletName.value, chainName.value)),
+    getRpcEndpoint: computed(() => () => walletManager.value.getRpcEndpoint(walletName.value, chainName.value)),
+    status: computed(() => chainWalletState.value?.walletState),
+    username: computed(() => chainWalletState.value?.account?.username),
+    message: computed(() => chainWalletState.value?.errorMessage),
+    logoUrl: computed(() => walletManager.value.getChainLogoUrl(chainName.value)),
+    chain: computed(() => walletManager.value.getChainByName(chainName.value)),
+    assetList: computed(() => walletManager.value.getAssetListByName(chainName.value)),
+    address: computed(() => chainWalletState.value?.account?.address),
+    wallet: computed(() => walletManager.value.getChainWalletByName(walletName.value, chainName.value)),
     ...interchainClient,
   };
-};
\ No newline at end of file
+};
diff --git a/packages/vue/src/composables/useConfig.ts b/packages/vue/src/composables/useConfig.ts
index 6cbd54054..a10ecf34d 100644
--- a/packages/vue/src/composables/useConfig.ts
+++ b/packages/vue/src/composables/useConfig.ts
@@ -2,13 +2,12 @@ import { AssetList, Chain } from '@chain-registry/types';
 import { EndpointOptions, SignerOptions } from '@interchain-kit/core';
 
 import { useWalletManager } from './useWalletManager';
+
 export const useConfig = () => {
   const walletManager = useWalletManager();
 
   return {
-    updateChains: (chains: Chain[]) => walletManager.chains = chains,
-    updateAssetLists: (assetLists: AssetList[]) => walletManager.assetLists = assetLists,
-    updateSignerOptions: (signerOptions: SignerOptions) => walletManager.signerOptions = signerOptions,
-    updateEndpoints: (endpointOptions: EndpointOptions) => walletManager.endpointOptions = endpointOptions,
+    addChains: (chains: Chain[], assetLists: AssetList[], signerOptions?: SignerOptions, endpointOptions?: EndpointOptions) =>
+      walletManager.value.addChains(chains, assetLists, signerOptions, endpointOptions),
   };
-};
\ No newline at end of file
+};
diff --git a/packages/vue/src/composables/useCurrentWallet.ts b/packages/vue/src/composables/useCurrentWallet.ts
index 35e85dff0..5360343af 100644
--- a/packages/vue/src/composables/useCurrentWallet.ts
+++ b/packages/vue/src/composables/useCurrentWallet.ts
@@ -1,17 +1,9 @@
-import { BaseWallet } from '@interchain-kit/core';
-import { ref, watch } from 'vue';
+import { WalletStore } from '@interchain-kit/store';
+import { computed, ComputedRef } from 'vue';
 
 import { useWalletManager } from './useWalletManager';
 
-export const useCurrentWallet = () => {
+export const useCurrentWallet = (): ComputedRef<WalletStore | undefined> => {
   const walletManager = useWalletManager();
-  const currentWallet = ref<BaseWallet>();
-
-  watch(walletManager, () => {
-    currentWallet.value = walletManager?.getCurrentWallet();
-    console.log('[walletManager changed]', currentWallet.value?.info?.name, currentWallet.value?.walletState);
-  });
-  currentWallet.value = walletManager.getCurrentWallet();
-
-  return currentWallet;
-};
\ No newline at end of file
+  return computed(() => walletManager.value.getWalletByName(walletManager.value.currentWalletName));
+};
diff --git a/packages/vue/src/composables/useInterchainClient.ts b/packages/vue/src/composables/useInterchainClient.ts
index 375e17bea..b040962fd 100644
--- a/packages/vue/src/composables/useInterchainClient.ts
+++ b/packages/vue/src/composables/useInterchainClient.ts
@@ -1,7 +1,6 @@
 import { WalletState } from '@interchain-kit/core';
 import { HttpEndpoint } from '@interchainjs/types';
-import { computed,Ref, ref, watch } from 'vue';
-import { onMounted } from 'vue';
+import { computed, Ref, ref, watch } from 'vue';
 
 import { SigningClient } from '../types';
 import { UseInterchainClientReturnType } from '../types/chain';
@@ -15,37 +14,32 @@ export function useInterchainClient(chainName: Ref<string>, walletName: Ref<stri
 
   const walletManager = useWalletManager();
 
-  const wallet = computed(() => {
-    return walletManager.wallets.find(w => w.info.name === walletName.value);
-  });
+  const chainWalletState = computed(() => walletManager.value.getChainWalletState(walletName.value, chainName.value));
 
   const initialize = async () => {
-    if (wallet.value && wallet.value?.walletState === WalletState.Connected) {
-      try {
-        isLoading.value = true;
-        rpcEndpoint.value = await walletManager.getRpcEndpoint(wallet.value, chainName.value);
-        signingClient.value = await walletManager.getSigningClient(walletName.value, chainName.value);
-      } catch (err) {
-        error.value = err;
-        console.log('create client error', err);
-      } finally {
-        isLoading.value = false;
-      }
+    const chain = walletManager.value.getChainByName(chainName.value);
+    if (chainWalletState.value?.walletState !== WalletState.Connected || chain?.chainType !== 'cosmos') {
+      signingClient.value = undefined;
+      return;
     }
-  };
-
-  watch([chainName, wallet, walletManager], initialize);
-  watch(wallet, (newWt, oldWt) => {
-    if (newWt) {
-      oldWt?.events.off('accountChanged', initialize);
-      newWt?.events.on('accountChanged', initialize);
+    try {
+      isLoading.value = true;
+      error.value = null;
+      rpcEndpoint.value = await walletManager.value.getRpcEndpoint(walletName.value, chainName.value);
+      signingClient.value = await walletManager.value.getSigningClient(walletName.value, chainName.value);
+    } catch (err) {
+      error.value = err;
+      console.log('create client error', err);
+    } finally {
+      isLoading.value = false;
     }
-  });
-  initialize();
+  };
 
-  onMounted(() => {
-    wallet.value?.events.on('accountChanged', initialize);
-  });
+  watch(
+    () => [chainName.value, walletName.value, chainWalletState.value?.walletState, chainWalletState.value?.account?.address],
+    initialize,
+    { immediate: true }
+  );
 
   return {
     rpcEndpoint,
@@ -53,4 +47,4 @@ export function useInterchainClient(chainName: Ref<string>, walletName: Ref<stri
     isLoading,
     error,
   };
-}
\ No newline at end of file
+}
diff --git a/packages/vue/src/composables/useOfflineSigner.ts b/packages/vue/src/composables/useOfflineSigner.ts
index b6718ea95..5d21b698c 100644
--- a/packages/vue/src/composables/useOfflineSigner.ts
+++ b/packages/vue/src/composables/useOfflineSigner.ts
@@ -1,19 +1,23 @@
-import { ICosmosGeneralOfflineSigner } from '@interchainjs/cosmos/types/wallet';
-import { Ref, ref, watch } from 'vue';
+import { WalletState } from '@interchain-kit/core';
+import { OfflineSigner } from '@interchainjs/cosmos';
+import { computed, Ref, ref, watch } from 'vue';
 
 import { useWalletManager } from './useWalletManager';
 
 export const useOfflineSigner = (chainName: Ref<string>, walletName: Ref<string>) => {
   const walletManager = useWalletManager();
-  const offlineSigner = ref<ICosmosGeneralOfflineSigner>();
+  const offlineSigner = ref<OfflineSigner>();
 
-  const _setValues = () => {
-    const wallet = walletManager.wallets.find((w) => w.info.name === walletName.value);
+  const walletState = computed(() => walletManager.value.getChainWalletState(walletName.value, chainName.value)?.walletState);
 
-    offlineSigner.value = walletManager.getOfflineSigner(wallet, chainName.value);
+  const _setValues = async () => {
+    if (walletState.value !== WalletState.Connected) {
+      offlineSigner.value = undefined;
+      return;
+    }
+    offlineSigner.value = await walletManager.value.getOfflineSigner(walletName.value, chainName.value);
   };
-  watch([chainName, walletName, walletManager], _setValues);
-  _setValues();
+  watch([chainName, walletName, walletState], _setValues, { immediate: true });
 
   return offlineSigner;
-};
\ No newline at end of file
+};
diff --git a/packages/vue/src/composables/useWalletManager.ts b/packages/vue/src/composables/useWalletManager.ts
index e10435bec..011ac9b8b 100644
--- a/packages/vue/src/composables/useWalletManager.ts
+++ b/packages/vue/src/composables/useWalletManager.ts
@@ -1,12 +1,12 @@
-import { WalletManager } from '@interchain-kit/core';
-import { inject, Reactive } from 'vue';
+import { WalletManagerStore } from '@interchain-kit/store';
+import { inject, ShallowRef } from 'vue';
 
 import { WALLET_MANAGER_KEY } from '../utils';
 
-export const useWalletManager = (): Reactive<WalletManager> => {
-  const wm = inject<Reactive<WalletManager>>(WALLET_MANAGER_KEY);
+export const useWalletManager = (): ShallowRef<WalletManagerStore> => {
+  const wm = inject<ShallowRef<WalletManagerStore>>(WALLET_MANAGER_KEY);
   if (!wm) {
-    console.error(`walletManager is undefined, did you foget to set ChainProvider?
+    throw new Error(`walletManager is undefined, did you forget to set ChainProvider?
     <ChainProvider
       :wallets="[keplrWallet, leapWallet, ...]"
       :chains="[osmosisChain, junoChain, ...]"
@@ -16,7 +16,6 @@ export const useWalletManager = (): Reactive<WalletManager> => {
     >
       <router-view>
     </ChainProvider>`);
-    return undefined;
   }
   return wm;
-};
\ No newline at end of file
+};
diff --git a/packages/vue/src/modal/modal.vue b/packages/vue/src/modal/modal.vue
index 79ae01964..ff55422e0 100644
--- a/packages/vue/src/modal/modal.vue
+++ b/packages/vue/src/modal/modal.vue
@@ -1,28 +1,28 @@
 <!-- Modal.vue -->
 <template>
-  <Modal :is-open="visible" @close="close">
+  <Modal :is-open="visible" :header="null" @close="close">
     <ConnectModalHead :title="title" :hasCloseButton="true" :hasBackButton="hasBack" @back="isList = true"
-      :closeButtonProps="closeButtonProps" />
+      :closeButtonProps="closeButtonProps" @close="close" />
     <ConnectModalWalletList v-if="isList" :wallets="wallets" @wallet-item-click="walletClick" />
     <ConnectModalQrcode 
-      v-else-if="currentWallet?.info?.mode === 'wallet-connect' && currentWallet?.pairingUri"
+      v-else-if="currentWallet?.info?.mode === 'wallet-connect' && pairingUri"
       status="Done" 
-      :link="currentWallet?.pairingUri"
+      :link="pairingUri"
       description="Open App to connect" 
       @onRefresh="onRefresh" 
-      qrCodeSize="230" 
+      :qrCodeSize="230" 
     />
     <!-- Connecting, Connected, Rejected -->
     <ConnectModalStatus 
       v-else 
       :wallet="{
-        name: currentWallet.info?.name,
-        prettyName: currentWallet.info?.prettyName,
-        logo: currentWallet.info?.logo as string,
-        mobileDisable: true
+        name: currentWallet?.info?.name,
+        prettyName: currentWallet?.info?.prettyName,
+        logo: currentWallet?.info?.logo as string,
+        mobileDisabled: true
       }" 
       :connected-info="connectedInfo" 
-      :status="currentWallet?.walletState" 
+      :status="walletState" 
       :content-header="contentHeader"
       :content-desc="contentDesc" 
       @connect="walletClick(currentWallet)" 
@@ -32,70 +32,64 @@
 </template>
 
 <script setup lang="ts">
-import { ref, onMounted, computed, Ref } from 'vue'
+import { ref, computed } from 'vue'
 import { useCurrentWallet, useWalletManager, useAccount } from '../composables'
-import { WalletState, WCWallet, } from '@interchain-kit/core';
+import { WalletState } from '@interchain-kit/core';
 import {
-  Box,
   Modal,
-  Button,
   ConnectModalQrcode,
-  ConnectModal,
   ConnectModalHead,
   ConnectModalWalletList,
   ConnectModalStatus
 } from "@interchain-ui/vue";
 
 const visible = ref(false);
-const wallets = ref({
-})
 const isList = ref(true)
 // Rejected
 const errorMessage = ref('')
 const walletManager = useWalletManager();
-const currentWallet = useCurrentWallet() as Ref<WCWallet>;
+const currentWallet = useCurrentWallet();
 const chainName = computed(() => {
-  return walletManager.chains[0].chainName
+  return walletManager.value.currentChainName || walletManager.value.chains[0].chainName
 })
 const walletName = computed(() => {
   return currentWallet.value?.info?.name
 })
 const account = useAccount(chainName, walletName)
-const onRefresh = () => walletManager.connect(currentWallet.value?.info?.name)
-
-onMounted(() => {
-  const res = walletManager.wallets.map((w) => {
-    return ({
-      name: w.info.name,
-      prettyName: w.info.prettyName,
-      logo: w.info.logo as string,
-      mobileDisabled: true,
-      shape: 'list' as 'list',
-      originalWallet: w
-    })
-  })
-  wallets.value = res
+const walletState = computed(() => {
+  return walletManager.value.getChainWalletState(walletName.value, chainName.value)?.walletState
 })
+const pairingUri = computed(() => walletManager.value.walletConnectQRCodeUri)
+const onRefresh = () => walletClick({ name: walletName.value })
+
+const wallets = computed(() => walletManager.value.wallets.map((w) => ({
+  name: w.info.name,
+  prettyName: w.info.prettyName,
+  logo: w.info.logo as string,
+  mobileDisabled: true,
+  shape: 'list' as 'list',
+  originalWallet: w
+})))
 
 const title = computed(() => {
   if (!currentWallet.value) {
     return 'Select your wallet'
   } else if (
-    [WalletState.Connecting, WalletState.Rejected, WalletState.Connected, WalletState.Disconnected].includes(currentWallet.value?.walletState)) {
+    [WalletState.Connecting, WalletState.Rejected, WalletState.Connected, WalletState.Disconnected].includes(walletState.value)) {
     return currentWallet.value?.info?.prettyName
   }
 })
 const contentHeader = computed(() => {
-  if (currentWallet.value?.walletState === WalletState.Connecting) {
+  if (walletState.value === WalletState.Connecting) {
     return 'Requesting Connection'
-  } else if (currentWallet.value?.walletState === WalletState.Rejected) {
+  } else if (walletState.value === WalletState.Rejected) {
     return 'Request Rejected'
   }
 })
 const contentDesc = computed(() => {
-  if (currentWallet.value?.walletState === WalletState.Connecting) {
+  if (walletState.value === WalletState.Connecting) {
     return `Open the ${currentWallet.value?.info?.prettyName} browser extension to connect your wallet.`
-  } else if (currentWallet.value?.walletState === WalletState.Rejected) {
+  } else if (walletState.value === WalletState.Rejected) {
     return errorMessage.value || 'Connection permission is denied.'
   }
 })
@@ -125,22 +119,25 @@ const closeButtonProps = {
   onClick: close
 }
 
-const walletClick = async (wallet: any) => {
+const getName = (wallet: { name?: string, info?: { name: string } }) => wallet?.name ?? wallet?.info?.name
+
+const walletClick = async (wallet: { name?: string, info?: { name: string } }) => {
+  const name = getName(wallet)
   isList.value = false
   try {
-    await walletManager.connect(wallet?.info.name)
-    isList.value = false
+    walletManager.value.setCurrentWalletName(name)
+    walletManager.value.setCurrentChainName(chainName.value)
+    await walletManager.value.connect(name, chainName.value)
     errorMessage.value = ''
-    // close()
   } catch (e: any) {
     errorMessage.value = e.message
     console.error('[wallet connecting error]', e.message)
   }
 }
 
-const disconnect = async (wallet: any) => {
+const disconnect = async (wallet: { name?: string, info?: { name: string } }) => {
   try {
-    await walletManager.disconnect(wallet?.info?.name as string);
+    await walletManager.value.disconnect(getName(wallet), chainName.value);
     close()
   } catch (e: any) {
     console.log('[wallet disconnecting error]', e.message)
diff --git a/packages/vue/src/types/chain.ts b/packages/vue/src/types/chain.ts
index 3672e3a58..e36936f78 100644
--- a/packages/vue/src/types/chain.ts
+++ b/packages/vue/src/types/chain.ts
@@ -1,29 +1,30 @@
 import { AssetList, Chain } from '@chain-registry/types';
-import { BaseWallet, WalletState } from '@interchain-kit/core';
+import { WalletState } from '@interchain-kit/core';
+import { ChainWalletStore } from '@interchain-kit/store';
 import { HttpEndpoint } from '@interchainjs/types';
 import { ComputedRef, Ref } from 'vue';
 
 import { SigningClient } from './sign-client';
 
 export type CosmosKitUseChainReturnType = {
-  connect: ComputedRef<() => void>
-  disconnect: ComputedRef<() => void>
+  connect: ComputedRef<() => void | Promise<void>>
+  disconnect: ComputedRef<() => Promise<void>>
   openView: () => void
   closeView: () => void
-  getRpcEndpoint: Ref<() => Promise<string | HttpEndpoint>>
+  getRpcEndpoint: ComputedRef<() => Promise<string | HttpEndpoint>>
   status: ComputedRef<WalletState>
-  username: ComputedRef<string>
-  message: ComputedRef<string>
+  username: ComputedRef<string | undefined>
+  message: ComputedRef<string | undefined>
 }
 
 export type UseChainReturnType = {
-  logoUrl: Ref<string | undefined>
-  chain: Ref<Chain>
-  assetList: Ref<AssetList>
-  address: ComputedRef<string>
-  wallet: Ref<BaseWallet>
+  logoUrl: ComputedRef<string | undefined>
+  chain: ComputedRef<Chain>
+  assetList: ComputedRef<AssetList>
+  address: ComputedRef<string | undefined>
+  wallet: ComputedRef<ChainWalletStore | undefined>
   rpcEndpoint: Ref<string | HttpEndpoint>
-  signingClient: Ref<SigningClient>
+  signingClient: Ref<SigningClient | undefined>
   isLoading: Ref<boolean>
   error: Ref<unknown>
 } & CosmosKitUseChainReturnType
@@ -35,4 +36,4 @@ export type UseInterchainClientReturnType = {
   signingClient: Ref<SigningClient | undefined>,
   isLoading: Ref<boolean>,
   error: Ref<string | unknown | null>
-}
\ No newline at end of file
+}
diff --git a/packages/vue/src/types/sign-client.ts b/packages/vue/src/types/sign-client.ts
index 499008d97..290f57404 100644
--- a/packages/vue/src/types/sign-client.ts
+++ b/packages/vue/src/types/sign-client.ts
@@ -1,3 +1,3 @@
-import { WalletManager } from '@interchain-kit/core';
+import { WalletManagerStore } from '@interchain-kit/store';
 
-export type SigningClient = Awaited<ReturnType<WalletManager['getSigningClient']>>
\ No newline at end of file
+export type SigningClient = Awaited<ReturnType<WalletManagerStore['getSigningClient']>>
diff --git a/packages/vue/tsconfig.json b/packages/vue/tsconfig.json
index 450efb5ac..42e32af1b 100644
--- a/packages/vue/tsconfig.json
+++ b/packages/vue/tsconfig.json
@@ -4,6 +4,7 @@
     "rootDir": "src/",
     // "outDir": "dist/esm",
     "module": "es2022",
+    "moduleResolution": "bundler",
     "declaration": true,
     "declarationDir": "dist/types",
     "emitDeclarationOnly": true,
diff --git a/packages/vue/vite.config.ts b/packages/vue/vite.config.ts
index 98ec51007..d1d76b56a 100644
--- a/packages/vue/vite.config.ts
+++ b/packages/vue/vite.config.ts
@@ -18,7 +18,7 @@ export default defineConfig({
       formats: ['es', 'umd'],
     },
     rollupOptions: {
-      external: ['vue', '@interchain-kit/core'],
+      external: ['vue', '@interchain-kit/core', '@interchain-kit/store'],
     },
   },
   resolve: {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index ba20531d9..726cfe3f6 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -680,6 +680,9 @@ importers:
       '@interchain-kit/core':
         specifier: workspace:*
         version: link:../core/dist
+      '@interchain-kit/store':
+        specifier: workspace:*
+        version: link:../store/dist
       '@interchain-ui/vue':
         specifier: ^1.4.1
         version: 1.4.3(@types/react@19.2.14)(@vueuse/core@14.2.1(vue@3.5.29(typescript@5.9.3)))(@vueuse/integrations@14.2.1(axios@1.13.6)(focus-trap@7.6.0)(idb-keyval@6.2.2)(qrcode@1.5.4)(vue@3.5.29(typescript@5.9.3)))(focus-trap@7.6.0)(react@19.2.4)(vue@3.5.29(typescript@5.9.3))
@@ -766,6 +769,9 @@ importers:
       '@interchain-kit/core':
         specifier: workspace:*
         version: link:../../packages/core/dist
+      '@interchainjs/amino':
+        specifier: 1.21.0
+        version: 1.21.0(@chain-registry/v2-types@0.53.146)(@chain-registry/v2@1.71.237)
       '@interchainjs/cosmos':
         specifier: 1.21.0
         version: 1.21.0(@chain-registry/v2-types@0.53.146)(@chain-registry/v2@1.71.237)(bufferutil@4.1.0)(utf-8-validate@5.0.10)
@@ -995,9 +1001,6 @@ importers:
       '@interchain-kit/core':
         specifier: workspace:*
         version: link:../../packages/core/dist
-      '@keplr-wallet/types':
-        specifier: ^0.13.11
-        version: 0.13.11(starknet@8.9.2)
       '@solana/web3.js':
         specifier: ^1.98.4
         version: 1.98.4(bufferutil@4.1.0)(encoding@0.1.13)(typescript@5.9.3)(utf-8-validate@5.0.10)
diff --git a/wallets/cosmos-extension-metamask/package.json b/wallets/cosmos-extension-metamask/package.json
index ef2576473..24b6837b4 100644
--- a/wallets/cosmos-extension-metamask/package.json
+++ b/wallets/cosmos-extension-metamask/package.json
@@ -34,6 +34,7 @@
     "@chain-registry/types": "^2.0.1",
     "@cosmjs/stargate": "^0.38.1",
     "@interchain-kit/core": "workspace:*",
+    "@interchainjs/amino": "1.21.0",
     "@interchainjs/cosmos": "1.21.0",
     "@interchainjs/types": "1.21.0"
   },
diff --git a/wallets/cosmos-extension-metamask/src/extension.ts b/wallets/cosmos-extension-metamask/src/extension.ts
index 277c7684e..d4ad27f9b 100644
--- a/wallets/cosmos-extension-metamask/src/extension.ts
+++ b/wallets/cosmos-extension-metamask/src/extension.ts
@@ -6,7 +6,8 @@ declare global {
   }
 }
 
-import { AminoSignResponse, DirectSignResponse,StdSignature } from '@interchainjs/cosmos/types/wallet';
+import { StdSignature } from '@interchainjs/amino';
+import { AminoSignResponse, DirectSignResponse } from '@interchainjs/cosmos';
 import { StdSignDoc } from '@interchainjs/types';
 
 import { Chain as MetaMaskCosmosChainInfo } from './types';
@@ -221,7 +222,8 @@ export class CosmosExtensionMetaMask extends CosmosWallet {
 
   async addSuggestChain(chainId: string): Promise<void> {
 
-    const chainInfo = getMetaMaskCosmosChainInfo(chain, this.assetLists[0]);
+    const chain = this.getChainById(chainId);
+    const chainInfo = getMetaMaskCosmosChainInfo(chain, this.getAssetListByChainId(chainId));
 
     await window.ethereum.request({
       method: 'wallet_invokeSnap',
diff --git a/wallets/leap-cosmos-extension-metamask/src/extension.ts b/wallets/leap-cosmos-extension-metamask/src/extension.ts
index 4f98dfffa..4321fa6fe 100644
--- a/wallets/leap-cosmos-extension-metamask/src/extension.ts
+++ b/wallets/leap-cosmos-extension-metamask/src/extension.ts
@@ -1,6 +1,5 @@
-import { AssetList,Chain } from '@chain-registry/types';
 import { CosmosWallet, DirectSignDoc, SignOptions, WalletAccount } from '@interchain-kit/core';
-import { AminoSignResponse } from '@interchainjs/cosmos/types/wallet';
+import { AminoSignResponse } from '@interchainjs/cosmos';
 import { StdSignDoc } from '@interchainjs/types';
 
 import { ChainInfo } from './types';
@@ -17,16 +16,10 @@ export class LeapCosmosExtensionMetaMask extends CosmosWallet {
   supportedChains: { [chainId: string]: ChainInfo } = {};
 
   async init() {
-    try {
-      if (!window.ethereum || window.ethereum.isMetaMask !== true) {
-        throw new Error('MetaMask is not installed');
-      }
-      this.supportedChains = await this.getSupportedChains();
-
-    } catch (error) {
-      this.errorMessage = (error as any).message;
-
+    if (!window.ethereum || window.ethereum.isMetaMask !== true) {
+      throw new Error('MetaMask is not installed');
     }
+    this.supportedChains = await this.getSupportedChains();
   }
 
   async getSupportedChains() {
@@ -151,8 +144,8 @@ export class LeapCosmosExtensionMetaMask extends CosmosWallet {
     });
   }
 
-  async addSuggestChain(chain: Chain, assetLists: AssetList[]): Promise<void> {
-
+  async addSuggestChain(chainId: string): Promise<void> {
+    const chain = this.getChainById(chainId);
     const chainInfo: ChainInfo = {
       chainId: chain.chainId,
       chainName: chain.prettyName,
diff --git a/wallets/mock-wallet/package.json b/wallets/mock-wallet/package.json
index 058f33a74..1091309d3 100644
--- a/wallets/mock-wallet/package.json
+++ b/wallets/mock-wallet/package.json
@@ -35,7 +35,6 @@
     "@cosmjs/amino": "^0.38.1",
     "@cosmjs/proto-signing": "^0.38.1",
     "@interchain-kit/core": "workspace:*",
-    "@keplr-wallet/types": "^0.13.11",
     "@solana/web3.js": "^1.98.4",
     "bip39": "^3.1.0",
     "bs58": "^6.0.0",
diff --git a/wallets/mock-wallet/src/ethereum-wallet.ts b/wallets/mock-wallet/src/ethereum-wallet.ts
index d05428ff0..780d1d07a 100644
--- a/wallets/mock-wallet/src/ethereum-wallet.ts
+++ b/wallets/mock-wallet/src/ethereum-wallet.ts
@@ -1,5 +1,5 @@
 import { EthereumWallet, Wallet, WalletAccount } from '@interchain-kit/core';
-import { Eip1193Provider, ethers, HDNodeWallet } from 'ethers';
+import { ethers, HDNodeWallet } from 'ethers';
 
 export interface MockEthereumNetwork {
   chainId: number;
@@ -178,8 +178,8 @@ export class MockEthereumWallet extends EthereumWallet {
     return signature;
   }
 
-  async getProvider(): Promise<Eip1193Provider | null> {
-    return this.provider;
+  async getProvider(): Promise<ethers.JsonRpcProvider> {
+    return this.walletMap[this.currentChainId][this.currentAccountIndex].provider;
   }
 
 
diff --git a/wallets/mock-wallet/src/wallet.ts b/wallets/mock-wallet/src/wallet.ts
index c7acafd3a..a341b66d8 100644
--- a/wallets/mock-wallet/src/wallet.ts
+++ b/wallets/mock-wallet/src/wallet.ts
@@ -1,8 +1,7 @@
 import { Chain } from '@chain-registry/types';
 import { OfflineAminoSigner, Secp256k1HdWallet } from '@cosmjs/amino';
 import { DirectSecp256k1HdWallet, OfflineDirectSigner } from '@cosmjs/proto-signing';
-import { BaseWallet, BroadcastMode, SimpleAccount, Wallet, WalletAccount } from '@interchain-kit/core';
-import { ChainInfo } from '@keplr-wallet/types';
+import { Algo, BaseWallet, BroadcastMode, SimpleAccount, Wallet, WalletAccount } from '@interchain-kit/core';
 
 export class MockWallet extends BaseWallet {
 
@@ -26,18 +25,15 @@ export class MockWallet extends BaseWallet {
     return Promise.resolve(undefined);
   }
 
-  async connect(chainIds: string[]): Promise<void> {
-    for (const chainId of chainIds) {
-      const chain = this.chains.find(c => c.chainId === chainId);
-      if (this.mnemonic) {
-        const wallet = await DirectSecp256k1HdWallet.fromMnemonic(this.mnemonic, { prefix: chain?.bech32Prefix });
-        this.walletMap[chainId] = wallet;
+  async connect(chainId: string): Promise<void> {
+    const chain = this.chains.find(c => c.chainId === chainId);
+    if (this.mnemonic) {
+      const wallet = await DirectSecp256k1HdWallet.fromMnemonic(this.mnemonic, { prefix: chain?.bech32Prefix });
+      this.walletMap[chainId] = wallet;
 
-        const animoWallet = await Secp256k1HdWallet.fromMnemonic(this.mnemonic, { prefix: chain?.bech32Prefix });
-        this.animoSignerMap[chainId] = animoWallet;
-      }
+      const animoWallet = await Secp256k1HdWallet.fromMnemonic(this.mnemonic, { prefix: chain?.bech32Prefix });
+      this.animoSignerMap[chainId] = animoWallet;
     }
-    return Promise.resolve(undefined);
   }
 
   disconnect(chainId: string | string[]): Promise<void> {
@@ -48,7 +44,7 @@ export class MockWallet extends BaseWallet {
   async getAccount(chainId: string): Promise<WalletAccount> {
     const wallet = this.animoSignerMap[chainId];
     const [firstAccount] = await wallet.getAccounts();
-    return firstAccount;
+    return { ...firstAccount, algo: firstAccount.algo as Algo };
   }
 
   getAccounts(chainIds: string[]): Promise<WalletAccount[]> {
@@ -63,7 +59,10 @@ export class MockWallet extends BaseWallet {
   sendTx(chainId: string, tx: Uint8Array, mode: BroadcastMode): Promise<Uint8Array> {
     throw new Error('Method not implemented.');
   }
-  addSuggestChain(chainInfo: ChainInfo): Promise<void> {
+  addSuggestChain(chainId: string): Promise<void> {
+    throw new Error('Method not implemented.');
+  }
+  getProvider(chainId: string): Promise<any> {
     throw new Error('Method not implemented.');
   }
   getOfflineSignerAmino(chainId: string): OfflineAminoSigner {