diff --git a/aries/agents/rust/aries-vcx-agent/src/agent/agent_config.rs b/aries/agents/rust/aries-vcx-agent/src/agent/agent_config.rs
index 9d9c73cf01..715982dcf0 100644
--- a/aries/agents/rust/aries-vcx-agent/src/agent/agent_config.rs
+++ b/aries/agents/rust/aries-vcx-agent/src/agent/agent_config.rs
@@ -1,4 +1,6 @@
-use aries_vcx_core::wallet::indy::{IssuerConfig, WalletConfig};
+use aries_vcx_core::wallet::{
+    base_wallet::issuer_config::IssuerConfig, indy::wallet_config::WalletConfig,
+};
 
 #[derive(Clone)]
 pub struct AgentConfig {
diff --git a/aries/agents/rust/aries-vcx-agent/src/agent/agent_struct.rs b/aries/agents/rust/aries-vcx-agent/src/agent/agent_struct.rs
index 98f4f345e0..9685a20cbb 100644
--- a/aries/agents/rust/aries-vcx-agent/src/agent/agent_struct.rs
+++ b/aries/agents/rust/aries-vcx-agent/src/agent/agent_struct.rs
@@ -3,7 +3,7 @@ use std::sync::Arc;
 use aries_vcx_core::{
     anoncreds::credx_anoncreds::IndyCredxAnonCreds,
     ledger::indy_vdr_ledger::{DefaultIndyLedgerRead, DefaultIndyLedgerWrite},
-    wallet::indy::IndySdkWallet,
+    wallet::base_wallet::BaseWallet,
 };
 
 use crate::{
@@ -22,7 +22,7 @@ pub struct Agent {
     pub(super) ledger_read: Arc<DefaultIndyLedgerRead>,
     pub(super) ledger_write: Arc<DefaultIndyLedgerWrite>,
     pub(super) anoncreds: IndyCredxAnonCreds,
-    pub(super) wallet: Arc<IndySdkWallet>,
+    pub(super) wallet: Arc<dyn BaseWallet>,
     pub(super) config: AgentConfig,
     pub(super) connections: Arc<ServiceConnections>,
     pub(super) schemas: Arc<ServiceSchemas>,
@@ -49,7 +49,7 @@ impl Agent {
         &self.anoncreds
     }
 
-    pub fn wallet(&self) -> &IndySdkWallet {
+    pub fn wallet(&self) -> &Arc<dyn BaseWallet> {
         &self.wallet
     }
 
diff --git a/aries/agents/rust/aries-vcx-agent/src/agent/init.rs b/aries/agents/rust/aries-vcx-agent/src/agent/init.rs
index c693211dec..babf5f1671 100644
--- a/aries/agents/rust/aries-vcx-agent/src/agent/init.rs
+++ b/aries/agents/rust/aries-vcx-agent/src/agent/init.rs
@@ -11,10 +11,7 @@ use aries_vcx_core::{
     self,
     anoncreds::{base_anoncreds::BaseAnonCreds, credx_anoncreds::IndyCredxAnonCreds},
     ledger::indy_vdr_ledger::DefaultIndyLedgerRead,
-    wallet::indy::{
-        wallet::{create_and_open_wallet, wallet_configure_issuer},
-        IndySdkWallet, WalletConfig,
-    },
+    wallet::{base_wallet::ManageWallet, indy::wallet_config::WalletConfig},
 };
 use did_peer::resolver::PeerDidResolver;
 use did_resolver_registry::ResolverRegistry;
@@ -68,13 +65,13 @@ impl Agent {
             rekey_derivation_method: None,
         };
 
-        let wallet_handle = create_and_open_wallet(&config_wallet).await.unwrap();
-        let config_issuer = wallet_configure_issuer(wallet_handle, &init_config.enterprise_seed)
+        config_wallet.create_wallet().await.unwrap();
+        let wallet = config_wallet.open_wallet().await.unwrap();
+        let config_issuer = wallet
+            .configure_issuer(&init_config.enterprise_seed)
             .await
             .unwrap();
 
-        let wallet = Arc::new(IndySdkWallet::new(wallet_handle));
-
         use aries_vcx_core::ledger::indy_vdr_ledger::{build_ledger_components, VcxPoolConfig};
 
         info!("dev_build_profile_modular >>");
@@ -91,14 +88,14 @@ impl Agent {
         let ledger_write = Arc::new(ledger_write);
 
         anoncreds
-            .prover_create_link_secret(wallet.as_ref(), DEFAULT_LINK_SECRET_ALIAS)
+            .prover_create_link_secret(&wallet, DEFAULT_LINK_SECRET_ALIAS)
             .await
             .unwrap();
 
         // TODO: This setup should be easier
         // The default issuer did can't be used - its verkey is not in base58 - TODO: double-check
         let (public_did, _verkey) = add_new_did(
-            wallet.as_ref(),
+            &wallet,
             ledger_write.as_ref(),
             &config_issuer.institution_did.parse()?,
             None,
@@ -107,13 +104,7 @@ impl Agent {
         let endpoint = EndpointDidSov::create()
             .set_service_endpoint(init_config.service_endpoint.clone())
             .set_types(Some(vec![DidSovServiceType::DidCommunication]));
-        write_endpoint(
-            wallet.as_ref(),
-            ledger_write.as_ref(),
-            &public_did,
-            &endpoint,
-        )
-        .await?;
+        write_endpoint(&wallet, ledger_write.as_ref(), &public_did, &endpoint).await?;
 
         let did_peer_resolver = PeerDidResolver::new();
         let did_sov_resolver: DidSovResolver<Arc<DefaultIndyLedgerRead>, DefaultIndyLedgerRead> =
diff --git a/aries/agents/rust/aries-vcx-agent/src/services/connection.rs b/aries/agents/rust/aries-vcx-agent/src/services/connection.rs
index c956fc75b9..0920859f71 100644
--- a/aries/agents/rust/aries-vcx-agent/src/services/connection.rs
+++ b/aries/agents/rust/aries-vcx-agent/src/services/connection.rs
@@ -10,7 +10,9 @@ use aries_vcx::{
         pairwise_info::PairwiseInfo, Connection, GenericConnection, State, ThinState,
     },
 };
-use aries_vcx_core::{ledger::indy_vdr_ledger::DefaultIndyLedgerRead, wallet::indy::IndySdkWallet};
+use aries_vcx_core::{
+    ledger::indy_vdr_ledger::DefaultIndyLedgerRead, wallet::base_wallet::BaseWallet,
+};
 use url::Url;
 
 use crate::{
@@ -23,7 +25,7 @@ pub type ServiceEndpoint = Url;
 
 pub struct ServiceConnections {
     ledger_read: Arc<DefaultIndyLedgerRead>,
-    wallet: Arc<IndySdkWallet>,
+    wallet: Arc<dyn BaseWallet>,
     service_endpoint: ServiceEndpoint,
     connections: Arc<ObjectCache<GenericConnection>>,
 }
@@ -31,7 +33,7 @@ pub struct ServiceConnections {
 impl ServiceConnections {
     pub fn new(
         ledger_read: Arc<DefaultIndyLedgerRead>,
-        wallet: Arc<IndySdkWallet>,
+        wallet: Arc<dyn BaseWallet>,
         service_endpoint: ServiceEndpoint,
     ) -> Self {
         Self {
@@ -46,7 +48,7 @@ impl ServiceConnections {
         &self,
         pw_info: Option<PairwiseInfo>,
     ) -> AgentResult<AnyInvitation> {
-        let pw_info = pw_info.unwrap_or(PairwiseInfo::create(self.wallet.as_ref()).await?);
+        let pw_info = pw_info.unwrap_or(PairwiseInfo::create(&self.wallet).await?);
         let inviter = Connection::new_inviter("".to_owned(), pw_info)
             .create_invitation(vec![], self.service_endpoint.clone());
         let invite = inviter.get_invitation().clone();
@@ -58,7 +60,7 @@ impl ServiceConnections {
     }
 
     pub async fn receive_invitation(&self, invite: AnyInvitation) -> AgentResult<String> {
-        let pairwise_info = PairwiseInfo::create(self.wallet.as_ref()).await?;
+        let pairwise_info = PairwiseInfo::create(&self.wallet).await?;
         let invitee = Connection::new_invitee("".to_owned(), pairwise_info)
             .accept_invitation(self.ledger_read.as_ref(), invite)
             .await?;
@@ -75,7 +77,7 @@ impl ServiceConnections {
             .await?;
         let request = invitee.get_request().clone();
         invitee
-            .send_message(self.wallet.as_ref(), &request.into(), &VcxHttpClient)
+            .send_message(&self.wallet, &request.into(), &VcxHttpClient)
             .await?;
         self.connections.insert(thread_id, invitee.into())?;
         Ok(())
@@ -99,12 +101,7 @@ impl ServiceConnections {
         }?;
 
         let inviter = inviter
-            .handle_request(
-                self.wallet.as_ref(),
-                request,
-                self.service_endpoint.clone(),
-                vec![],
-            )
+            .handle_request(&self.wallet, request, self.service_endpoint.clone(), vec![])
             .await?;
 
         self.connections.insert(thread_id, inviter.into())?;
@@ -116,7 +113,7 @@ impl ServiceConnections {
         let inviter: Connection<_, _> = self.connections.get(thread_id)?.try_into()?;
         let response = inviter.get_connection_response_msg();
         inviter
-            .send_message(self.wallet.as_ref(), &response.into(), &VcxHttpClient)
+            .send_message(&self.wallet, &response.into(), &VcxHttpClient)
             .await?;
 
         self.connections.insert(thread_id, inviter.into())?;
@@ -126,9 +123,7 @@ impl ServiceConnections {
 
     pub async fn accept_response(&self, thread_id: &str, response: Response) -> AgentResult<()> {
         let invitee: Connection<_, _> = self.connections.get(thread_id)?.try_into()?;
-        let invitee = invitee
-            .handle_response(self.wallet.as_ref(), response)
-            .await?;
+        let invitee = invitee.handle_response(&self.wallet, response).await?;
 
         self.connections.insert(thread_id, invitee.into())?;
 
@@ -138,11 +133,7 @@ impl ServiceConnections {
     pub async fn send_ack(&self, thread_id: &str) -> AgentResult<()> {
         let invitee: Connection<_, _> = self.connections.get(thread_id)?.try_into()?;
         invitee
-            .send_message(
-                self.wallet.as_ref(),
-                &invitee.get_ack().into(),
-                &VcxHttpClient,
-            )
+            .send_message(&self.wallet, &invitee.get_ack().into(), &VcxHttpClient)
             .await?;
 
         self.connections.insert(thread_id, invitee.into())?;
diff --git a/aries/agents/rust/aries-vcx-agent/src/services/credential_definition.rs b/aries/agents/rust/aries-vcx-agent/src/services/credential_definition.rs
index 4ab02beb09..12a99000d9 100644
--- a/aries/agents/rust/aries-vcx-agent/src/services/credential_definition.rs
+++ b/aries/agents/rust/aries-vcx-agent/src/services/credential_definition.rs
@@ -4,7 +4,7 @@ use aries_vcx::common::primitives::credential_definition::{CredentialDef, Creden
 use aries_vcx_core::{
     anoncreds::credx_anoncreds::IndyCredxAnonCreds,
     ledger::indy_vdr_ledger::{DefaultIndyLedgerRead, DefaultIndyLedgerWrite},
-    wallet::indy::IndySdkWallet,
+    wallet::base_wallet::BaseWallet,
 };
 
 use crate::{
@@ -16,7 +16,7 @@ pub struct ServiceCredentialDefinitions {
     ledger_read: Arc<DefaultIndyLedgerRead>,
     ledger_write: Arc<DefaultIndyLedgerWrite>,
     anoncreds: IndyCredxAnonCreds,
-    wallet: Arc<IndySdkWallet>,
+    wallet: Arc<dyn BaseWallet>,
     cred_defs: ObjectCache<CredentialDef>,
 }
 
@@ -25,7 +25,7 @@ impl ServiceCredentialDefinitions {
         ledger_read: Arc<DefaultIndyLedgerRead>,
         ledger_write: Arc<DefaultIndyLedgerWrite>,
         anoncreds: IndyCredxAnonCreds,
-        wallet: Arc<IndySdkWallet>,
+        wallet: Arc<dyn BaseWallet>,
     ) -> Self {
         Self {
             cred_defs: ObjectCache::new("cred-defs"),
@@ -38,7 +38,7 @@ impl ServiceCredentialDefinitions {
 
     pub async fn create_cred_def(&self, config: CredentialDefConfig) -> AgentResult<String> {
         let cd = CredentialDef::create(
-            self.wallet.as_ref(),
+            &self.wallet,
             self.ledger_read.as_ref(),
             &self.anoncreds,
             "".to_string(),
@@ -53,7 +53,7 @@ impl ServiceCredentialDefinitions {
         let cred_def = self.cred_defs.get(thread_id)?;
         let cred_def = cred_def
             .publish_cred_def(
-                self.wallet.as_ref(),
+                &self.wallet,
                 self.ledger_read.as_ref(),
                 self.ledger_write.as_ref(),
             )
diff --git a/aries/agents/rust/aries-vcx-agent/src/services/did_exchange.rs b/aries/agents/rust/aries-vcx-agent/src/services/did_exchange.rs
index 40dd0db3e7..2ba6c9afdf 100644
--- a/aries/agents/rust/aries-vcx-agent/src/services/did_exchange.rs
+++ b/aries/agents/rust/aries-vcx-agent/src/services/did_exchange.rs
@@ -13,7 +13,9 @@ use aries_vcx::{
     },
     transport::Transport,
 };
-use aries_vcx_core::{ledger::indy_vdr_ledger::DefaultIndyLedgerRead, wallet::indy::IndySdkWallet};
+use aries_vcx_core::{
+    ledger::indy_vdr_ledger::DefaultIndyLedgerRead, wallet::base_wallet::BaseWallet,
+};
 use did_resolver_registry::ResolverRegistry;
 
 use super::connection::ServiceEndpoint;
@@ -26,7 +28,7 @@ use crate::{
 
 pub struct ServiceDidExchange {
     ledger_read: Arc<DefaultIndyLedgerRead>,
-    wallet: Arc<IndySdkWallet>,
+    wallet: Arc<dyn BaseWallet>,
     resolver_registry: Arc<ResolverRegistry>,
     service_endpoint: ServiceEndpoint,
     did_exchange: Arc<ObjectCache<GenericDidExchange>>,
@@ -36,7 +38,7 @@ pub struct ServiceDidExchange {
 impl ServiceDidExchange {
     pub fn new(
         ledger_read: Arc<DefaultIndyLedgerRead>,
-        wallet: Arc<IndySdkWallet>,
+        wallet: Arc<dyn BaseWallet>,
         resolver_registry: Arc<ResolverRegistry>,
         service_endpoint: ServiceEndpoint,
         public_did: String,
@@ -72,7 +74,7 @@ impl ServiceDidExchange {
         let ddo_their = requester.their_did_doc();
         let ddo_our = requester.our_did_document();
         let encryption_envelope =
-            pairwise_encrypt(ddo_our, ddo_their, self.wallet.as_ref(), &request.into()).await?;
+            pairwise_encrypt(ddo_our, ddo_their, &self.wallet, &request.into()).await?;
         VcxHttpClient
             .send_message(encryption_envelope.0, get_their_endpoint(ddo_their)?)
             .await?;
@@ -101,7 +103,7 @@ impl ServiceDidExchange {
         let invitation_key =
             resolve_key_from_invitation(&invitation, &self.resolver_registry).await?;
         let (responder, response) = GenericDidExchange::handle_request(
-            self.wallet.as_ref(),
+            &self.wallet,
             self.resolver_registry.clone(),
             request,
             self.service_endpoint.clone(),
@@ -113,7 +115,7 @@ impl ServiceDidExchange {
         let ddo_their = responder.their_did_doc();
         let ddo_our = responder.our_did_document();
         let encryption_envelope =
-            pairwise_encrypt(ddo_our, ddo_their, self.wallet.as_ref(), &response.into()).await?;
+            pairwise_encrypt(ddo_our, ddo_their, &self.wallet, &response.into()).await?;
         VcxHttpClient
             .send_message(encryption_envelope.0, get_their_endpoint(ddo_their)?)
             .await?;
@@ -130,7 +132,7 @@ impl ServiceDidExchange {
         let ddo_their = requester.their_did_doc();
         let ddo_our = requester.our_did_document();
         let encryption_envelope =
-            pairwise_encrypt(ddo_our, ddo_their, self.wallet.as_ref(), &complete.into()).await?;
+            pairwise_encrypt(ddo_our, ddo_their, &self.wallet, &complete.into()).await?;
         VcxHttpClient
             .send_message(encryption_envelope.0, get_their_endpoint(ddo_their)?)
             .await?;
diff --git a/aries/agents/rust/aries-vcx-agent/src/services/holder.rs b/aries/agents/rust/aries-vcx-agent/src/services/holder.rs
index 45a80b137b..f92630d9a6 100644
--- a/aries/agents/rust/aries-vcx-agent/src/services/holder.rs
+++ b/aries/agents/rust/aries-vcx-agent/src/services/holder.rs
@@ -13,7 +13,7 @@ use aries_vcx::{
 };
 use aries_vcx_core::{
     anoncreds::credx_anoncreds::IndyCredxAnonCreds, ledger::indy_vdr_ledger::DefaultIndyLedgerRead,
-    wallet::indy::IndySdkWallet,
+    wallet::base_wallet::BaseWallet,
 };
 
 use crate::{
@@ -41,7 +41,7 @@ impl HolderWrapper {
 pub struct ServiceCredentialsHolder {
     ledger_read: Arc<DefaultIndyLedgerRead>,
     anoncreds: IndyCredxAnonCreds,
-    wallet: Arc<IndySdkWallet>,
+    wallet: Arc<dyn BaseWallet>,
     creds_holder: ObjectCache<HolderWrapper>,
     service_connections: Arc<ServiceConnections>,
 }
@@ -50,7 +50,7 @@ impl ServiceCredentialsHolder {
     pub fn new(
         ledger_read: Arc<DefaultIndyLedgerRead>,
         anoncreds: IndyCredxAnonCreds,
-        wallet: Arc<IndySdkWallet>,
+        wallet: Arc<dyn BaseWallet>,
         service_connections: Arc<ServiceConnections>,
     ) -> Self {
         Self {
@@ -78,12 +78,11 @@ impl ServiceCredentialsHolder {
         propose_credential: ProposeCredentialV1,
     ) -> AgentResult<String> {
         let connection = self.service_connections.get_by_id(connection_id)?;
-        let wallet = self.wallet.as_ref();
 
         let mut holder = Holder::create("")?;
         holder.set_proposal(propose_credential.clone())?;
         connection
-            .send_message(wallet, &propose_credential.into(), &VcxHttpClient)
+            .send_message(&self.wallet, &propose_credential.into(), &VcxHttpClient)
             .await?;
 
         self.creds_holder.insert(
@@ -117,15 +116,19 @@ impl ServiceCredentialsHolder {
             (None, None) => return Err(AgentError::from_kind(AgentErrorKind::InvalidArguments)),
         };
         let connection = self.service_connections.get_by_id(&connection_id)?;
-        let wallet = self.wallet.as_ref();
+
         let pw_did = connection.pairwise_info().pw_did.to_string();
 
         let send_closure: SendClosure = Box::new(|msg: AriesMessage| {
-            Box::pin(async move { connection.send_message(wallet, &msg, &VcxHttpClient).await })
+            Box::pin(async move {
+                connection
+                    .send_message(&self.wallet, &msg, &VcxHttpClient)
+                    .await
+            })
         });
         let msg_response = holder
             .prepare_credential_request(
-                self.wallet.as_ref(),
+                &self.wallet,
                 self.ledger_read.as_ref(),
                 &self.anoncreds,
                 pw_did.parse()?,
@@ -146,11 +149,10 @@ impl ServiceCredentialsHolder {
         let mut holder = self.get_holder(thread_id)?;
         let connection_id = self.get_connection_id(thread_id)?;
         let connection = self.service_connections.get_by_id(&connection_id)?;
-        let wallet = self.wallet.as_ref();
 
         holder
             .process_credential(
-                self.wallet.as_ref(),
+                &self.wallet,
                 self.ledger_read.as_ref(),
                 &self.anoncreds,
                 msg_issue_credential.clone(),
@@ -160,9 +162,11 @@ impl ServiceCredentialsHolder {
             None => {}
             Some(msg_response) => {
                 let send_closure: SendClosure = Box::new(|msg: AriesMessage| {
-                    Box::pin(
-                        async move { connection.send_message(wallet, &msg, &VcxHttpClient).await },
-                    )
+                    Box::pin(async move {
+                        connection
+                            .send_message(&self.wallet, &msg, &VcxHttpClient)
+                            .await
+                    })
                 });
                 send_closure(msg_response).await?;
             }
diff --git a/aries/agents/rust/aries-vcx-agent/src/services/issuer.rs b/aries/agents/rust/aries-vcx-agent/src/services/issuer.rs
index 54c52f57c2..b1cc2e4500 100644
--- a/aries/agents/rust/aries-vcx-agent/src/services/issuer.rs
+++ b/aries/agents/rust/aries-vcx-agent/src/services/issuer.rs
@@ -11,7 +11,9 @@ use aries_vcx::{
     },
     protocols::{issuance::issuer::state_machine::IssuerState, SendClosure},
 };
-use aries_vcx_core::{anoncreds::credx_anoncreds::IndyCredxAnonCreds, wallet::indy::IndySdkWallet};
+use aries_vcx_core::{
+    anoncreds::credx_anoncreds::IndyCredxAnonCreds, wallet::base_wallet::BaseWallet,
+};
 
 use crate::{
     error::*,
@@ -37,7 +39,7 @@ impl IssuerWrapper {
 
 pub struct ServiceCredentialsIssuer {
     anoncreds: IndyCredxAnonCreds,
-    wallet: Arc<IndySdkWallet>,
+    wallet: Arc<dyn BaseWallet>,
     creds_issuer: ObjectCache<IssuerWrapper>,
     service_connections: Arc<ServiceConnections>,
 }
@@ -45,7 +47,7 @@ pub struct ServiceCredentialsIssuer {
 impl ServiceCredentialsIssuer {
     pub fn new(
         anoncreds: IndyCredxAnonCreds,
-        wallet: Arc<IndySdkWallet>,
+        wallet: Arc<dyn BaseWallet>,
         service_connections: Arc<ServiceConnections>,
     ) -> Self {
         Self {
@@ -92,13 +94,15 @@ impl ServiceCredentialsIssuer {
         };
         let connection = self.service_connections.get_by_id(&connection_id)?;
         issuer
-            .build_credential_offer_msg(self.wallet.as_ref(), &self.anoncreds, offer_info, None)
+            .build_credential_offer_msg(&self.wallet, &self.anoncreds, offer_info, None)
             .await?;
 
-        let wallet = self.wallet.as_ref();
-
         let send_closure: SendClosure = Box::new(|msg: AriesMessage| {
-            Box::pin(async move { connection.send_message(wallet, &msg, &VcxHttpClient).await })
+            Box::pin(async move {
+                connection
+                    .send_message(&self.wallet, &msg, &VcxHttpClient)
+                    .await
+            })
         });
 
         let credential_offer = issuer.get_credential_offer_msg()?;
@@ -146,14 +150,16 @@ impl ServiceCredentialsIssuer {
         } = self.creds_issuer.get(thread_id)?;
         let connection = self.service_connections.get_by_id(&connection_id)?;
 
-        let wallet = self.wallet.as_ref();
-
         let send_closure: SendClosure = Box::new(|msg: AriesMessage| {
-            Box::pin(async move { connection.send_message(wallet, &msg, &VcxHttpClient).await })
+            Box::pin(async move {
+                connection
+                    .send_message(&self.wallet, &msg, &VcxHttpClient)
+                    .await
+            })
         });
 
         issuer
-            .build_credential(self.wallet.as_ref(), &self.anoncreds)
+            .build_credential(&self.wallet, &self.anoncreds)
             .await?;
         match issuer.get_state() {
             IssuerState::Failed => {
diff --git a/aries/agents/rust/aries-vcx-agent/src/services/out_of_band.rs b/aries/agents/rust/aries-vcx-agent/src/services/out_of_band.rs
index 39c1925a2d..cf446be35b 100644
--- a/aries/agents/rust/aries-vcx-agent/src/services/out_of_band.rs
+++ b/aries/agents/rust/aries-vcx-agent/src/services/out_of_band.rs
@@ -18,7 +18,7 @@ use aries_vcx::{
     },
     protocols::did_exchange::state_machine::generate_keypair,
 };
-use aries_vcx_core::wallet::indy::IndySdkWallet;
+use aries_vcx_core::wallet::base_wallet::BaseWallet;
 use public_key::KeyType;
 use uuid::Uuid;
 
@@ -29,13 +29,13 @@ use crate::{
 };
 
 pub struct ServiceOutOfBand {
-    wallet: Arc<IndySdkWallet>,
+    wallet: Arc<dyn BaseWallet>,
     service_endpoint: ServiceEndpoint,
     out_of_band: Arc<ObjectCache<GenericOutOfBand>>,
 }
 
 impl ServiceOutOfBand {
-    pub fn new(wallet: Arc<IndySdkWallet>, service_endpoint: ServiceEndpoint) -> Self {
+    pub fn new(wallet: Arc<dyn BaseWallet>, service_endpoint: ServiceEndpoint) -> Self {
         Self {
             wallet,
             service_endpoint,
@@ -44,7 +44,7 @@ impl ServiceOutOfBand {
     }
 
     pub async fn create_invitation(&self) -> AgentResult<AriesMessage> {
-        let public_key = generate_keypair(self.wallet.as_ref(), KeyType::Ed25519).await?;
+        let public_key = generate_keypair(&self.wallet, KeyType::Ed25519).await?;
         let service = {
             let service_id = Uuid::new_v4().to_string();
             ServiceSov::DIDCommV1(ServiceDidCommV1::new(
diff --git a/aries/agents/rust/aries-vcx-agent/src/services/prover.rs b/aries/agents/rust/aries-vcx-agent/src/services/prover.rs
index 243a957125..c6d965dd74 100644
--- a/aries/agents/rust/aries-vcx-agent/src/services/prover.rs
+++ b/aries/agents/rust/aries-vcx-agent/src/services/prover.rs
@@ -15,7 +15,7 @@ use aries_vcx::{
 };
 use aries_vcx_core::{
     anoncreds::credx_anoncreds::IndyCredxAnonCreds, ledger::indy_vdr_ledger::DefaultIndyLedgerRead,
-    wallet::indy::IndySdkWallet,
+    wallet::base_wallet::BaseWallet,
 };
 use serde_json::Value;
 
@@ -44,7 +44,7 @@ impl ProverWrapper {
 pub struct ServiceProver {
     ledger_read: Arc<DefaultIndyLedgerRead>,
     anoncreds: IndyCredxAnonCreds,
-    wallet: Arc<IndySdkWallet>,
+    wallet: Arc<dyn BaseWallet>,
     provers: ObjectCache<ProverWrapper>,
     service_connections: Arc<ServiceConnections>,
 }
@@ -53,7 +53,7 @@ impl ServiceProver {
     pub fn new(
         ledger_read: Arc<DefaultIndyLedgerRead>,
         anoncreds: IndyCredxAnonCreds,
-        wallet: Arc<IndySdkWallet>,
+        wallet: Arc<dyn BaseWallet>,
         service_connections: Arc<ServiceConnections>,
     ) -> Self {
         Self {
@@ -81,7 +81,7 @@ impl ServiceProver {
         tails_dir: Option<&str>,
     ) -> AgentResult<SelectedCredentials> {
         let credentials = prover
-            .retrieve_credentials(self.wallet.as_ref(), &self.anoncreds)
+            .retrieve_credentials(&self.wallet, &self.anoncreds)
             .await?;
 
         let mut res_credentials = SelectedCredentials::default();
@@ -118,7 +118,7 @@ impl ServiceProver {
         let connection = self.service_connections.get_by_id(connection_id)?;
         let mut prover = Prover::create("")?;
 
-        let wallet = self.wallet.as_ref();
+        let wallet = &self.wallet;
 
         let send_closure: SendClosure = Box::new(|msg: AriesMessage| {
             Box::pin(async move { connection.send_message(wallet, &msg, &VcxHttpClient).await })
@@ -154,7 +154,7 @@ impl ServiceProver {
             .await?;
         prover
             .generate_presentation(
-                self.wallet.as_ref(),
+                &self.wallet,
                 self.ledger_read.as_ref(),
                 &self.anoncreds,
                 credentials,
@@ -162,7 +162,7 @@ impl ServiceProver {
             )
             .await?;
 
-        let wallet = self.wallet.as_ref();
+        let wallet = &self.wallet;
 
         let send_closure: SendClosure = Box::new(|msg: AriesMessage| {
             Box::pin(async move { connection.send_message(wallet, &msg, &VcxHttpClient).await })
diff --git a/aries/agents/rust/aries-vcx-agent/src/services/revocation_registry.rs b/aries/agents/rust/aries-vcx-agent/src/services/revocation_registry.rs
index c9808e6e90..398d354ccf 100644
--- a/aries/agents/rust/aries-vcx-agent/src/services/revocation_registry.rs
+++ b/aries/agents/rust/aries-vcx-agent/src/services/revocation_registry.rs
@@ -8,7 +8,7 @@ use aries_vcx::{common::primitives::revocation_registry::RevocationRegistry, did
 use aries_vcx_core::{
     anoncreds::credx_anoncreds::IndyCredxAnonCreds,
     ledger::indy_vdr_ledger::{DefaultIndyLedgerRead, DefaultIndyLedgerWrite},
-    wallet::indy::IndySdkWallet,
+    wallet::base_wallet::BaseWallet,
 };
 
 use crate::{
@@ -20,7 +20,7 @@ pub struct ServiceRevocationRegistries {
     ledger_write: Arc<DefaultIndyLedgerWrite>,
     ledger_read: Arc<DefaultIndyLedgerRead>,
     anoncreds: IndyCredxAnonCreds,
-    wallet: Arc<IndySdkWallet>,
+    wallet: Arc<dyn BaseWallet>,
     issuer_did: Did,
     rev_regs: ObjectCache<RevocationRegistry>,
 }
@@ -30,7 +30,7 @@ impl ServiceRevocationRegistries {
         ledger_write: Arc<DefaultIndyLedgerWrite>,
         ledger_read: Arc<DefaultIndyLedgerRead>,
         anoncreds: IndyCredxAnonCreds,
-        wallet: Arc<IndySdkWallet>,
+        wallet: Arc<dyn BaseWallet>,
         issuer_did: String,
     ) -> Self {
         Self {
@@ -59,7 +59,7 @@ impl ServiceRevocationRegistries {
         max_creds: u32,
     ) -> AgentResult<String> {
         let rev_reg = RevocationRegistry::create(
-            self.wallet.as_ref(),
+            &self.wallet,
             &self.anoncreds,
             &self.issuer_did,
             cred_def_id,
@@ -87,11 +87,7 @@ impl ServiceRevocationRegistries {
     pub async fn publish_rev_reg(&self, thread_id: &str, tails_url: &str) -> AgentResult<()> {
         let mut rev_reg = self.rev_regs.get(thread_id)?;
         rev_reg
-            .publish_revocation_primitives(
-                self.wallet.as_ref(),
-                self.ledger_write.as_ref(),
-                tails_url,
-            )
+            .publish_revocation_primitives(&self.wallet, self.ledger_write.as_ref(), tails_url)
             .await?;
         self.rev_regs.insert(thread_id, rev_reg)?;
         Ok(())
@@ -101,7 +97,7 @@ impl ServiceRevocationRegistries {
         let rev_reg = self.rev_regs.get(id)?;
         rev_reg
             .revoke_credential_local(
-                self.wallet.as_ref(),
+                &self.wallet,
                 &self.anoncreds,
                 self.ledger_read.as_ref(),
                 cred_rev_id.parse()?,
@@ -114,7 +110,7 @@ impl ServiceRevocationRegistries {
         let rev_reg = self.rev_regs.get(id)?;
         rev_reg
             .publish_local_revocations(
-                self.wallet.as_ref(),
+                &self.wallet,
                 &self.anoncreds,
                 self.ledger_write.as_ref(),
                 &self.issuer_did,
diff --git a/aries/agents/rust/aries-vcx-agent/src/services/schema.rs b/aries/agents/rust/aries-vcx-agent/src/services/schema.rs
index bd4bf4967e..59e9d156d7 100644
--- a/aries/agents/rust/aries-vcx-agent/src/services/schema.rs
+++ b/aries/agents/rust/aries-vcx-agent/src/services/schema.rs
@@ -7,7 +7,7 @@ use aries_vcx_core::{
         base_ledger::AnoncredsLedgerRead,
         indy_vdr_ledger::{DefaultIndyLedgerRead, DefaultIndyLedgerWrite},
     },
-    wallet::indy::IndySdkWallet,
+    wallet::base_wallet::BaseWallet,
 };
 
 use crate::{
@@ -19,7 +19,7 @@ pub struct ServiceSchemas {
     ledger_read: Arc<DefaultIndyLedgerRead>,
     ledger_write: Arc<DefaultIndyLedgerWrite>,
     anoncreds: IndyCredxAnonCreds,
-    wallet: Arc<IndySdkWallet>,
+    wallet: Arc<dyn BaseWallet>,
     issuer_did: Did,
     schemas: ObjectCache<Schema>,
 }
@@ -29,7 +29,7 @@ impl ServiceSchemas {
         ledger_read: Arc<DefaultIndyLedgerRead>,
         ledger_write: Arc<DefaultIndyLedgerWrite>,
         anoncreds: IndyCredxAnonCreds,
-        wallet: Arc<IndySdkWallet>,
+        wallet: Arc<dyn BaseWallet>,
         issuer_did: String,
     ) -> Self {
         Self {
@@ -64,7 +64,7 @@ impl ServiceSchemas {
     pub async fn publish_schema(&self, thread_id: &str) -> AgentResult<()> {
         let schema = self.schemas.get(thread_id)?;
         let schema = schema
-            .publish(self.wallet.as_ref(), self.ledger_write.as_ref())
+            .publish(&self.wallet, self.ledger_write.as_ref())
             .await?;
         self.schemas.insert(thread_id, schema)?;
         Ok(())
diff --git a/aries/agents/rust/aries-vcx-agent/src/services/verifier.rs b/aries/agents/rust/aries-vcx-agent/src/services/verifier.rs
index ebb3169f0d..20daeeb496 100644
--- a/aries/agents/rust/aries-vcx-agent/src/services/verifier.rs
+++ b/aries/agents/rust/aries-vcx-agent/src/services/verifier.rs
@@ -18,7 +18,7 @@ use aries_vcx::{
 };
 use aries_vcx_core::{
     anoncreds::credx_anoncreds::IndyCredxAnonCreds, ledger::indy_vdr_ledger::DefaultIndyLedgerRead,
-    wallet::indy::IndySdkWallet,
+    wallet::base_wallet::BaseWallet,
 };
 
 use super::connection::ServiceConnections;
@@ -46,7 +46,7 @@ impl VerifierWrapper {
 pub struct ServiceVerifier {
     ledger_read: Arc<DefaultIndyLedgerRead>,
     anoncreds: IndyCredxAnonCreds,
-    wallet: Arc<IndySdkWallet>,
+    wallet: Arc<dyn BaseWallet>,
     verifiers: ObjectCache<VerifierWrapper>,
     service_connections: Arc<ServiceConnections>,
 }
@@ -55,7 +55,7 @@ impl ServiceVerifier {
     pub fn new(
         ledger_read: Arc<DefaultIndyLedgerRead>,
         anoncreds: IndyCredxAnonCreds,
-        wallet: Arc<IndySdkWallet>,
+        wallet: Arc<dyn BaseWallet>,
         service_connections: Arc<ServiceConnections>,
     ) -> Self {
         Self {
@@ -80,10 +80,12 @@ impl ServiceVerifier {
             Verifier::create_from_request("".to_string(), &request)?
         };
 
-        let wallet = self.wallet.as_ref();
-
         let send_closure: SendClosure = Box::new(|msg: AriesMessage| {
-            Box::pin(async move { connection.send_message(wallet, &msg, &VcxHttpClient).await })
+            Box::pin(async move {
+                connection
+                    .send_message(&self.wallet, &msg, &VcxHttpClient)
+                    .await
+            })
         });
 
         let message = verifier.mark_presentation_request_sent()?;
@@ -112,10 +114,13 @@ impl ServiceVerifier {
             connection_id,
         } = self.verifiers.get(thread_id)?;
         let connection = self.service_connections.get_by_id(&connection_id)?;
-        let wallet = self.wallet.as_ref();
 
         let send_closure: SendClosure = Box::new(|msg: AriesMessage| {
-            Box::pin(async move { connection.send_message(wallet, &msg, &VcxHttpClient).await })
+            Box::pin(async move {
+                connection
+                    .send_message(&self.wallet, &msg, &VcxHttpClient)
+                    .await
+            })
         });
 
         let message = verifier
diff --git a/aries/agents/rust/mediator/client-tui/src/lib.rs b/aries/agents/rust/mediator/client-tui/src/lib.rs
index 717a8fe9d4..60ad5f6558 100644
--- a/aries/agents/rust/mediator/client-tui/src/lib.rs
+++ b/aries/agents/rust/mediator/client-tui/src/lib.rs
@@ -1,10 +1,9 @@
-use aries_vcx_core::wallet::base_wallet::BaseWallet;
 use mediator::{aries_agent::ArcAgent, persistence::MediatorPersistence};
 use messages::msg_fields::protocols::out_of_band::invitation::Invitation as OOBInvitation;
 use serde_json::{json, Value};
 
 pub async fn handle_register(
-    agent: ArcAgent<impl BaseWallet + 'static, impl MediatorPersistence>,
+    agent: ArcAgent<impl MediatorPersistence>,
     oob_invite: OOBInvitation,
 ) -> Result<Value, String> {
     let mut aries_transport = reqwest::Client::new();
diff --git a/aries/agents/rust/mediator/client-tui/src/tui.rs b/aries/agents/rust/mediator/client-tui/src/tui.rs
index 005d6b018c..70de08009a 100644
--- a/aries/agents/rust/mediator/client-tui/src/tui.rs
+++ b/aries/agents/rust/mediator/client-tui/src/tui.rs
@@ -1,6 +1,5 @@
 use std::sync::Arc;
 
-use aries_vcx_core::wallet::base_wallet::BaseWallet;
 use client_tui::handle_register;
 use cursive::{
     direction::Orientation,
@@ -17,19 +16,19 @@ use log::info;
 use mediator::{aries_agent::Agent, persistence::MediatorPersistence};
 use messages::msg_fields::protocols::out_of_band::invitation::Invitation as OOBInvitation;
 
-pub async fn init_tui<T: BaseWallet + 'static, P: MediatorPersistence>(agent: Agent<T, P>) {
+pub async fn init_tui<P: MediatorPersistence>(agent: Agent<P>) {
     let mut cursive = Cursive::new();
     cursive.add_global_callback(Key::Esc, |s| s.quit());
     cursive.set_user_data(Arc::new(agent));
 
     let mut main = LinearLayout::horizontal().with_name("main");
-    let endpoint_selector = endpoints_ui::<T, P>();
+    let endpoint_selector = endpoints_ui::<P>();
     main.get_mut().add_child(endpoint_selector);
     cursive.add_layer(main);
     cursive.run()
 }
 
-pub fn endpoints_ui<T: BaseWallet + 'static, P: MediatorPersistence>() -> Panel<LinearLayout> {
+pub fn endpoints_ui<P: MediatorPersistence>() -> Panel<LinearLayout> {
     let mut endpoint_selector = SelectView::new();
     // Set available endpoints
     endpoint_selector.add_item_str("/client/register");
@@ -38,8 +37,8 @@ pub fn endpoints_ui<T: BaseWallet + 'static, P: MediatorPersistence>() -> Panel<
     endpoint_selector.set_on_submit(|s, endpoint: &str| {
         // Match ui generators for available endpoints
         let view = match endpoint {
-            "/client/register" => client_register_ui::<T, P>(),
-            "/client/contacts" => contact_selector_ui::<T, P>(s),
+            "/client/register" => client_register_ui::<P>(),
+            "/client/contacts" => contact_selector_ui::<P>(s),
             _ => dummy_ui(),
         };
         // Replace previously exposed ui
@@ -52,8 +51,7 @@ pub fn endpoints_ui<T: BaseWallet + 'static, P: MediatorPersistence>() -> Panel<
     make_standard(endpoint_selector, Orientation::Vertical).title("Select endpoint")
 }
 
-pub fn client_register_ui<T: BaseWallet + 'static, P: MediatorPersistence>() -> Panel<LinearLayout>
-{
+pub fn client_register_ui<P: MediatorPersistence>() -> Panel<LinearLayout> {
     let input = TextArea::new().with_name("oob_text_area");
     let input = ResizedView::new(
         SizeConstraint::AtLeast(20),
@@ -66,7 +64,7 @@ pub fn client_register_ui<T: BaseWallet + 'static, P: MediatorPersistence>() ->
                 .unwrap()
                 .set_content("");
         })
-        .button("Connect", client_register_connect_cb::<T, P>)
+        .button("Connect", client_register_connect_cb::<P>)
         .title("OOB Invite");
     let input = Panel::new(input);
 
@@ -82,9 +80,7 @@ pub fn client_register_ui<T: BaseWallet + 'static, P: MediatorPersistence>() ->
     make_standard(ui, Orientation::Horizontal).title("Register client using Out Of Band Invitation")
 }
 
-pub fn client_register_connect_cb<T: BaseWallet + 'static, P: MediatorPersistence>(
-    s: &mut Cursive,
-) {
+pub fn client_register_connect_cb<P: MediatorPersistence>(s: &mut Cursive) {
     let oob_text_area = s.find_name::<TextArea>("oob_text_area").unwrap();
     let mut output = s.find_name::<TextView>("client_register_result").unwrap();
     let oob_text = oob_text_area.get_content();
@@ -98,7 +94,7 @@ pub fn client_register_connect_cb<T: BaseWallet + 'static, P: MediatorPersistenc
         }
     };
     info!("{:#?}", oob_invite);
-    let agent: &mut Arc<Agent<T, P>> = s.user_data().expect("Userdata should contain Agent");
+    let agent: &mut Arc<Agent<P>> = s.user_data().expect("Userdata should contain Agent");
 
     output.set_content(format!("{:#?}", oob_invite));
     match block_on(handle_register(agent.to_owned(), oob_invite)) {
@@ -120,12 +116,10 @@ fn make_standard(view: impl View, orientation: Orientation) -> Panel<LinearLayou
 //     contact_selector_ui(s)
 // }
 
-pub fn contact_selector_ui<T: BaseWallet + 'static, P: MediatorPersistence>(
-    s: &mut Cursive,
-) -> Panel<LinearLayout> {
+pub fn contact_selector_ui<P: MediatorPersistence>(s: &mut Cursive) -> Panel<LinearLayout> {
     let mut contact_selector = SelectView::new();
     // Set available contacts
-    let agent: &mut Arc<Agent<T, P>> = s
+    let agent: &mut Arc<Agent<P>> = s
         .user_data()
         .expect("cursive must be initialised with state arc agent ");
     let contact_list_maybe = block_on(agent.list_contacts());
diff --git a/aries/agents/rust/mediator/src/aries_agent/client/mod.rs b/aries/agents/rust/mediator/src/aries_agent/client/mod.rs
index f47e87c898..c95a6ad427 100644
--- a/aries/agents/rust/mediator/src/aries_agent/client/mod.rs
+++ b/aries/agents/rust/mediator/src/aries_agent/client/mod.rs
@@ -13,7 +13,6 @@ use aries_vcx::{
     },
     utils::encryption_envelope::EncryptionEnvelope,
 };
-use aries_vcx_core::wallet::base_wallet::BaseWallet;
 use messages::{
     msg_fields::protocols::{
         connection::{response::Response, Connection},
@@ -31,7 +30,7 @@ use super::Agent;
 use crate::utils::prelude::*;
 
 // client role utilities
-impl<T: BaseWallet + 'static, P: MediatorPersistence> Agent<T, P> {
+impl<P: MediatorPersistence> Agent<P> {
     /// Starting from a new connection object, tries to create connection request object for the
     /// specified OOB invite endpoint
     pub async fn gen_connection_request(
@@ -71,7 +70,7 @@ impl<T: BaseWallet + 'static, P: MediatorPersistence> Agent<T, P> {
         // encrypt/pack the connection request message
         let EncryptionEnvelope(packed_aries_msg_bytes) = client_conn
             .encrypt_message(
-                self.wallet.as_ref(),
+                &self.wallet,
                 &AriesMessage::Connection(Connection::Request(req_msg.clone())),
             )
             .await
@@ -86,7 +85,7 @@ impl<T: BaseWallet + 'static, P: MediatorPersistence> Agent<T, P> {
         response: Response,
     ) -> Result<InviteeConnection<Completed>, String> {
         state
-            .handle_response(self.wallet.as_ref(), response)
+            .handle_response(&self.wallet, response)
             .await
             .map_err(|err| err.to_string())
     }
diff --git a/aries/agents/rust/mediator/src/aries_agent/mod.rs b/aries/agents/rust/mediator/src/aries_agent/mod.rs
index a3f3d814f6..371792c2f4 100644
--- a/aries/agents/rust/mediator/src/aries_agent/mod.rs
+++ b/aries/agents/rust/mediator/src/aries_agent/mod.rs
@@ -8,11 +8,10 @@ use aries_vcx::{
 use aries_vcx_core::{
     errors::error::AriesVcxCoreError,
     wallet::{
-        base_wallet::BaseWallet,
-        indy::{wallet::create_and_open_wallet, IndySdkWallet, WalletConfig},
+        base_wallet::{BaseWallet, ManageWallet},
+        indy::wallet_config::WalletConfig,
         structs_io::UnpackMessageOutput,
     },
-    WalletHandle,
 };
 use diddoc_legacy::aries::{diddoc::AriesDidDoc, service::AriesService};
 use messages::{
@@ -34,24 +33,25 @@ pub mod client;
 pub mod utils;
 
 #[derive(Clone)]
-pub struct Agent<T: BaseWallet, P: MediatorPersistence> {
-    wallet: Arc<T>,
+pub struct Agent<P: MediatorPersistence> {
+    wallet: Arc<dyn BaseWallet>,
     persistence: Arc<P>,
     service: Option<AriesService>,
 }
 
-pub type ArcAgent<T, P> = Arc<Agent<T, P>>;
+pub type ArcAgent<P> = Arc<Agent<P>>;
 
 pub struct AgentBuilder<T: BaseWallet> {
     _type_wallet: PhantomData<T>,
 }
 /// Constructors
-impl AgentBuilder<IndySdkWallet> {
+impl AgentBuilder<Arc<dyn BaseWallet>> {
     pub async fn new_from_wallet_config(
         config: WalletConfig,
-    ) -> Result<Agent<IndySdkWallet, sqlx::MySqlPool>, AriesVcxCoreError> {
-        let wallet_handle: WalletHandle = create_and_open_wallet(&config).await?;
-        let wallet = Arc::new(IndySdkWallet::new(wallet_handle));
+    ) -> Result<Agent<sqlx::MySqlPool>, AriesVcxCoreError> {
+        config.create_wallet().await?;
+        let wallet = config.open_wallet().await?;
+
         info!("Connecting to persistence layer");
         let persistence = Arc::new(get_persistence().await);
         Ok(Agent {
@@ -60,8 +60,7 @@ impl AgentBuilder<IndySdkWallet> {
             service: None,
         })
     }
-    pub async fn new_demo_agent() -> Result<Agent<IndySdkWallet, sqlx::MySqlPool>, AriesVcxCoreError>
-    {
+    pub async fn new_demo_agent() -> Result<Agent<sqlx::MySqlPool>, AriesVcxCoreError> {
         let config = WalletConfig {
             wallet_name: uuid::Uuid::new_v4().to_string(),
             wallet_key: "8dvfYSt5d1taSd6yJdpjq4emkwsPDDLYxkNFysFD2cZY".into(),
@@ -77,8 +76,8 @@ impl AgentBuilder<IndySdkWallet> {
 }
 
 // Utils
-impl<T: BaseWallet + 'static, P: MediatorPersistence> Agent<T, P> {
-    pub fn get_wallet_ref(&self) -> Arc<impl BaseWallet> {
+impl<P: MediatorPersistence> Agent<P> {
+    pub fn get_wallet_ref(&self) -> Arc<dyn BaseWallet> {
         self.wallet.clone()
     }
     pub fn get_persistence_ref(&self) -> Arc<impl MediatorPersistence> {
@@ -138,7 +137,7 @@ impl<T: BaseWallet + 'static, P: MediatorPersistence> Agent<T, P> {
         our_vk: &VerKey,
         their_diddoc: &AriesDidDoc,
     ) -> Result<EncryptionEnvelope, String> {
-        EncryptionEnvelope::create(self.wallet.as_ref(), message, Some(our_vk), their_diddoc)
+        EncryptionEnvelope::create(&self.wallet, message, Some(our_vk), their_diddoc)
             .await
             .map_err(string_from_std_error)
     }
@@ -186,7 +185,7 @@ impl<T: BaseWallet + 'static, P: MediatorPersistence> Agent<T, P> {
             .to_owned();
 
         let response: Response = utils::build_response_content(
-            self.wallet.as_ref(),
+            &self.wallet,
             thread_id,
             old_vk.clone(),
             did_data.did().into(),
@@ -199,7 +198,7 @@ impl<T: BaseWallet + 'static, P: MediatorPersistence> Agent<T, P> {
         let aries_response = AriesMessage::Connection(Connection::Response(response));
         let their_diddoc = request.content.connection.did_doc;
         let packed_response_envelope = EncryptionEnvelope::create(
-            self.wallet.as_ref(),
+            &self.wallet,
             json!(aries_response).to_string().as_bytes(),
             Some(&old_vk),
             &their_diddoc,
diff --git a/aries/agents/rust/mediator/src/didcomm_handlers/connection.rs b/aries/agents/rust/mediator/src/didcomm_handlers/connection.rs
index 0bdee9ec62..de3e3795dd 100644
--- a/aries/agents/rust/mediator/src/didcomm_handlers/connection.rs
+++ b/aries/agents/rust/mediator/src/didcomm_handlers/connection.rs
@@ -1,10 +1,9 @@
-use aries_vcx_core::wallet::base_wallet::BaseWallet;
 use messages::msg_fields::protocols::connection::Connection;
 
 use super::{unhandled_aries_message, utils::prelude::*, ArcAgent};
 
-pub async fn handle_aries_connection<T: BaseWallet + 'static, P: MediatorPersistence>(
-    agent: ArcAgent<T, P>,
+pub async fn handle_aries_connection<P: MediatorPersistence>(
+    agent: ArcAgent<P>,
     connection: Connection,
 ) -> Result<EncryptionEnvelope, String> {
     match connection {
diff --git a/aries/agents/rust/mediator/src/didcomm_handlers/forward.rs b/aries/agents/rust/mediator/src/didcomm_handlers/forward.rs
index 2cd4074813..21375dffcd 100644
--- a/aries/agents/rust/mediator/src/didcomm_handlers/forward.rs
+++ b/aries/agents/rust/mediator/src/didcomm_handlers/forward.rs
@@ -1,11 +1,10 @@
-use aries_vcx_core::wallet::base_wallet::BaseWallet;
 use messages::msg_fields::protocols::{notification::ack::Ack, routing::Forward};
 
 use super::{utils::prelude::*, ArcAgent};
 use crate::mediation::forward::handle_forward;
 
 pub async fn handle_routing_forward(
-    agent: ArcAgent<impl BaseWallet + 'static, impl MediatorPersistence>,
+    agent: ArcAgent<impl MediatorPersistence>,
     forward: Forward,
 ) -> Result<Ack, String> {
     info!("{:?}", forward);
diff --git a/aries/agents/rust/mediator/src/didcomm_handlers/mediator_coord.rs b/aries/agents/rust/mediator/src/didcomm_handlers/mediator_coord.rs
index 713bb3f0a7..28fb0274f8 100644
--- a/aries/agents/rust/mediator/src/didcomm_handlers/mediator_coord.rs
+++ b/aries/agents/rust/mediator/src/didcomm_handlers/mediator_coord.rs
@@ -1,4 +1,3 @@
-use aries_vcx_core::wallet::base_wallet::BaseWallet;
 use messages::msg_fields::protocols::coordinate_mediation::{
     CoordinateMediation, MediateGrant, MediateGrantContent, MediateGrantDecorators,
 };
@@ -7,7 +6,7 @@ use uuid::Uuid;
 use super::utils::prelude::*;
 
 pub async fn handle_mediation_coord(
-    agent: &ArcAgent<impl BaseWallet + 'static, impl MediatorPersistence>,
+    agent: &ArcAgent<impl MediatorPersistence>,
     coord_msg: CoordinateMediation,
     auth_pubkey: &str,
 ) -> Result<CoordinateMediation, String> {
diff --git a/aries/agents/rust/mediator/src/didcomm_handlers/mod.rs b/aries/agents/rust/mediator/src/didcomm_handlers/mod.rs
index b7bd23ad55..59ef91ba6e 100644
--- a/aries/agents/rust/mediator/src/didcomm_handlers/mod.rs
+++ b/aries/agents/rust/mediator/src/didcomm_handlers/mod.rs
@@ -1,6 +1,5 @@
 use std::fmt::Debug;
 
-use aries_vcx_core::wallet::base_wallet::BaseWallet;
 use axum::{body::Bytes, extract::State, Json};
 use messages::AriesMessage;
 use serde::{Deserialize, Serialize};
@@ -27,8 +26,8 @@ pub fn unhandled_aries_message(message: impl Debug) -> String {
     format!("Don't know how to handle this message type {:#?}", message)
 }
 
-pub async fn handle_aries<T: BaseWallet + 'static, P: MediatorPersistence>(
-    State(agent): State<ArcAgent<T, P>>,
+pub async fn handle_aries<P: MediatorPersistence>(
+    State(agent): State<ArcAgent<P>>,
     didcomm_msg: Bytes,
 ) -> Result<Json<Value>, String> {
     log::info!("processing message {:?}", &didcomm_msg);
diff --git a/aries/agents/rust/mediator/src/didcomm_handlers/pickup.rs b/aries/agents/rust/mediator/src/didcomm_handlers/pickup.rs
index 7bb2571041..ff9d96bd67 100644
--- a/aries/agents/rust/mediator/src/didcomm_handlers/pickup.rs
+++ b/aries/agents/rust/mediator/src/didcomm_handlers/pickup.rs
@@ -1,10 +1,9 @@
-use aries_vcx_core::wallet::base_wallet::BaseWallet;
 use messages::msg_fields::protocols::pickup::Pickup;
 
 use super::utils::prelude::*;
 
 pub async fn handle_pickup_protocol(
-    agent: &ArcAgent<impl BaseWallet + 'static, impl MediatorPersistence>,
+    agent: &ArcAgent<impl MediatorPersistence>,
     pickup_message: Pickup,
     auth_pubkey: &str,
 ) -> Result<Pickup, String> {
diff --git a/aries/agents/rust/mediator/src/didcomm_handlers/utils.rs b/aries/agents/rust/mediator/src/didcomm_handlers/utils.rs
index 6c67f3bae7..80ee87ec74 100644
--- a/aries/agents/rust/mediator/src/didcomm_handlers/utils.rs
+++ b/aries/agents/rust/mediator/src/didcomm_handlers/utils.rs
@@ -1,8 +1,5 @@
 pub mod prelude {
-    pub use std::sync::Arc;
-
     pub use aries_vcx::utils::encryption_envelope::EncryptionEnvelope;
-    pub use aries_vcx_core::wallet::base_wallet::BaseWallet;
 
     pub use crate::{aries_agent::ArcAgent, persistence::MediatorPersistence, utils::prelude::*};
 }
diff --git a/aries/agents/rust/mediator/src/http_routes/mod.rs b/aries/agents/rust/mediator/src/http_routes/mod.rs
index 882a01304f..503fba2734 100644
--- a/aries/agents/rust/mediator/src/http_routes/mod.rs
+++ b/aries/agents/rust/mediator/src/http_routes/mod.rs
@@ -1,6 +1,5 @@
 use std::sync::Arc;
 
-use aries_vcx_core::wallet::base_wallet::BaseWallet;
 use axum::{
     body::Bytes,
     extract::State,
@@ -19,7 +18,7 @@ use crate::{
 
 pub async fn oob_invite_qr(
     headers: HeaderMap,
-    State(agent): State<ArcAgent<impl BaseWallet + 'static, impl MediatorPersistence>>,
+    State(agent): State<ArcAgent<impl MediatorPersistence>>,
 ) -> Response {
     let Json(oob_json) = oob_invite_json(State(agent)).await;
     let preferred_mimetype = headers
@@ -48,14 +47,14 @@ pub async fn oob_invite_qr(
 }
 
 pub async fn oob_invite_json(
-    State(agent): State<ArcAgent<impl BaseWallet + 'static, impl MediatorPersistence>>,
+    State(agent): State<ArcAgent<impl MediatorPersistence>>,
 ) -> Json<Value> {
     let oob = agent.get_oob_invite().unwrap();
     Json(serde_json::to_value(oob).unwrap())
 }
 
 pub async fn handle_didcomm(
-    State(agent): State<ArcAgent<impl BaseWallet + 'static, impl MediatorPersistence>>,
+    State(agent): State<ArcAgent<impl MediatorPersistence>>,
     didcomm_msg: Bytes,
 ) -> Result<Json<Value>, String> {
     didcomm_handlers::handle_aries(State(agent), didcomm_msg).await
@@ -65,9 +64,7 @@ pub async fn readme() -> Html<String> {
     Html("<p>Please refer to the API section of <a>readme</a> for usage. Thanks. </p>".into())
 }
 
-pub async fn build_router(
-    agent: Agent<impl BaseWallet + 'static, impl MediatorPersistence>,
-) -> Router {
+pub async fn build_router(agent: Agent<impl MediatorPersistence>) -> Router {
     Router::default()
         .route("/", get(readme))
         .route("/register", get(oob_invite_qr))
diff --git a/aries/agents/rust/mediator/tests/common/agent_and_transport_utils.rs b/aries/agents/rust/mediator/tests/common/agent_and_transport_utils.rs
index 6a618033fb..185bdf4638 100644
--- a/aries/agents/rust/mediator/tests/common/agent_and_transport_utils.rs
+++ b/aries/agents/rust/mediator/tests/common/agent_and_transport_utils.rs
@@ -5,7 +5,6 @@ use aries_vcx::{
     },
     utils::encryption_envelope::EncryptionEnvelope,
 };
-use aries_vcx_core::wallet::base_wallet::BaseWallet;
 use diddoc_legacy::aries::diddoc::AriesDidDoc;
 use mediator::{
     aries_agent::{client::transports::AriesTransport, Agent},
@@ -31,7 +30,7 @@ use super::prelude::*;
 const ENDPOINT_ROOT: &str = "http://localhost:8005";
 
 pub async fn didcomm_connection(
-    agent: &Agent<impl BaseWallet + 'static, impl MediatorPersistence>,
+    agent: &Agent<impl MediatorPersistence>,
     aries_transport: &mut impl AriesTransport,
 ) -> Result<InviteeConnection<Completed>> {
     let client = reqwest::Client::new();
@@ -56,7 +55,7 @@ pub async fn didcomm_connection(
 
 /// Returns agent, aries transport for agent, agent's verkey, and mediator's diddoc.
 pub async fn gen_mediator_connected_agent() -> Result<(
-    Agent<impl BaseWallet + 'static, impl MediatorPersistence>,
+    Agent<impl MediatorPersistence>,
     impl AriesTransport,
     VerKey,
     AriesDidDoc,
@@ -72,7 +71,7 @@ pub async fn gen_mediator_connected_agent() -> Result<(
 /// Sends message over didcomm connection and returns unpacked response message
 pub async fn send_message_and_pop_response_message(
     message_bytes: &[u8],
-    agent: &Agent<impl BaseWallet + 'static, impl MediatorPersistence>,
+    agent: &Agent<impl MediatorPersistence>,
     aries_transport: &mut impl AriesTransport,
     our_verkey: &VerKey,
     their_diddoc: &AriesDidDoc,
@@ -96,7 +95,7 @@ pub async fn send_message_and_pop_response_message(
 }
 /// Register recipient keys with mediator
 pub async fn gen_and_register_recipient_key(
-    agent: &mut Agent<impl BaseWallet + 'static, impl MediatorPersistence>,
+    agent: &mut Agent<impl MediatorPersistence>,
     agent_aries_transport: &mut impl AriesTransport,
     agent_verkey: &VerKey,
     mediator_diddoc: &AriesDidDoc,
@@ -141,7 +140,7 @@ pub async fn gen_and_register_recipient_key(
 }
 
 pub async fn get_mediator_grant_data(
-    agent: &Agent<impl BaseWallet + 'static, impl MediatorPersistence>,
+    agent: &Agent<impl MediatorPersistence>,
     agent_aries_transport: &mut impl AriesTransport,
     agent_verkey: &VerKey,
     mediator_diddoc: &AriesDidDoc,
diff --git a/aries/agents/rust/mediator/tests/mediator-coord-protocol.rs b/aries/agents/rust/mediator/tests/mediator-coord-protocol.rs
index 2681477a96..126ca4ae4a 100644
--- a/aries/agents/rust/mediator/tests/mediator-coord-protocol.rs
+++ b/aries/agents/rust/mediator/tests/mediator-coord-protocol.rs
@@ -1,6 +1,6 @@
 mod common;
 
-use aries_vcx_core::wallet::base_wallet::DidWallet;
+use aries_vcx_core::wallet::base_wallet::did_wallet::DidWallet;
 use messages::{
     msg_fields::protocols::coordinate_mediation::{
         keylist_update::{KeylistUpdateItem, KeylistUpdateItemAction},
diff --git a/aries/agents/rust/mediator/tests/mediator-protocol-pickup.rs b/aries/agents/rust/mediator/tests/mediator-protocol-pickup.rs
index 25a55632e3..8bf6c5af66 100644
--- a/aries/agents/rust/mediator/tests/mediator-protocol-pickup.rs
+++ b/aries/agents/rust/mediator/tests/mediator-protocol-pickup.rs
@@ -47,7 +47,7 @@ async fn forward_basic_anoncrypt_message(
         .build();
 
     let EncryptionEnvelope(packed_message) = EncryptionEnvelope::create(
-        &*agent_f.get_wallet_ref(),
+        &agent_f.get_wallet_ref(),
         &serde_json::to_vec(&message)?,
         None,
         agent_diddoc,
diff --git a/aries/agents/rust/mediator/tests/mediator-routing-forward.rs b/aries/agents/rust/mediator/tests/mediator-routing-forward.rs
index dfc3e11b31..fdee207584 100644
--- a/aries/agents/rust/mediator/tests/mediator-routing-forward.rs
+++ b/aries/agents/rust/mediator/tests/mediator-routing-forward.rs
@@ -59,7 +59,7 @@ async fn test_forward_flow() -> Result<()> {
         serde_json::to_string(&message).unwrap()
     );
     let EncryptionEnvelope(packed_message) = EncryptionEnvelope::create(
-        &*agent.get_wallet_ref(),
+        &agent.get_wallet_ref(),
         &serde_json::to_vec(&message)?,
         None,
         &agent_diddoc,
diff --git a/aries/aries_vcx/src/utils/encryption_envelope.rs b/aries/aries_vcx/src/utils/encryption_envelope.rs
index 8c3eae98e0..d4e7d16efc 100644
--- a/aries/aries_vcx/src/utils/encryption_envelope.rs
+++ b/aries/aries_vcx/src/utils/encryption_envelope.rs
@@ -259,7 +259,7 @@ pub mod unit_tests {
     use test_utils::devsetup::build_setup_profile;
 
     use super::*;
-    use crate::aries_vcx_core::wallet::base_wallet::DidWallet;
+    use crate::aries_vcx_core::wallet::base_wallet::did_wallet::DidWallet;
 
     #[tokio::test]
     async fn test_pack_unpack_anon() {
diff --git a/aries/aries_vcx/tests/test_mysql_wallet.rs b/aries/aries_vcx/tests/test_mysql_wallet.rs
index dd0c428822..b9ab994be6 100644
--- a/aries/aries_vcx/tests/test_mysql_wallet.rs
+++ b/aries/aries_vcx/tests/test_mysql_wallet.rs
@@ -7,11 +7,8 @@ mod dbtests {
 
     use aries_vcx::global::settings;
     use aries_vcx_core::wallet::{
-        base_wallet::DidWallet,
-        indy::{
-            wallet::{close_wallet, create_and_open_wallet, wallet_configure_issuer},
-            IndySdkWallet, WalletConfig,
-        },
+        base_wallet::{did_wallet::DidWallet, ManageWallet},
+        indy::wallet_config::WalletConfig,
     };
     use libvcx_logger::LibvcxDefaultLogger;
 
@@ -43,13 +40,13 @@ mod dbtests {
             .storage_credentials(storage_credentials)
             .build();
 
-        let wallet_handle = create_and_open_wallet(&config_wallet).await?;
-        let _config_issuer = wallet_configure_issuer(wallet_handle, enterprise_seed).await?;
+        config_wallet.create_wallet().await?;
+        let wallet = config_wallet.open_wallet().await?;
+        wallet.configure_issuer(enterprise_seed).await?;
 
-        IndySdkWallet::new(wallet_handle)
-            .create_and_store_my_did(None, None)
-            .await?;
-        close_wallet(wallet_handle).await?;
+        wallet.create_and_store_my_did(None, None).await?;
+
+        wallet.close_wallet().await?;
         Ok(())
     }
 }
diff --git a/aries/aries_vcx/tests/test_pool.rs b/aries/aries_vcx/tests/test_pool.rs
index 98ec70f71a..03648446d0 100644
--- a/aries/aries_vcx/tests/test_pool.rs
+++ b/aries/aries_vcx/tests/test_pool.rs
@@ -28,7 +28,7 @@ use aries_vcx_core::{
         base_ledger::{AnoncredsLedgerRead, AnoncredsLedgerWrite},
         indy::pool::test_utils::get_temp_file_path,
     },
-    wallet::base_wallet::{BaseWallet, DidWallet},
+    wallet::base_wallet::{did_wallet::DidWallet, BaseWallet},
 };
 use did_parser::Did;
 use diddoc_legacy::aries::service::AriesService;
diff --git a/aries/aries_vcx/tests/utils/test_agent.rs b/aries/aries_vcx/tests/utils/test_agent.rs
index 0d105d261f..bb120e06e3 100644
--- a/aries/aries_vcx/tests/utils/test_agent.rs
+++ b/aries/aries_vcx/tests/utils/test_agent.rs
@@ -8,7 +8,7 @@ use aries_vcx_core::{
     ledger::base_ledger::{
         AnoncredsLedgerRead, AnoncredsLedgerWrite, IndyLedgerRead, IndyLedgerWrite,
     },
-    wallet::base_wallet::{BaseWallet, DidWallet},
+    wallet::base_wallet::{did_wallet::DidWallet, BaseWallet},
 };
 use did_parser::Did;
 use test_utils::{
diff --git a/aries/aries_vcx_core/src/anoncreds/anoncreds/mod.rs b/aries/aries_vcx_core/src/anoncreds/anoncreds/mod.rs
index 967fe59020..0208e90b8b 100644
--- a/aries/aries_vcx_core/src/anoncreds/anoncreds/mod.rs
+++ b/aries/aries_vcx_core/src/anoncreds/anoncreds/mod.rs
@@ -61,7 +61,10 @@ use crate::{
         constants::ATTRS,
         json::{AsTypeOrDeserializationError, TryGetIndex},
     },
-    wallet::base_wallet::{record::Record, search_filter::SearchFilter, BaseWallet},
+    wallet::{
+        base_wallet::{record::Record, search_filter::SearchFilter, BaseWallet},
+        record_tags::{RecordTag, RecordTags},
+    },
 };
 
 pub const CATEGORY_LINK_SECRET: &str = "VCX_LINK_SECRET";
@@ -606,7 +609,7 @@ impl BaseAnonCreds for Anoncreds {
             .name(cred_def_id.0.clone())
             .category(CATEGORY_CRED_MAP_SCHEMA_ID.to_string())
             // .value(schema_id.to_string())
-            .value(json!({"schemaId": schema_id}).to_string())
+            .value(json!({ "schemaId": schema_id }).to_string())
             .build();
         wallet.add_record(record).await?;
 
@@ -1238,34 +1241,33 @@ impl BaseAnonCreds for Anoncreds {
                 format!("Could not process credential.schema_id {schema_id} as parts."),
             ))?;
 
-        let mut tags = json!({
-            "schema_id": schema_id.0,
-            "schema_issuer_did": schema_issuer_did.did(),
-            "schema_name": schema_name,
-            "schema_version": schema_version,
-            "issuer_did": issuer_did.did(),
-            "cred_def_id": cred_def_id
-        });
+        let mut tags = RecordTags::new(vec![
+            RecordTag::new("schema_id", &schema_id.0),
+            RecordTag::new("schema_issuer_did", schema_issuer_did.did()),
+            RecordTag::new("schema_name", &schema_name),
+            RecordTag::new("schema_version", &schema_version),
+            RecordTag::new("issuer_did", issuer_did.did()),
+            RecordTag::new("cred_def_id", &cred_def_id),
+        ]);
 
         if let Some(rev_reg_id) = &credential.rev_reg_id {
-            tags["rev_reg_id"] = serde_json::Value::String(rev_reg_id.0.to_string())
+            tags.add(RecordTag::new("rev_reg_id", &rev_reg_id.0));
         }
 
         for (raw_attr_name, attr_value) in credential.values.0.iter() {
             let attr_name = _normalize_attr_name(raw_attr_name);
             // add attribute name and raw value pair
             let value_tag_name = _format_attribute_as_value_tag_name(&attr_name);
-            tags[value_tag_name] = Value::String(attr_value.raw.to_string());
+            tags.add(RecordTag::new(&value_tag_name, &attr_value.raw));
 
             // add attribute name and marker (used for checking existent)
             let marker_tag_name = _format_attribute_as_marker_tag_name(&attr_name);
-            tags[marker_tag_name] = Value::String("1".to_string());
+            tags.add(RecordTag::new(&marker_tag_name, "1"));
         }
 
         let credential_id = cred_id.map_or(Uuid::new_v4().to_string(), String::from);
 
         let record_value = serde_json::to_string(&credential)?;
-        let tags = serde_json::from_value(tags.clone())?;
 
         let record = Record::builder()
             .name(credential_id.clone())
diff --git a/aries/aries_vcx_core/src/anoncreds/credx_anoncreds/mod.rs b/aries/aries_vcx_core/src/anoncreds/credx_anoncreds/mod.rs
index 7adce1e3a0..af65c24bf1 100644
--- a/aries/aries_vcx_core/src/anoncreds/credx_anoncreds/mod.rs
+++ b/aries/aries_vcx_core/src/anoncreds/credx_anoncreds/mod.rs
@@ -51,8 +51,10 @@ use crate::{
         json::{AsTypeOrDeserializationError, TryGetIndex},
     },
     wallet::{
-        base_wallet::{record::Record, search_filter::SearchFilter, BaseWallet, RecordWallet},
-        record_tags::RecordTags,
+        base_wallet::{
+            record::Record, record_wallet::RecordWallet, search_filter::SearchFilter, BaseWallet,
+        },
+        record_tags::{RecordTag, RecordTags},
     },
 };
 
@@ -1053,34 +1055,33 @@ impl BaseAnonCreds for IndyCredxAnonCreds {
                 "Could not process credential.cred_def_id as parts.",
             ))?;
 
-        let mut tags = json!({
-            "schema_id": schema_id.0,
-            "schema_issuer_did": schema_issuer_did.0,
-            "schema_name": schema_name,
-            "schema_version": schema_version,
-            "issuer_did": issuer_did.0,
-            "cred_def_id": cred_def_id.0
-        });
+        let mut tags = RecordTags::new(vec![
+            RecordTag::new("schema_id", &schema_id.0),
+            RecordTag::new("schema_issuer_did", &schema_issuer_did.0),
+            RecordTag::new("schema_name", &schema_name),
+            RecordTag::new("schema_version", &schema_version),
+            RecordTag::new("issuer_did", &issuer_did.0),
+            RecordTag::new("cred_def_id", &cred_def_id.0),
+        ]);
 
         if let Some(rev_reg_id) = &credential.rev_reg_id {
-            tags["rev_reg_id"] = serde_json::Value::String(rev_reg_id.0.to_string())
+            tags.add(RecordTag::new("rev_reg_id", &rev_reg_id.0));
         }
 
         for (raw_attr_name, attr_value) in credential.values.0.iter() {
             let attr_name = _normalize_attr_name(raw_attr_name);
             // add attribute name and raw value pair
             let value_tag_name = _format_attribute_as_value_tag_name(&attr_name);
-            tags[value_tag_name] = Value::String(attr_value.raw.to_string());
+            tags.add(RecordTag::new(&value_tag_name, &attr_value.raw));
 
             // add attribute name and marker (used for checking existent)
             let marker_tag_name = _format_attribute_as_marker_tag_name(&attr_name);
-            tags[marker_tag_name] = Value::String("1".to_string());
+            tags.add(RecordTag::new(&marker_tag_name, "1"))
         }
 
         let credential_id = cred_id.map_or(Uuid::new_v4().to_string(), String::from);
 
         let record_value = serde_json::to_string(&credential)?;
-        let tags = serde_json::from_value(tags.clone())?;
 
         let record = Record::builder()
             .name(credential_id.clone())
diff --git a/aries/aries_vcx_core/src/wallet/agency_client_wallet.rs b/aries/aries_vcx_core/src/wallet/agency_client_wallet.rs
index fabe056893..b86cbf44de 100644
--- a/aries/aries_vcx_core/src/wallet/agency_client_wallet.rs
+++ b/aries/aries_vcx_core/src/wallet/agency_client_wallet.rs
@@ -9,8 +9,13 @@ use public_key::{Key, KeyType};
 
 use super::{
     base_wallet::{
-        did_data::DidData, record::Record, search_filter::SearchFilter, BaseWallet, DidWallet,
-        RecordWallet,
+        did_data::DidData,
+        did_wallet::DidWallet,
+        issuer_config::IssuerConfig,
+        record::{AllRecords, Record},
+        record_wallet::RecordWallet,
+        search_filter::SearchFilter,
+        BaseWallet,
     },
     record_tags::RecordTags,
     structs_io::UnpackMessageOutput,
@@ -22,7 +27,27 @@ pub struct AgencyClientWallet {
     inner: Arc<dyn BaseAgencyClientWallet>,
 }
 
-impl BaseWallet for AgencyClientWallet {}
+#[allow(unused_variables)]
+#[async_trait]
+impl BaseWallet for AgencyClientWallet {
+    async fn export_wallet(&self, path: &str, backup_key: &str) -> VcxCoreResult<()> {
+        Err(unimplemented_agency_client_wallet_method("export_wallet"))
+    }
+
+    async fn close_wallet(&self) -> VcxCoreResult<()> {
+        Err(unimplemented_agency_client_wallet_method("close_wallet"))
+    }
+
+    async fn configure_issuer(&self, key_seed: &str) -> VcxCoreResult<IssuerConfig> {
+        Err(unimplemented_agency_client_wallet_method(
+            "configure_issuer",
+        ))
+    }
+
+    async fn all(&self) -> VcxCoreResult<Box<dyn AllRecords + Send>> {
+        Err(unimplemented_agency_client_wallet_method("get_all"))
+    }
+}
 
 #[allow(unused_variables)]
 #[async_trait]
@@ -234,10 +259,7 @@ pub trait ToBaseAgencyClientWallet {
     fn to_base_agency_client_wallet(&self) -> Arc<dyn BaseAgencyClientWallet>;
 }
 
-impl<T> ToBaseAgencyClientWallet for Arc<T>
-where
-    T: BaseWallet + 'static,
-{
+impl ToBaseAgencyClientWallet for Arc<dyn BaseWallet> {
     fn to_base_agency_client_wallet(&self) -> Arc<dyn BaseAgencyClientWallet> {
         let x = self.clone();
         Arc::new(BaseWalletAgencyClientWallet { inner: x })
diff --git a/aries/aries_vcx_core/src/wallet/base_wallet/did_wallet.rs b/aries/aries_vcx_core/src/wallet/base_wallet/did_wallet.rs
new file mode 100644
index 0000000000..46980f0825
--- /dev/null
+++ b/aries/aries_vcx_core/src/wallet/base_wallet/did_wallet.rs
@@ -0,0 +1,83 @@
+use std::sync::Arc;
+
+use async_trait::async_trait;
+use public_key::Key;
+
+use super::{did_data::DidData, BaseWallet};
+use crate::{errors::error::VcxCoreResult, wallet::structs_io::UnpackMessageOutput};
+
+#[async_trait]
+pub trait DidWallet {
+    async fn create_and_store_my_did(
+        &self,
+        seed: Option<&str>,
+        kdf_method_name: Option<&str>,
+    ) -> VcxCoreResult<DidData>;
+
+    async fn key_for_did(&self, did: &str) -> VcxCoreResult<Key>;
+
+    async fn replace_did_key_start(&self, did: &str, seed: Option<&str>) -> VcxCoreResult<Key>;
+
+    async fn replace_did_key_apply(&self, did: &str) -> VcxCoreResult<()>;
+
+    async fn sign(&self, key: &Key, msg: &[u8]) -> VcxCoreResult<Vec<u8>>;
+
+    async fn verify(&self, key: &Key, msg: &[u8], signature: &[u8]) -> VcxCoreResult<bool>;
+
+    async fn pack_message(
+        &self,
+        sender_vk: Option<Key>,
+        receiver_keys: Vec<Key>,
+        msg: &[u8],
+    ) -> VcxCoreResult<Vec<u8>>;
+
+    async fn unpack_message(&self, msg: &[u8]) -> VcxCoreResult<UnpackMessageOutput>;
+}
+
+#[async_trait]
+impl DidWallet for Arc<dyn BaseWallet> {
+    async fn create_and_store_my_did(
+        &self,
+        seed: Option<&str>,
+        did_method_name: Option<&str>,
+    ) -> VcxCoreResult<DidData> {
+        self.as_ref()
+            .create_and_store_my_did(seed, did_method_name)
+            .await
+    }
+
+    async fn key_for_did(&self, did: &str) -> VcxCoreResult<Key> {
+        self.as_ref().key_for_did(did).await
+    }
+
+    async fn replace_did_key_start(&self, did: &str, seed: Option<&str>) -> VcxCoreResult<Key> {
+        self.as_ref().replace_did_key_start(did, seed).await
+    }
+
+    async fn replace_did_key_apply(&self, did: &str) -> VcxCoreResult<()> {
+        self.as_ref().replace_did_key_apply(did).await
+    }
+
+    async fn sign(&self, key: &Key, msg: &[u8]) -> VcxCoreResult<Vec<u8>> {
+        self.as_ref().sign(key, msg).await
+    }
+
+    async fn verify(&self, key: &Key, msg: &[u8], signature: &[u8]) -> VcxCoreResult<bool> {
+        self.as_ref().verify(key, msg, signature).await
+    }
+
+    async fn pack_message(
+        &self,
+        sender_vk: Option<Key>,
+        receiver_keys: Vec<Key>,
+        msg: &[u8],
+    ) -> VcxCoreResult<Vec<u8>> {
+        self.as_ref()
+            .pack_message(sender_vk, receiver_keys, msg)
+            .await
+    }
+
+    async fn unpack_message(&self, msg: &[u8]) -> VcxCoreResult<UnpackMessageOutput> {
+        self.as_ref().unpack_message(msg).await
+    }
+}
diff --git a/aries/aries_vcx_core/src/wallet/base_wallet/issuer_config.rs b/aries/aries_vcx_core/src/wallet/base_wallet/issuer_config.rs
new file mode 100644
index 0000000000..82bc01fec0
--- /dev/null
+++ b/aries/aries_vcx_core/src/wallet/base_wallet/issuer_config.rs
@@ -0,0 +1,8 @@
+use serde::{Deserialize, Serialize};
+use typed_builder::TypedBuilder;
+
+#[derive(Clone, Debug, TypedBuilder, Serialize, Deserialize)]
+#[builder(field_defaults(default))]
+pub struct IssuerConfig {
+    pub institution_did: String,
+}
diff --git a/aries/aries_vcx_core/src/wallet/base_wallet/migrate.rs b/aries/aries_vcx_core/src/wallet/base_wallet/migrate.rs
new file mode 100644
index 0000000000..9036069a69
--- /dev/null
+++ b/aries/aries_vcx_core/src/wallet/base_wallet/migrate.rs
@@ -0,0 +1,120 @@
+use super::{record::Record, BaseWallet};
+use crate::{
+    errors::error::{AriesVcxCoreErrorKind, VcxCoreResult},
+    wallet::record_tags::RecordTags,
+};
+
+#[derive(Debug)]
+pub struct MigrationStats {
+    migrated: u32,
+    skipped: u32,
+    duplicated: u32,
+    failed: u32,
+}
+
+pub async fn migrate_records<E>(
+    src_wallet: impl BaseWallet,
+    dest_wallet: impl BaseWallet,
+    mut migrate_fn: impl FnMut(Record) -> Result<Option<Record>, E>,
+) -> VcxCoreResult<MigrationStats>
+where
+    E: std::fmt::Display,
+{
+    let mut records = src_wallet.all().await?;
+    let total = records.total_count();
+    info!("Migrating {total:?} records");
+    let mut num_record = 0;
+    let mut migration_result = MigrationStats {
+        migrated: 0,
+        skipped: 0,
+        duplicated: 0,
+        failed: 0,
+    };
+
+    while let Some(source_record) = records.next().await? {
+        num_record += 1;
+        if num_record % 1000 == 1 {
+            warn!(
+                "Migrating wallet record number {num_record} / {total:?}, intermediary migration \
+                 result: ${migration_result:?}"
+            );
+        }
+        trace!("Migrating record: {:?}", source_record);
+        let unwrapped_category = match &source_record.category() {
+            None => {
+                warn!(
+                    "Skipping item missing 'category' field, record ({num_record}): \
+                     {source_record:?}"
+                );
+                migration_result.skipped += 1;
+                continue;
+            }
+            Some(type_) => type_.clone(),
+        };
+        let unwrapped_value = match &source_record.value() {
+            None => {
+                warn!(
+                    "Skipping item missing 'value' field, record ({num_record}): {source_record:?}"
+                );
+                migration_result.skipped += 1;
+                continue;
+            }
+            Some(value) => value.clone(),
+        };
+        let unwrapped_tags = match &source_record.tags() {
+            None => RecordTags::default(),
+            Some(tags) => tags.clone(),
+        };
+
+        let record = Record::builder()
+            .category(unwrapped_category)
+            .name(source_record.name().to_string())
+            .value(unwrapped_value)
+            .tags(unwrapped_tags)
+            .build();
+
+        let migrated_record = match migrate_fn(record) {
+            Ok(record) => match record {
+                None => {
+                    warn!("Skipping non-migratable record ({num_record}): {source_record:?}");
+                    migration_result.skipped += 1;
+                    continue;
+                }
+                Some(record) => record,
+            },
+            Err(err) => {
+                warn!(
+                    "Skipping item due failed item migration, record ({num_record}): \
+                     {source_record:?}, err: {err}"
+                );
+                migration_result.failed += 1;
+                continue;
+            }
+        };
+
+        match dest_wallet.add_record(migrated_record.clone()).await {
+            Err(err) => match err.kind() {
+                AriesVcxCoreErrorKind::DuplicationWalletRecord => {
+                    trace!(
+                        "Record type: {migrated_record:?} already exists in destination wallet, \
+                         skipping"
+                    );
+                    migration_result.duplicated += 1;
+                    continue;
+                }
+                _ => {
+                    error!(
+                        "Error adding record {migrated_record:?} to destination wallet: {err:?}"
+                    );
+                    migration_result.failed += 1;
+                    return Err(err);
+                }
+            },
+            Ok(()) => {
+                migration_result.migrated += 1;
+            }
+        }
+    }
+    warn!("Migration of total {total:?} records completed, result: ${migration_result:?}");
+    Ok(migration_result)
+}
diff --git a/aries/aries_vcx_core/src/wallet/base_wallet/mod.rs b/aries/aries_vcx_core/src/wallet/base_wallet/mod.rs
index b29e7a4f23..485dc60426 100644
--- a/aries/aries_vcx_core/src/wallet/base_wallet/mod.rs
+++ b/aries/aries_vcx_core/src/wallet/base_wallet/mod.rs
@@ -1,76 +1,63 @@
+use std::sync::Arc;
+
 use async_trait::async_trait;
-use public_key::Key;
-
-use super::record_tags::RecordTags;
-use crate::{
-    errors::error::VcxCoreResult,
-    wallet::{
-        base_wallet::{did_data::DidData, record::Record, search_filter::SearchFilter},
-        structs_io::UnpackMessageOutput,
-    },
+
+use self::{
+    did_wallet::DidWallet, issuer_config::IssuerConfig, record::AllRecords,
+    record_wallet::RecordWallet,
 };
+use crate::errors::error::VcxCoreResult;
 
 pub mod did_data;
+pub mod did_wallet;
+pub mod issuer_config;
+pub mod migrate;
 pub mod record;
+pub mod record_wallet;
 pub mod search_filter;
 
-pub trait BaseWallet: RecordWallet + DidWallet + Send + Sync + std::fmt::Debug {}
-
 #[async_trait]
-pub trait DidWallet {
-    async fn create_and_store_my_did(
-        &self,
-        seed: Option<&str>,
-        kdf_method_name: Option<&str>,
-    ) -> VcxCoreResult<DidData>;
+pub trait ImportWallet {
+    async fn import_wallet(&self) -> VcxCoreResult<()>;
+}
 
-    async fn key_for_did(&self, did: &str) -> VcxCoreResult<Key>;
+#[async_trait]
+pub trait ManageWallet {
+    async fn create_wallet(&self) -> VcxCoreResult<()>;
 
-    async fn replace_did_key_start(&self, did: &str, seed: Option<&str>) -> VcxCoreResult<Key>;
+    async fn open_wallet(&self) -> VcxCoreResult<Arc<dyn BaseWallet>>;
 
-    async fn replace_did_key_apply(&self, did: &str) -> VcxCoreResult<()>;
+    async fn delete_wallet(&self) -> VcxCoreResult<()>;
+}
 
-    async fn sign(&self, key: &Key, msg: &[u8]) -> VcxCoreResult<Vec<u8>>;
+#[async_trait]
+pub trait BaseWallet: RecordWallet + DidWallet + Send + Sync + std::fmt::Debug {
+    async fn export_wallet(&self, path: &str, backup_key: &str) -> VcxCoreResult<()>;
 
-    async fn verify(&self, key: &Key, msg: &[u8], signature: &[u8]) -> VcxCoreResult<bool>;
+    async fn close_wallet(&self) -> VcxCoreResult<()>;
 
-    async fn pack_message(
-        &self,
-        sender_vk: Option<Key>,
-        receiver_keys: Vec<Key>,
-        msg: &[u8],
-    ) -> VcxCoreResult<Vec<u8>>;
+    async fn configure_issuer(&self, key_seed: &str) -> VcxCoreResult<IssuerConfig>;
 
-    async fn unpack_message(&self, msg: &[u8]) -> VcxCoreResult<UnpackMessageOutput>;
+    async fn all(&self) -> VcxCoreResult<Box<dyn AllRecords + Send>>;
 }
 
 #[async_trait]
-pub trait RecordWallet {
-    async fn add_record(&self, record: Record) -> VcxCoreResult<()>;
-
-    async fn get_record(&self, category: &str, name: &str) -> VcxCoreResult<Record>;
-
-    async fn update_record_tags(
-        &self,
-        category: &str,
-        name: &str,
-        new_tags: RecordTags,
-    ) -> VcxCoreResult<()>;
-
-    async fn update_record_value(
-        &self,
-        category: &str,
-        name: &str,
-        new_value: &str,
-    ) -> VcxCoreResult<()>;
-
-    async fn delete_record(&self, category: &str, name: &str) -> VcxCoreResult<()>;
-
-    async fn search_record(
-        &self,
-        category: &str,
-        search_filter: Option<SearchFilter>,
-    ) -> VcxCoreResult<Vec<Record>>;
+impl BaseWallet for Arc<dyn BaseWallet> {
+    async fn export_wallet(&self, path: &str, backup_key: &str) -> VcxCoreResult<()> {
+        self.as_ref().export_wallet(path, backup_key).await
+    }
+
+    async fn close_wallet(&self) -> VcxCoreResult<()> {
+        self.as_ref().close_wallet().await
+    }
+
+    async fn configure_issuer(&self, key_seed: &str) -> VcxCoreResult<IssuerConfig> {
+        self.as_ref().configure_issuer(key_seed).await
+    }
+
+    async fn all(&self) -> VcxCoreResult<Box<dyn AllRecords + Send>> {
+        self.as_ref().all().await
+    }
 }
 
 #[cfg(test)]
@@ -81,8 +68,8 @@ mod tests {
     use crate::{
         errors::error::AriesVcxCoreErrorKind,
         wallet::{
-            base_wallet::{DidWallet, Record, RecordWallet},
-            record_tags::RecordTags,
+            base_wallet::{record::Record, DidWallet, RecordWallet},
+            record_tags::{RecordTag, RecordTags},
         },
     };
 
@@ -264,7 +251,7 @@ mod tests {
         let category = "my";
         let value1 = "xxx";
         let value2 = "yyy";
-        let tags1: RecordTags = vec![("a".into(), "b".into())].into();
+        let tags1: RecordTags = vec![RecordTag::new("a", "b")].into();
         let tags2 = RecordTags::default();
 
         let record = Record::builder()
@@ -297,7 +284,7 @@ mod tests {
         let category = "my";
         let value1 = "xxx";
         let value2 = "yyy";
-        let tags: RecordTags = vec![("a".into(), "b".into())].into();
+        let tags: RecordTags = vec![RecordTag::new("a", "b")].into();
 
         let record = Record::builder()
             .name(name.into())
@@ -324,8 +311,8 @@ mod tests {
         let name = "foo";
         let category = "my";
         let value = "xxx";
-        let tags1: RecordTags = vec![("a".into(), "b".into())].into();
-        let tags2: RecordTags = vec![("c".into(), "d".into())].into();
+        let tags1: RecordTags = vec![RecordTag::new("a", "b")].into();
+        let tags2: RecordTags = vec![RecordTag::new("c", "d")].into();
 
         let record = Record::builder()
             .name(name.into())
diff --git a/aries/aries_vcx_core/src/wallet/base_wallet/record.rs b/aries/aries_vcx_core/src/wallet/base_wallet/record.rs
index 36b8e3b70b..6fbaba0edf 100644
--- a/aries/aries_vcx_core/src/wallet/base_wallet/record.rs
+++ b/aries/aries_vcx_core/src/wallet/base_wallet/record.rs
@@ -1,6 +1,9 @@
+use async_trait::async_trait;
 use typed_builder::TypedBuilder;
+#[cfg(feature = "vdrtools_wallet")]
+use vdrtools::WalletRecord;
 
-use crate::wallet::record_tags::RecordTags;
+use crate::{errors::error::VcxCoreResult, wallet::record_tags::RecordTags};
 
 #[derive(Debug, Default, Clone, TypedBuilder)]
 pub struct Record {
@@ -28,3 +31,54 @@ impl Record {
         &self.tags
     }
 }
+
+#[derive(Debug, Default, Clone, TypedBuilder)]
+pub struct PartialRecord {
+    category: Option<String>,
+    name: String,
+    value: Option<String>,
+    #[builder(default)]
+    tags: Option<RecordTags>,
+}
+
+impl PartialRecord {
+    pub fn value(&self) -> &Option<String> {
+        &self.value
+    }
+
+    pub fn name(&self) -> &str {
+        &self.name
+    }
+
+    pub fn category(&self) -> &Option<String> {
+        &self.category
+    }
+
+    pub fn tags(&self) -> &Option<RecordTags> {
+        &self.tags
+    }
+
+    #[cfg(feature = "vdrtools_wallet")]
+    pub fn from_wallet_record(wallet_record: WalletRecord) -> Self {
+        use crate::wallet::indy::indy_tags::IndyTags;
+
+        let name = wallet_record.get_id().into();
+        let category = wallet_record.get_type();
+        let value = wallet_record.get_value();
+
+        let found_tags = wallet_record.get_tags();
+
+        Self::builder()
+            .name(name)
+            .category(category.map(Into::into))
+            .value(value.map(Into::into))
+            .tags(found_tags.map(|tags| IndyTags::new(tags.clone()).into_entry_tags()))
+            .build()
+    }
+}
+
+#[async_trait]
+pub trait AllRecords {
+    fn total_count(&self) -> VcxCoreResult<Option<usize>>;
+    async fn next(&mut self) -> VcxCoreResult<Option<PartialRecord>>;
+}
diff --git a/aries/aries_vcx_core/src/wallet/base_wallet/record_wallet.rs b/aries/aries_vcx_core/src/wallet/base_wallet/record_wallet.rs
new file mode 100644
index 0000000000..d1988e7c22
--- /dev/null
+++ b/aries/aries_vcx_core/src/wallet/base_wallet/record_wallet.rs
@@ -0,0 +1,80 @@
+use std::sync::Arc;
+
+use async_trait::async_trait;
+
+use super::{record::Record, search_filter::SearchFilter, BaseWallet};
+use crate::{errors::error::VcxCoreResult, wallet::record_tags::RecordTags};
+
+#[async_trait]
+pub trait RecordWallet {
+    async fn add_record(&self, record: Record) -> VcxCoreResult<()>;
+
+    async fn get_record(&self, category: &str, name: &str) -> VcxCoreResult<Record>;
+
+    async fn update_record_tags(
+        &self,
+        category: &str,
+        name: &str,
+        new_tags: RecordTags,
+    ) -> VcxCoreResult<()>;
+
+    async fn update_record_value(
+        &self,
+        category: &str,
+        name: &str,
+        new_value: &str,
+    ) -> VcxCoreResult<()>;
+
+    async fn delete_record(&self, category: &str, name: &str) -> VcxCoreResult<()>;
+
+    async fn search_record(
+        &self,
+        category: &str,
+        search_filter: Option<SearchFilter>,
+    ) -> VcxCoreResult<Vec<Record>>;
+}
+
+#[async_trait]
+impl RecordWallet for Arc<dyn BaseWallet> {
+    async fn add_record(&self, record: Record) -> VcxCoreResult<()> {
+        self.as_ref().add_record(record).await
+    }
+
+    async fn get_record(&self, category: &str, name: &str) -> VcxCoreResult<Record> {
+        self.as_ref().get_record(category, name).await
+    }
+
+    async fn update_record_tags(
+        &self,
+        category: &str,
+        name: &str,
+        new_tags: RecordTags,
+    ) -> VcxCoreResult<()> {
+        self.as_ref()
+            .update_record_tags(category, name, new_tags)
+            .await
+    }
+
+    async fn update_record_value(
+        &self,
+        category: &str,
+        name: &str,
+        new_value: &str,
+    ) -> VcxCoreResult<()> {
+        self.as_ref()
+            .update_record_value(category, name, new_value)
+            .await
+    }
+
+    async fn delete_record(&self, category: &str, name: &str) -> VcxCoreResult<()> {
+        self.as_ref().delete_record(category, name).await
+    }
+
+    async fn search_record(
+        &self,
+        category: &str,
+        search_filter: Option<SearchFilter>,
+    ) -> VcxCoreResult<Vec<Record>> {
+        self.as_ref().search_record(category, search_filter).await
+    }
+}
diff --git a/aries/aries_vcx_core/src/wallet/indy/indy_did_wallet.rs b/aries/aries_vcx_core/src/wallet/indy/indy_did_wallet.rs
index b553b2c183..d4e32077b6 100644
--- a/aries/aries_vcx_core/src/wallet/indy/indy_did_wallet.rs
+++ b/aries/aries_vcx_core/src/wallet/indy/indy_did_wallet.rs
@@ -5,7 +5,7 @@ use vdrtools::{DidMethod, DidValue, KeyInfo, Locator, MyDidInfo};
 use crate::{
     errors::error::{AriesVcxCoreError, AriesVcxCoreErrorKind, VcxCoreResult},
     wallet::{
-        base_wallet::{did_data::DidData, DidWallet},
+        base_wallet::{did_data::DidData, did_wallet::DidWallet},
         indy::IndySdkWallet,
         structs_io::UnpackMessageOutput,
     },
diff --git a/aries/aries_vcx_core/src/wallet/indy/indy_record_wallet.rs b/aries/aries_vcx_core/src/wallet/indy/indy_record_wallet.rs
index 36b25d1487..ffc0153de0 100644
--- a/aries/aries_vcx_core/src/wallet/indy/indy_record_wallet.rs
+++ b/aries/aries_vcx_core/src/wallet/indy/indy_record_wallet.rs
@@ -8,7 +8,7 @@ use super::{indy_tags::IndyTags, SEARCH_OPTIONS, WALLET_OPTIONS};
 use crate::{
     errors::error::{AriesVcxCoreError, VcxCoreResult},
     wallet::{
-        base_wallet::{record::Record, search_filter::SearchFilter, RecordWallet},
+        base_wallet::{record::Record, record_wallet::RecordWallet, search_filter::SearchFilter},
         indy::IndySdkWallet,
         record_tags::RecordTags,
     },
diff --git a/aries/aries_vcx_core/src/wallet/indy/indy_tags.rs b/aries/aries_vcx_core/src/wallet/indy/indy_tags.rs
index 5bb58ad45c..ac4d8a5ec9 100644
--- a/aries/aries_vcx_core/src/wallet/indy/indy_tags.rs
+++ b/aries/aries_vcx_core/src/wallet/indy/indy_tags.rs
@@ -15,13 +15,13 @@ impl IndyTags {
 
     pub fn from_entry_tags(tags: RecordTags) -> Self {
         let mut map = HashMap::new();
-        let tags_vec: Vec<_> = tags.into_iter().collect();
+        let tags_vec: Vec<_> = tags.into_iter().map(|tag| tag.into_pair()).collect();
         map.extend(tags_vec);
         Self(map)
     }
 
     pub fn into_entry_tags(self) -> RecordTags {
-        let mut items: Vec<RecordTag> = self.0.into_iter().collect();
+        let mut items: Vec<RecordTag> = self.0.into_iter().map(RecordTag::from_pair).collect();
         items.sort();
 
         RecordTags::new(items)
diff --git a/aries/aries_vcx_core/src/wallet/indy/indy_utils.rs b/aries/aries_vcx_core/src/wallet/indy/indy_utils.rs
new file mode 100644
index 0000000000..2843c8ebfa
--- /dev/null
+++ b/aries/aries_vcx_core/src/wallet/indy/indy_utils.rs
@@ -0,0 +1,15 @@
+use indy_api_types::domain::wallet::KeyDerivationMethod;
+
+use crate::errors::error::{AriesVcxCoreError, AriesVcxCoreErrorKind, VcxCoreResult};
+
+pub fn parse_key_derivation_method(method: &str) -> VcxCoreResult<KeyDerivationMethod> {
+    match method {
+        "RAW" => Ok(KeyDerivationMethod::RAW),
+        "ARGON2I_MOD" => Ok(KeyDerivationMethod::ARGON2I_MOD),
+        "ARGON2I_INT" => Ok(KeyDerivationMethod::ARGON2I_INT),
+        _ => Err(AriesVcxCoreError::from_msg(
+            AriesVcxCoreErrorKind::InvalidOption,
+            format!("Unknown derivation method {method}"),
+        )),
+    }
+}
diff --git a/aries/aries_vcx_core/src/wallet/indy/indy_wallet_record.rs b/aries/aries_vcx_core/src/wallet/indy/indy_wallet_record.rs
new file mode 100644
index 0000000000..2d766a8978
--- /dev/null
+++ b/aries/aries_vcx_core/src/wallet/indy/indy_wallet_record.rs
@@ -0,0 +1,29 @@
+use serde::{Deserialize, Serialize};
+
+use crate::{errors::error::VcxCoreResult, wallet::base_wallet::record::Record};
+
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct IndyWalletRecord {
+    id: Option<String>,
+    #[serde(rename = "type")]
+    record_type: Option<String>,
+    pub value: Option<String>,
+    tags: Option<String>,
+}
+
+impl IndyWalletRecord {
+    pub fn from_record(record: Record) -> VcxCoreResult<Self> {
+        let tags = if record.tags().is_empty() {
+            None
+        } else {
+            Some(serde_json::to_string(&record.tags())?)
+        };
+
+        Ok(Self {
+            id: Some(record.name().into()),
+            record_type: Some(record.category().into()),
+            value: Some(record.value().into()),
+            tags,
+        })
+    }
+}
diff --git a/aries/aries_vcx_core/src/wallet/indy/internal.rs b/aries/aries_vcx_core/src/wallet/indy/internal.rs
deleted file mode 100644
index d75f71db99..0000000000
--- a/aries/aries_vcx_core/src/wallet/indy/internal.rs
+++ /dev/null
@@ -1,77 +0,0 @@
-use indy_api_types::SearchHandle;
-use vdrtools::{Locator, WalletHandle};
-
-use crate::errors::error::VcxCoreResult;
-
-pub async fn delete_wallet_record(
-    wallet_handle: WalletHandle,
-    xtype: &str,
-    id: &str,
-) -> VcxCoreResult<()> {
-    trace!(
-        "delete_record >>> xtype: {}, id: {}",
-        secret!(&xtype),
-        secret!(&id)
-    );
-
-    Locator::instance()
-        .non_secret_controller
-        .delete_record(wallet_handle, xtype.into(), id.into())
-        .await?;
-
-    Ok(())
-}
-
-// TODO - FUTURE - revert to pub(crate) after libvcx dependency is fixed
-pub async fn open_search_wallet(
-    wallet_handle: WalletHandle,
-    xtype: &str,
-    query: &str,
-    options: &str,
-) -> VcxCoreResult<SearchHandle> {
-    trace!(
-        "open_search >>> xtype: {}, query: {}, options: {}",
-        secret!(&xtype),
-        query,
-        options
-    );
-
-    let res = Locator::instance()
-        .non_secret_controller
-        .open_search(wallet_handle, xtype.into(), query.into(), options.into())
-        .await?;
-
-    Ok(res)
-}
-
-// TODO - FUTURE - revert to pub(crate) after libvcx dependency is fixed
-pub async fn fetch_next_records_wallet(
-    wallet_handle: WalletHandle,
-    search_handle: SearchHandle,
-    count: usize,
-) -> VcxCoreResult<String> {
-    trace!(
-        "fetch_next_records >>> search_handle: {:?}, count: {}",
-        search_handle,
-        count
-    );
-
-    let res = Locator::instance()
-        .non_secret_controller
-        .fetch_search_next_records(wallet_handle, search_handle, count)
-        .await?;
-
-    Ok(res)
-}
-
-// TODO - FUTURE - revert to pub(crate) after libvcx dependency is fixed
-pub async fn close_search_wallet(search_handle: SearchHandle) -> VcxCoreResult<()> {
-    trace!("close_search >>> search_handle: {:?}", search_handle);
-
-    Locator::instance()
-        .non_secret_controller
-        .close_search(search_handle)
-        .await?;
-
-    Ok(())
-}
diff --git a/aries/aries_vcx_core/src/wallet/indy/mod.rs b/aries/aries_vcx_core/src/wallet/indy/mod.rs
index 12e861ffb4..cb3dcd830f 100644
--- a/aries/aries_vcx_core/src/wallet/indy/mod.rs
+++ b/aries/aries_vcx_core/src/wallet/indy/mod.rs
@@ -1,16 +1,46 @@
-use indy_api_types::domain::wallet::IndyRecord;
-use serde::{Deserialize, Serialize};
-use typed_builder::TypedBuilder;
+use async_trait::async_trait;
+use indy_api_types::domain::wallet::{default_key_derivation_method, IndyRecord};
+use vdrtools::{indy_wallet::iterator::WalletIterator, Locator};
 
 use self::indy_tags::IndyTags;
-use super::base_wallet::{record::Record, BaseWallet};
+use super::base_wallet::{
+    did_wallet::DidWallet,
+    issuer_config::IssuerConfig,
+    record::{AllRecords, PartialRecord, Record},
+    BaseWallet,
+};
 use crate::{errors::error::VcxCoreResult, WalletHandle};
 
 mod indy_did_wallet;
 mod indy_record_wallet;
-mod indy_tags;
-pub mod internal;
-pub mod wallet;
+pub(crate) mod indy_tags;
+mod indy_utils;
+pub mod indy_wallet_record;
+pub mod restore_wallet_configs;
+pub mod wallet_config;
+pub mod wallet_credentials;
+
+impl From<IndyRecord> for Record {
+    fn from(ir: IndyRecord) -> Self {
+        Self::builder()
+            .name(ir.id)
+            .category(ir.type_)
+            .value(ir.value)
+            .tags(IndyTags::new(ir.tags).into_entry_tags())
+            .build()
+    }
+}
+
+impl From<Record> for IndyRecord {
+    fn from(record: Record) -> Self {
+        Self {
+            id: record.name().into(),
+            type_: record.category().into(),
+            value: record.value().into(),
+            tags: IndyTags::from_entry_tags(record.tags().to_owned()).into_inner(),
+        }
+    }
+}
 
 #[derive(Debug)]
 pub struct IndySdkWallet {
@@ -27,119 +57,91 @@ impl IndySdkWallet {
     }
 }
 
-#[derive(Clone, Debug, TypedBuilder, Serialize, Deserialize)]
-#[builder(field_defaults(default))]
-pub struct WalletConfig {
-    pub wallet_name: String,
-    pub wallet_key: String,
-    pub wallet_key_derivation: String,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    #[builder(setter(strip_option))]
-    pub wallet_type: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    #[builder(setter(strip_option))]
-    pub storage_config: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    #[builder(setter(strip_option))]
-    pub storage_credentials: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    #[builder(setter(strip_option))]
-    pub rekey: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    #[builder(setter(strip_option))]
-    pub rekey_derivation_method: Option<String>,
-}
+const WALLET_OPTIONS: &str =
+    r#"{"retrieveType": true, "retrieveValue": true, "retrieveTags": true}"#;
 
-#[derive(Clone, Debug, TypedBuilder, Serialize, Deserialize)]
-#[builder(field_defaults(default))]
-pub struct IssuerConfig {
-    pub institution_did: String,
-}
+const SEARCH_OPTIONS: &str = r#"{"retrieveType": true, "retrieveValue": true, "retrieveTags": true, "retrieveRecords": true}"#;
 
-#[derive(Clone, Debug, Serialize, Deserialize)]
-struct WalletCredentials {
-    key: String,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    rekey: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    storage_credentials: Option<serde_json::Value>,
-    key_derivation_method: String,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    rekey_derivation_method: Option<String>,
-}
+#[async_trait]
+impl BaseWallet for IndySdkWallet {
+    async fn export_wallet(&self, path: &str, backup_key: &str) -> VcxCoreResult<()> {
+        Locator::instance()
+            .wallet_controller
+            .export(
+                self.wallet_handle,
+                vdrtools::types::domain::wallet::ExportConfig {
+                    key: backup_key.into(),
+                    path: path.into(),
+
+                    key_derivation_method: default_key_derivation_method(),
+                },
+            )
+            .await?;
+
+        Ok(())
+    }
 
-#[derive(Clone, Debug, Serialize, Deserialize)]
-pub struct IndyWalletRecord {
-    id: Option<String>,
-    #[serde(rename = "type")]
-    record_type: Option<String>,
-    pub value: Option<String>,
-    tags: Option<String>,
-}
+    async fn close_wallet(&self) -> VcxCoreResult<()> {
+        Locator::instance()
+            .wallet_controller
+            .close(self.wallet_handle)
+            .await?;
 
-impl IndyWalletRecord {
-    pub fn from_record(record: Record) -> VcxCoreResult<Self> {
-        let tags = if record.tags().is_empty() {
-            None
-        } else {
-            Some(serde_json::to_string(&record.tags())?)
-        };
+        Ok(())
+    }
 
-        Ok(Self {
-            id: Some(record.name().into()),
-            record_type: Some(record.category().into()),
-            value: Some(record.value().into()),
-            tags,
+    async fn configure_issuer(&self, key_seed: &str) -> VcxCoreResult<IssuerConfig> {
+        let did_data = self.create_and_store_my_did(Some(key_seed), None).await?;
+
+        Ok(IssuerConfig {
+            institution_did: did_data.did().to_string(),
         })
     }
-}
 
-impl From<IndyRecord> for Record {
-    fn from(ir: IndyRecord) -> Self {
-        Self::builder()
-            .name(ir.id)
-            .category(ir.type_)
-            .value(ir.value)
-            .tags(IndyTags::new(ir.tags).into_entry_tags())
-            .build()
+    async fn all(&self) -> VcxCoreResult<Box<dyn AllRecords + Send>> {
+        let all = Locator::instance()
+            .wallet_controller
+            .get_all(self.get_wallet_handle())
+            .await?;
+
+        Ok(Box::new(AllIndyRecords::new(all)))
     }
 }
 
-impl From<Record> for IndyRecord {
-    fn from(record: Record) -> Self {
-        Self {
-            id: record.name().into(),
-            type_: record.category().into(),
-            value: record.value().into(),
-            tags: IndyTags::from_entry_tags(record.tags().to_owned()).into_inner(),
-        }
-    }
+pub struct AllIndyRecords {
+    iterator: WalletIterator,
 }
 
-#[derive(Clone, Debug, Serialize, Deserialize)]
-pub struct RestoreWalletConfigs {
-    pub wallet_name: String,
-    pub wallet_key: String,
-    pub exported_wallet_path: String,
-    pub backup_key: String,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub wallet_key_derivation: Option<String>,
+impl AllIndyRecords {
+    pub fn new(iterator: WalletIterator) -> Self {
+        Self { iterator }
+    }
 }
 
-const WALLET_OPTIONS: &str =
-    r#"{"retrieveType": true, "retrieveValue": true, "retrieveTags": true}"#;
+#[async_trait]
+impl AllRecords for AllIndyRecords {
+    fn total_count(&self) -> VcxCoreResult<Option<usize>> {
+        Ok(self.iterator.get_total_count()?)
+    }
 
-const SEARCH_OPTIONS: &str = r#"{"retrieveType": true, "retrieveValue": true, "retrieveTags": true, "retrieveRecords": true}"#;
+    async fn next(&mut self) -> VcxCoreResult<Option<PartialRecord>> {
+        let item = self.iterator.next().await?;
 
-impl BaseWallet for IndySdkWallet {}
+        Ok(item.map(PartialRecord::from_wallet_record))
+    }
+}
 
 #[cfg(test)]
 pub mod tests {
-    use super::IndySdkWallet;
 
-    pub async fn dev_setup_indy_wallet() -> IndySdkWallet {
-        use crate::wallet::indy::{wallet::create_and_open_wallet, WalletConfig};
+    use std::sync::Arc;
+
+    use crate::wallet::{
+        base_wallet::{BaseWallet, ManageWallet},
+        indy::wallet_config::WalletConfig,
+    };
 
+    pub async fn dev_setup_indy_wallet() -> Arc<dyn BaseWallet> {
         let config_wallet = WalletConfig {
             wallet_name: format!("wallet_{}", uuid::Uuid::new_v4()),
             wallet_key: "8dvfYSt5d1taSd6yJdpjq4emkwsPDDLYxkNFysFD2cZY".into(),
@@ -150,8 +152,8 @@ pub mod tests {
             rekey: None,
             rekey_derivation_method: None,
         };
-        let wallet_handle = create_and_open_wallet(&config_wallet).await.unwrap();
 
-        IndySdkWallet::new(wallet_handle)
+        config_wallet.create_wallet().await.unwrap();
+        config_wallet.open_wallet().await.unwrap()
     }
 }
diff --git a/aries/aries_vcx_core/src/wallet/indy/restore_wallet_configs.rs b/aries/aries_vcx_core/src/wallet/indy/restore_wallet_configs.rs
new file mode 100644
index 0000000000..01e5d2808b
--- /dev/null
+++ b/aries/aries_vcx_core/src/wallet/indy/restore_wallet_configs.rs
@@ -0,0 +1,53 @@
+use async_trait::async_trait;
+use serde::{Deserialize, Serialize};
+use vdrtools::{types::domain::wallet::default_key_derivation_method, Locator};
+
+use super::indy_utils::parse_key_derivation_method;
+use crate::{errors::error::VcxCoreResult, wallet::base_wallet::ImportWallet};
+
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct RestoreWalletConfigs {
+    pub wallet_name: String,
+    pub wallet_key: String,
+    pub exported_wallet_path: String,
+    pub backup_key: String,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub wallet_key_derivation: Option<String>,
+}
+
+#[async_trait]
+impl ImportWallet for RestoreWalletConfigs {
+    async fn import_wallet(&self) -> VcxCoreResult<()> {
+        Locator::instance()
+            .wallet_controller
+            .import(
+                vdrtools::types::domain::wallet::Config {
+                    id: self.wallet_name.clone(),
+                    ..Default::default()
+                },
+                vdrtools::types::domain::wallet::Credentials {
+                    key: self.wallet_key.clone(),
+                    key_derivation_method: self
+                        .wallet_key_derivation
+                        .as_deref()
+                        .map(parse_key_derivation_method)
+                        .transpose()?
+                        .unwrap_or_else(default_key_derivation_method),
+
+                    rekey: None,
+                    rekey_derivation_method: default_key_derivation_method(), // default value
+
+                    storage_credentials: None, // default value
+                },
+                vdrtools::types::domain::wallet::ExportConfig {
+                    key: self.backup_key.clone(),
+                    path: self.exported_wallet_path.clone(),
+
+                    key_derivation_method: default_key_derivation_method(),
+                },
+            )
+            .await?;
+
+        Ok(())
+    }
+}
diff --git a/aries/aries_vcx_core/src/wallet/indy/wallet.rs b/aries/aries_vcx_core/src/wallet/indy/wallet.rs
deleted file mode 100644
index 00426d85cf..0000000000
--- a/aries/aries_vcx_core/src/wallet/indy/wallet.rs
+++ /dev/null
@@ -1,311 +0,0 @@
-use vdrtools::{
-    types::{
-        domain::wallet::{default_key_derivation_method, KeyDerivationMethod},
-        errors::IndyErrorKind,
-    },
-    DidMethod, Locator, MyDidInfo, WalletHandle,
-};
-
-use crate::{
-    errors::error::{AriesVcxCoreError, AriesVcxCoreErrorKind, VcxCoreResult},
-    wallet::indy::{IssuerConfig, RestoreWalletConfigs, WalletConfig},
-};
-
-pub async fn open_wallet(wallet_config: &WalletConfig) -> VcxCoreResult<WalletHandle> {
-    trace!("open_as_main_wallet >>> {}", &wallet_config.wallet_name);
-
-    Locator::instance()
-        .wallet_controller
-        .open(
-            vdrtools::types::domain::wallet::Config {
-                id: wallet_config.wallet_name.clone(),
-                storage_type: wallet_config.wallet_type.clone(),
-                storage_config: wallet_config
-                    .storage_config
-                    .as_deref()
-                    .map(serde_json::from_str)
-                    .transpose()?,
-                cache: None,
-            },
-            vdrtools::types::domain::wallet::Credentials {
-                key: wallet_config.wallet_key.clone(),
-                key_derivation_method: parse_key_derivation_method(
-                    &wallet_config.wallet_key_derivation,
-                )?,
-
-                rekey: wallet_config.rekey.clone(),
-                rekey_derivation_method: wallet_config
-                    .rekey_derivation_method
-                    .as_deref()
-                    .map(parse_key_derivation_method)
-                    .transpose()?
-                    .unwrap_or_else(default_key_derivation_method),
-
-                storage_credentials: wallet_config
-                    .storage_credentials
-                    .as_deref()
-                    .map(serde_json::from_str)
-                    .transpose()?,
-            },
-        )
-        .await
-        .map_err(From::from)
-}
-
-fn parse_key_derivation_method(method: &str) -> Result<KeyDerivationMethod, AriesVcxCoreError> {
-    match method {
-        "RAW" => Ok(KeyDerivationMethod::RAW),
-        "ARGON2I_MOD" => Ok(KeyDerivationMethod::ARGON2I_MOD),
-        "ARGON2I_INT" => Ok(KeyDerivationMethod::ARGON2I_INT),
-        _ => Err(AriesVcxCoreError::from_msg(
-            AriesVcxCoreErrorKind::InvalidOption,
-            format!("Unknown derivation method {method}"),
-        )),
-    }
-}
-
-pub async fn create_indy_wallet(wallet_config: &WalletConfig) -> VcxCoreResult<()> {
-    trace!("create_wallet >>> {}", &wallet_config.wallet_name);
-
-    let credentials = vdrtools::types::domain::wallet::Credentials {
-        key: wallet_config.wallet_key.clone(),
-        key_derivation_method: parse_key_derivation_method(&wallet_config.wallet_key_derivation)?,
-
-        rekey: None,
-        rekey_derivation_method: default_key_derivation_method(),
-
-        storage_credentials: wallet_config
-            .storage_credentials
-            .as_deref()
-            .map(serde_json::from_str)
-            .transpose()?,
-    };
-
-    trace!("Credentials: {:?}", credentials);
-
-    let res = Locator::instance()
-        .wallet_controller
-        .create(
-            vdrtools::types::domain::wallet::Config {
-                id: wallet_config.wallet_name.clone(),
-                storage_type: wallet_config.wallet_type.clone(),
-                storage_config: wallet_config
-                    .storage_config
-                    .as_deref()
-                    .map(serde_json::from_str)
-                    .transpose()?,
-                cache: None,
-            },
-            credentials,
-        )
-        .await;
-
-    match res {
-        Ok(()) => Ok(()),
-
-        Err(err) if err.kind() == IndyErrorKind::WalletAlreadyExists => {
-            warn!(
-                "wallet \"{}\" already exists. skipping creation",
-                wallet_config.wallet_name
-            );
-            Ok(())
-        }
-
-        Err(err) => Err(AriesVcxCoreError::from_msg(
-            AriesVcxCoreErrorKind::WalletCreate,
-            format!(
-                "could not create wallet {}: {}",
-                wallet_config.wallet_name, err,
-            ),
-        )),
-    }
-}
-
-pub async fn delete_wallet(wallet_config: &WalletConfig) -> VcxCoreResult<()> {
-    trace!(
-        "delete_wallet >>> wallet_name: {}",
-        &wallet_config.wallet_name
-    );
-
-    let credentials = vdrtools::types::domain::wallet::Credentials {
-        key: wallet_config.wallet_key.clone(),
-        key_derivation_method: parse_key_derivation_method(&wallet_config.wallet_key_derivation)?,
-
-        rekey: None,
-        rekey_derivation_method: default_key_derivation_method(),
-
-        storage_credentials: wallet_config
-            .storage_credentials
-            .as_deref()
-            .map(serde_json::from_str)
-            .transpose()?,
-    };
-
-    trace!("Credentials: {:?}", credentials);
-
-    let res = Locator::instance()
-        .wallet_controller
-        .delete(
-            vdrtools::types::domain::wallet::Config {
-                id: wallet_config.wallet_name.clone(),
-                storage_type: wallet_config.wallet_type.clone(),
-                storage_config: wallet_config
-                    .storage_config
-                    .as_deref()
-                    .map(serde_json::from_str)
-                    .transpose()?,
-                cache: None,
-            },
-            credentials,
-        )
-        .await;
-
-    match res {
-        Ok(_) => Ok(()),
-
-        Err(err) if err.kind() == IndyErrorKind::WalletAccessFailed => {
-            Err(AriesVcxCoreError::from_msg(
-                AriesVcxCoreErrorKind::WalletAccessFailed,
-                format!(
-                    "Can not open wallet \"{}\". Invalid key has been provided.",
-                    &wallet_config.wallet_name
-                ),
-            ))
-        }
-
-        Err(err) if err.kind() == IndyErrorKind::WalletNotFound => {
-            Err(AriesVcxCoreError::from_msg(
-                AriesVcxCoreErrorKind::WalletNotFound,
-                format!(
-                    "Wallet \"{}\" not found or unavailable",
-                    &wallet_config.wallet_name,
-                ),
-            ))
-        }
-
-        Err(err) => Err(err.into()),
-    }
-}
-
-pub async fn import(restore_config: &RestoreWalletConfigs) -> VcxCoreResult<()> {
-    trace!(
-        "import >>> wallet: {} exported_wallet_path: {}",
-        restore_config.wallet_name,
-        restore_config.exported_wallet_path
-    );
-
-    Locator::instance()
-        .wallet_controller
-        .import(
-            vdrtools::types::domain::wallet::Config {
-                id: restore_config.wallet_name.clone(),
-                ..Default::default()
-            },
-            vdrtools::types::domain::wallet::Credentials {
-                key: restore_config.wallet_key.clone(),
-                key_derivation_method: restore_config
-                    .wallet_key_derivation
-                    .as_deref()
-                    .map(parse_key_derivation_method)
-                    .transpose()?
-                    .unwrap_or_else(default_key_derivation_method),
-
-                rekey: None,
-                rekey_derivation_method: default_key_derivation_method(), // default value
-
-                storage_credentials: None, // default value
-            },
-            vdrtools::types::domain::wallet::ExportConfig {
-                key: restore_config.backup_key.clone(),
-                path: restore_config.exported_wallet_path.clone(),
-
-                key_derivation_method: default_key_derivation_method(),
-            },
-        )
-        .await?;
-
-    Ok(())
-}
-
-// TODO - FUTURE - can this be moved externally - move to a generic setup util?
-pub async fn wallet_configure_issuer(
-    wallet_handle: WalletHandle,
-    key_seed: &str,
-) -> VcxCoreResult<IssuerConfig> {
-    let (institution_did, _vk) =
-        create_and_store_my_did(wallet_handle, Some(key_seed), None).await?;
-
-    Ok(IssuerConfig { institution_did })
-}
-
-pub async fn export_wallet(
-    wallet_handle: WalletHandle,
-    path: &str,
-    backup_key: &str,
-) -> VcxCoreResult<()> {
-    trace!(
-        "export >>> wallet_handle: {:?}, path: {:?}, backup_key: ****",
-        wallet_handle,
-        path
-    );
-
-    Locator::instance()
-        .wallet_controller
-        .export(
-            wallet_handle,
-            vdrtools::types::domain::wallet::ExportConfig {
-                key: backup_key.into(),
-                path: path.into(),
-
-                key_derivation_method: default_key_derivation_method(),
-            },
-        )
-        .await?;
-
-    Ok(())
-}
-
-pub async fn create_and_open_wallet(wallet_config: &WalletConfig) -> VcxCoreResult<WalletHandle> {
-    create_indy_wallet(wallet_config).await?;
-
-    let handle = open_wallet(wallet_config).await?;
-
-    Ok(handle)
-}
-
-pub async fn close_wallet(wallet_handle: WalletHandle) -> VcxCoreResult<()> {
-    trace!("close_wallet >>>");
-
-    Locator::instance()
-        .wallet_controller
-        .close(wallet_handle)
-        .await?;
-
-    Ok(())
-}
-
-pub async fn create_and_store_my_did(
-    wallet_handle: WalletHandle,
-    seed: Option<&str>,
-    method_name: Option<&str>,
-) -> VcxCoreResult<(String, String)> {
-    trace!(
-        "create_and_store_my_did >>> seed: {:?}, method_name: {:?}",
-        seed,
-        method_name
-    );
-
-    let res = Locator::instance()
-        .did_controller
-        .create_and_store_my_did(
-            wallet_handle,
-            MyDidInfo {
-                method_name: method_name.map(|m| DidMethod(m.into())),
-                seed: seed.map(ToOwned::to_owned),
-                ..MyDidInfo::default()
-            },
-        )
-        .await?;
-
-    Ok(res)
-}
diff --git a/aries/aries_vcx_core/src/wallet/indy/wallet_config.rs b/aries/aries_vcx_core/src/wallet/indy/wallet_config.rs
new file mode 100644
index 0000000000..6f1b62af29
--- /dev/null
+++ b/aries/aries_vcx_core/src/wallet/indy/wallet_config.rs
@@ -0,0 +1,185 @@
+use std::sync::Arc;
+
+use async_trait::async_trait;
+use indy_api_types::{domain::wallet::default_key_derivation_method, errors::IndyErrorKind};
+use serde::{Deserialize, Serialize};
+use typed_builder::TypedBuilder;
+use vdrtools::Locator;
+
+use super::{indy_utils::parse_key_derivation_method, BaseWallet};
+use crate::{
+    errors::error::{AriesVcxCoreError, AriesVcxCoreErrorKind, VcxCoreResult},
+    wallet::{base_wallet::ManageWallet, indy::IndySdkWallet},
+};
+
+#[derive(Clone, Debug, TypedBuilder, Serialize, Deserialize)]
+#[builder(field_defaults(default))]
+pub struct WalletConfig {
+    pub wallet_name: String,
+    pub wallet_key: String,
+    pub wallet_key_derivation: String,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    #[builder(setter(strip_option))]
+    pub wallet_type: Option<String>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    #[builder(setter(strip_option))]
+    pub storage_config: Option<String>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    #[builder(setter(strip_option))]
+    pub storage_credentials: Option<String>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    #[builder(setter(strip_option))]
+    pub rekey: Option<String>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    #[builder(setter(strip_option))]
+    pub rekey_derivation_method: Option<String>,
+}
+
+#[async_trait]
+impl ManageWallet for WalletConfig {
+    async fn create_wallet(&self) -> VcxCoreResult<()> {
+        let credentials = vdrtools::types::domain::wallet::Credentials {
+            key: self.wallet_key.clone(),
+            key_derivation_method: parse_key_derivation_method(&self.wallet_key_derivation)?,
+
+            rekey: None,
+            rekey_derivation_method: default_key_derivation_method(),
+
+            storage_credentials: self
+                .storage_credentials
+                .as_deref()
+                .map(serde_json::from_str)
+                .transpose()?,
+        };
+
+        let res = Locator::instance()
+            .wallet_controller
+            .create(
+                vdrtools::types::domain::wallet::Config {
+                    id: self.wallet_name.clone(),
+                    storage_type: self.wallet_type.clone(),
+                    storage_config: self
+                        .storage_config
+                        .as_deref()
+                        .map(serde_json::from_str)
+                        .transpose()?,
+                    cache: None,
+                },
+                credentials,
+            )
+            .await;
+
+        match res {
+            Ok(()) => Ok(()),
+
+            Err(err) if err.kind() == IndyErrorKind::WalletAlreadyExists => {
+                warn!(
+                    "wallet \"{}\" already exists. skipping creation",
+                    self.wallet_name
+                );
+                Ok(())
+            }
+
+            Err(err) => Err(AriesVcxCoreError::from_msg(
+                AriesVcxCoreErrorKind::WalletCreate,
+                format!("could not create wallet {}: {}", self.wallet_name, err,),
+            )),
+        }
+    }
+
+    async fn open_wallet(&self) -> VcxCoreResult<Arc<dyn BaseWallet>> {
+        let handle = Locator::instance()
+            .wallet_controller
+            .open(
+                vdrtools::types::domain::wallet::Config {
+                    id: self.wallet_name.clone(),
+                    storage_type: self.wallet_type.clone(),
+                    storage_config: self
+                        .storage_config
+                        .as_deref()
+                        .map(serde_json::from_str)
+                        .transpose()?,
+                    cache: None,
+                },
+                vdrtools::types::domain::wallet::Credentials {
+                    key: self.wallet_key.clone(),
+                    key_derivation_method: parse_key_derivation_method(
+                        &self.wallet_key_derivation,
+                    )?,
+
+                    rekey: self.rekey.clone(),
+                    rekey_derivation_method: self
+                        .rekey_derivation_method
+                        .as_deref()
+                        .map(parse_key_derivation_method)
+                        .transpose()?
+                        .unwrap_or_else(default_key_derivation_method),
+
+                    storage_credentials: self
+                        .storage_credentials
+                        .as_deref()
+                        .map(serde_json::from_str)
+                        .transpose()?,
+                },
+            )
+            .await?;
+
+        Ok(Arc::new(IndySdkWallet::new(handle)))
+    }
+
+    async fn delete_wallet(&self) -> VcxCoreResult<()> {
+        let credentials = vdrtools::types::domain::wallet::Credentials {
+            key: self.wallet_key.clone(),
+            key_derivation_method: parse_key_derivation_method(&self.wallet_key_derivation)?,
+
+            rekey: None,
+            rekey_derivation_method: default_key_derivation_method(),
+
+            storage_credentials: self
+                .storage_credentials
+                .as_deref()
+                .map(serde_json::from_str)
+                .transpose()?,
+        };
+
+        let res = Locator::instance()
+            .wallet_controller
+            .delete(
+                vdrtools::types::domain::wallet::Config {
+                    id: self.wallet_name.clone(),
+                    storage_type: self.wallet_type.clone(),
+                    storage_config: self
+                        .storage_config
+                        .as_deref()
+                        .map(serde_json::from_str)
+                        .transpose()?,
+                    cache: None,
+                },
+                credentials,
+            )
+            .await;
+
+        match res {
+            Ok(_) => Ok(()),
+
+            Err(err) if err.kind() == IndyErrorKind::WalletAccessFailed => {
+                Err(AriesVcxCoreError::from_msg(
+                    AriesVcxCoreErrorKind::WalletAccessFailed,
+                    format!(
+                        "Can not open wallet \"{}\". Invalid key has been provided.",
+                        &self.wallet_name
+                    ),
+                ))
+            }
+
+            Err(err) if err.kind() == IndyErrorKind::WalletNotFound => {
+                Err(AriesVcxCoreError::from_msg(
+                    AriesVcxCoreErrorKind::WalletNotFound,
+                    format!("Wallet \"{}\" not found or unavailable", &self.wallet_name,),
+                ))
+            }
+
+            Err(err) => Err(err.into()),
+        }
+    }
+}
diff --git a/aries/aries_vcx_core/src/wallet/indy/wallet_credentials.rs b/aries/aries_vcx_core/src/wallet/indy/wallet_credentials.rs
new file mode 100644
index 0000000000..a634ac6eda
--- /dev/null
+++ b/aries/aries_vcx_core/src/wallet/indy/wallet_credentials.rs
@@ -0,0 +1,13 @@
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Debug, Serialize, Deserialize)]
+struct WalletCredentials {
+    key: String,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    rekey: Option<String>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    storage_credentials: Option<serde_json::Value>,
+    key_derivation_method: String,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    rekey_derivation_method: Option<String>,
+}
diff --git a/aries/aries_vcx_core/src/wallet/mock_wallet.rs b/aries/aries_vcx_core/src/wallet/mock_wallet.rs
index 39052e6d98..fba61dbb5a 100644
--- a/aries/aries_vcx_core/src/wallet/mock_wallet.rs
+++ b/aries/aries_vcx_core/src/wallet/mock_wallet.rs
@@ -3,8 +3,13 @@ use public_key::{Key, KeyType};
 
 use super::{
     base_wallet::{
-        did_data::DidData, record::Record, search_filter::SearchFilter, BaseWallet, DidWallet,
-        RecordWallet,
+        did_data::DidData,
+        did_wallet::DidWallet,
+        issuer_config::IssuerConfig,
+        record::{AllRecords, PartialRecord, Record},
+        record_wallet::RecordWallet,
+        search_filter::SearchFilter,
+        BaseWallet,
     },
     record_tags::RecordTags,
     structs_io::UnpackMessageOutput,
@@ -17,7 +22,38 @@ use crate::{
 #[derive(Debug)]
 pub struct MockWallet;
 
-impl BaseWallet for MockWallet {}
+pub struct MockAllRecords;
+
+#[async_trait]
+impl AllRecords for MockAllRecords {
+    fn total_count(&self) -> VcxCoreResult<Option<usize>> {
+        Ok(Some(0))
+    }
+
+    async fn next(&mut self) -> VcxCoreResult<Option<PartialRecord>> {
+        Ok(None)
+    }
+}
+
+#[async_trait]
+#[allow(unused_variables)]
+impl BaseWallet for MockWallet {
+    async fn export_wallet(&self, path: &str, backup_key: &str) -> VcxCoreResult<()> {
+        Ok(())
+    }
+
+    async fn close_wallet(&self) -> VcxCoreResult<()> {
+        Ok(())
+    }
+
+    async fn configure_issuer(&self, key_seed: &str) -> VcxCoreResult<IssuerConfig> {
+        Ok(IssuerConfig::builder().build())
+    }
+
+    async fn all(&self) -> VcxCoreResult<Box<dyn AllRecords + Send>> {
+        Ok(Box::new(MockAllRecords {}))
+    }
+}
 
 #[async_trait]
 #[allow(unused_variables)]
diff --git a/aries/aries_vcx_core/src/wallet/record_tags.rs b/aries/aries_vcx_core/src/wallet/record_tags.rs
index ed731959a3..cff70a3823 100644
--- a/aries/aries_vcx_core/src/wallet/record_tags.rs
+++ b/aries/aries_vcx_core/src/wallet/record_tags.rs
@@ -2,7 +2,39 @@ use std::fmt;
 
 use serde::{de::Visitor, ser::SerializeMap, Deserialize, Serialize};
 
-pub(crate) type RecordTag = (String, String);
+#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord)]
+pub struct RecordTag {
+    key: String,
+    value: String,
+}
+
+impl RecordTag {
+    pub fn new(key: &str, value: &str) -> Self {
+        Self {
+            key: key.to_owned(),
+            value: value.to_owned(),
+        }
+    }
+
+    pub fn key(&self) -> &str {
+        &self.key
+    }
+
+    pub fn value(&self) -> &str {
+        &self.value
+    }
+
+    pub fn into_pair(self) -> (String, String) {
+        (self.key, self.value)
+    }
+
+    pub fn from_pair(pair: (String, String)) -> Self {
+        Self {
+            key: pair.0,
+            value: pair.1,
+        }
+    }
+}
 
 #[derive(Debug, Default, Clone, PartialEq)]
 pub struct RecordTags {
@@ -16,7 +48,7 @@ impl Serialize for RecordTags {
     {
         let mut map = serializer.serialize_map(Some(self.inner.len()))?;
         for tag in self.inner.iter() {
-            map.serialize_entry(&tag.0, &tag.1)?
+            map.serialize_entry(tag.key(), tag.value())?
         }
         map.end()
     }
@@ -37,8 +69,8 @@ impl<'de> Visitor<'de> for RecordTagsVisitor {
     {
         let mut tags = RecordTags::new(vec![]);
 
-        while let Some(tag) = map.next_entry()? {
-            tags.add(tag);
+        while let Some((key, val)) = map.next_entry()? {
+            tags.add(RecordTag::new(key, val));
         }
 
         Ok(tags)
@@ -81,7 +113,8 @@ impl RecordTags {
     }
 
     pub fn remove(&mut self, tag: RecordTag) {
-        self.inner.retain(|existing_tag| existing_tag.0 != tag.0);
+        self.inner
+            .retain(|existing_tag| existing_tag.key() != tag.key());
         self.inner.sort();
     }
 }
@@ -124,14 +157,12 @@ impl From<RecordTags> for Vec<RecordTag> {
 
 #[cfg(test)]
 mod tests {
+    use crate::wallet::record_tags::{RecordTag, RecordTags};
     use serde_json::json;
 
-    use crate::wallet::record_tags::RecordTags;
-
     #[test]
     fn test_entry_tags_serialize() {
-        let tags = RecordTags::new(vec![("~a".into(), "b".into()), ("c".into(), "d".into())]);
-
+        let tags = RecordTags::new(vec![RecordTag::new("~a", "b"), RecordTag::new("c", "d")]);
         let res = serde_json::to_string(&tags).unwrap();
 
         assert_eq!(json!({ "~a": "b", "c": "d" }).to_string(), res);
@@ -140,9 +171,7 @@ mod tests {
     #[test]
     fn test_entry_tags_deserialize() {
         let json = json!({"a":"b", "~c":"d"});
-
-        let tags = RecordTags::new(vec![("a".into(), "b".into()), ("~c".into(), "d".into())]);
-
+        let tags = RecordTags::new(vec![RecordTag::new("a", "b"), RecordTag::new("~c", "d")]);
         let res = serde_json::from_str(&json.to_string()).unwrap();
 
         assert_eq!(tags, res);
diff --git a/aries/misc/legacy/libvcx_core/src/api_vcx/api_global/agency_client.rs b/aries/misc/legacy/libvcx_core/src/api_vcx/api_global/agency_client.rs
index fdb05c9dcc..7f8da8d644 100644
--- a/aries/misc/legacy/libvcx_core/src/api_vcx/api_global/agency_client.rs
+++ b/aries/misc/legacy/libvcx_core/src/api_vcx/api_global/agency_client.rs
@@ -9,9 +9,7 @@ use aries_vcx::agency_client::{
     messages::update_message::UIDsByConn,
     MessageStatusCode,
 };
-use aries_vcx_core::wallet::{
-    agency_client_wallet::ToBaseAgencyClientWallet, base_wallet::DidWallet,
-};
+use aries_vcx_core::wallet::agency_client_wallet::ToBaseAgencyClientWallet;
 
 use super::profile::get_main_wallet;
 use crate::errors::error::{LibvcxError, LibvcxErrorKind, LibvcxResult};
diff --git a/aries/misc/legacy/libvcx_core/src/api_vcx/api_global/ledger.rs b/aries/misc/legacy/libvcx_core/src/api_vcx/api_global/ledger.rs
index a0972f2079..0f940d3a5b 100644
--- a/aries/misc/legacy/libvcx_core/src/api_vcx/api_global/ledger.rs
+++ b/aries/misc/legacy/libvcx_core/src/api_vcx/api_global/ledger.rs
@@ -30,7 +30,7 @@ pub async fn endorse_transaction(transaction: &str, endorser_did: &str) -> Libvc
     let ledger = get_main_ledger_write()?;
     map_ariesvcx_core_result(
         ledger
-            .endorse_transaction(wallet.as_ref(), &endorser_did.parse()?, transaction)
+            .endorse_transaction(&wallet, &endorser_did.parse()?, transaction)
             .await,
     )
 }
@@ -52,7 +52,7 @@ pub async fn get_ledger_txn(seq_no: i32, submitter_did: Option<String>) -> Libvc
 
 pub async fn rotate_verkey(did: &str) -> LibvcxResult<()> {
     let result = aries_vcx::common::keys::rotate_verkey(
-        get_main_wallet()?.as_ref(),
+        &get_main_wallet()?,
         get_main_ledger_write()?.as_ref(),
         &did.to_owned().parse()?,
     )
@@ -82,7 +82,7 @@ pub async fn ledger_write_endpoint_legacy(
             .set_recipient_keys(recipient_keys)
             .set_routing_keys(routing_keys);
     write_endpoint_legacy(
-        wallet.as_ref(),
+        &wallet,
         get_main_ledger_write()?.as_ref(),
         &target_did.parse()?,
         &service,
@@ -108,7 +108,7 @@ pub async fn ledger_write_endpoint(
             ]))
             .set_routing_keys(Some(routing_keys));
     write_endpoint(
-        wallet.as_ref(),
+        &wallet,
         get_main_ledger_write()?.as_ref(),
         &target_did.parse()?,
         &service,
@@ -132,7 +132,7 @@ pub async fn ledger_clear_attr(target_did: &str, attr: &str) -> LibvcxResult<Str
     let wallet = get_main_wallet()?;
     map_ariesvcx_result(
         clear_attr(
-            wallet.as_ref(),
+            &wallet,
             get_main_ledger_write()?.as_ref(),
             &target_did.parse()?,
             attr,
@@ -150,7 +150,7 @@ pub async fn ledger_write_endorser_did(
     let wallet = get_main_wallet()?;
     map_ariesvcx_result(
         write_endorser_did(
-            wallet.as_ref(),
+            &wallet,
             get_main_ledger_write()?.as_ref(),
             &submitter_did.parse()?,
             &target_did.parse()?,
diff --git a/aries/misc/legacy/libvcx_core/src/api_vcx/api_global/profile.rs b/aries/misc/legacy/libvcx_core/src/api_vcx/api_global/profile.rs
index 6863338194..523d02d18b 100644
--- a/aries/misc/legacy/libvcx_core/src/api_vcx/api_global/profile.rs
+++ b/aries/misc/legacy/libvcx_core/src/api_vcx/api_global/profile.rs
@@ -11,7 +11,7 @@ use aries_vcx_core::{
     ledger::base_ledger::{
         AnoncredsLedgerRead, AnoncredsLedgerWrite, TaaConfigurator, TxnAuthrAgrmtOptions,
     },
-    wallet::indy::IndySdkWallet,
+    wallet::base_wallet::BaseWallet,
 };
 
 use crate::{
@@ -22,14 +22,14 @@ use crate::{
     errors::error::{LibvcxError, LibvcxErrorKind, LibvcxResult},
 };
 
-pub fn try_get_main_wallet() -> LibvcxResult<Option<Arc<IndySdkWallet>>> {
+pub fn try_get_main_wallet() -> LibvcxResult<Option<Arc<dyn BaseWallet>>> {
     let base_wallet = GLOBAL_BASE_WALLET.read()?;
     base_wallet.as_ref().cloned().map(Some).ok_or_else(|| {
         LibvcxError::from_msg(LibvcxErrorKind::NotReady, "Wallet is not initialized")
     })
 }
 
-pub fn get_main_wallet() -> LibvcxResult<Arc<IndySdkWallet>> {
+pub fn get_main_wallet() -> LibvcxResult<Arc<dyn BaseWallet>> {
     let base_wallet = GLOBAL_BASE_WALLET.read()?;
     base_wallet.as_ref().cloned().ok_or_else(|| {
         LibvcxError::from_msg(LibvcxErrorKind::NotReady, "Wallet is not initialized")
diff --git a/aries/misc/legacy/libvcx_core/src/api_vcx/api_global/wallet.rs b/aries/misc/legacy/libvcx_core/src/api_vcx/api_global/wallet.rs
index c032f1d8d7..0cb5426801 100644
--- a/aries/misc/legacy/libvcx_core/src/api_vcx/api_global/wallet.rs
+++ b/aries/misc/legacy/libvcx_core/src/api_vcx/api_global/wallet.rs
@@ -3,24 +3,25 @@ use std::sync::{Arc, RwLock};
 use aries_vcx::{
     aries_vcx_core::{
         anoncreds::{base_anoncreds::BaseAnonCreds, credx_anoncreds::IndyCredxAnonCreds},
-        wallet,
-        wallet::{
-            indy::{
-                internal::{close_search_wallet, fetch_next_records_wallet, open_search_wallet},
-                wallet::{close_wallet, create_indy_wallet, import, open_wallet},
-                IndySdkWallet, IssuerConfig, RestoreWalletConfigs, WalletConfig,
-            },
-            structs_io::UnpackMessageOutput,
-        },
-        SearchHandle, WalletHandle,
+        wallet::structs_io::UnpackMessageOutput,
     },
     global::settings::DEFAULT_LINK_SECRET_ALIAS,
     protocols::mediated_connection::pairwise_info::PairwiseInfo,
 };
-use aries_vcx_core::wallet::{
-    base_wallet::{record::Record, DidWallet, RecordWallet},
-    indy::IndyWalletRecord,
-    record_tags::RecordTags,
+use aries_vcx_core::{
+    errors::error::{AriesVcxCoreError, AriesVcxCoreErrorKind},
+    wallet::{
+        base_wallet::{
+            did_wallet::DidWallet, issuer_config::IssuerConfig, record::Record,
+            record_wallet::RecordWallet, search_filter::SearchFilter, BaseWallet, ImportWallet,
+            ManageWallet,
+        },
+        indy::{
+            indy_wallet_record::IndyWalletRecord, restore_wallet_configs::RestoreWalletConfigs,
+            wallet_config::WalletConfig,
+        },
+        record_tags::RecordTags,
+    },
 };
 use futures::FutureExt;
 use public_key::{Key, KeyType};
@@ -36,29 +37,17 @@ use crate::{
     },
 };
 
-pub static GLOBAL_BASE_WALLET: RwLock<Option<Arc<IndySdkWallet>>> = RwLock::new(None);
+pub static GLOBAL_BASE_WALLET: RwLock<Option<Arc<dyn BaseWallet>>> = RwLock::new(None);
 pub static GLOBAL_BASE_ANONCREDS: RwLock<Option<Arc<IndyCredxAnonCreds>>> = RwLock::new(None);
 
-pub fn get_main_wallet_handle() -> LibvcxResult<WalletHandle> {
-    get_main_wallet().map(|wallet| wallet.get_wallet_handle())
-}
-
 pub async fn export_main_wallet(path: &str, backup_key: &str) -> LibvcxResult<()> {
-    let wallet_handle = get_main_wallet_handle()?;
-    map_ariesvcx_core_result(
-        wallet::indy::wallet::export_wallet(wallet_handle, path, backup_key).await,
-    )
+    let main_wallet = get_main_wallet()?;
+    map_ariesvcx_core_result(main_wallet.export_wallet(path, backup_key).await)
 }
 
-fn build_component_base_wallet(wallet_handle: WalletHandle) -> Arc<IndySdkWallet> {
-    Arc::new(IndySdkWallet::new(wallet_handle))
-}
-
-fn setup_global_wallet(wallet_handle: WalletHandle) -> LibvcxResult<()> {
-    // new way
-    let base_wallet_impl = build_component_base_wallet(wallet_handle);
+fn setup_global_wallet(wallet: Arc<dyn BaseWallet>) -> LibvcxResult<()> {
     let mut b_wallet = GLOBAL_BASE_WALLET.write()?;
-    *b_wallet = Some(base_wallet_impl);
+    *b_wallet = Some(wallet);
     // anoncreds
     let base_anoncreds_impl = Arc::new(IndyCredxAnonCreds);
     let mut b_anoncreds = GLOBAL_BASE_ANONCREDS.write()?;
@@ -66,22 +55,22 @@ fn setup_global_wallet(wallet_handle: WalletHandle) -> LibvcxResult<()> {
     Ok(())
 }
 
-pub fn setup_wallet(handle: WalletHandle) -> LibvcxResult<()> {
-    setup_global_wallet(handle)
-}
-
-pub async fn open_as_main_wallet(wallet_config: &WalletConfig) -> LibvcxResult<WalletHandle> {
-    let handle = wallet::indy::wallet::open_wallet(wallet_config).await?;
-    setup_wallet(handle)?;
-    Ok(handle)
+pub async fn open_as_main_wallet(
+    wallet_config: &WalletConfig,
+) -> LibvcxResult<Arc<dyn BaseWallet>> {
+    let wallet = wallet_config.open_wallet().await?;
+    setup_global_wallet(wallet.clone())?;
+    Ok(wallet)
 }
 
 pub async fn create_and_open_as_main_wallet(
     wallet_config: &WalletConfig,
-) -> LibvcxResult<WalletHandle> {
-    let handle = wallet::indy::wallet::create_and_open_wallet(wallet_config).await?;
-    setup_wallet(handle)?;
-    Ok(handle)
+) -> LibvcxResult<Arc<dyn BaseWallet>> {
+    wallet_config.create_wallet().await?;
+    let wallet = wallet_config.open_wallet().await?;
+
+    setup_global_wallet(wallet.clone())?;
+    Ok(wallet)
 }
 
 pub async fn close_main_wallet() -> LibvcxResult<()> {
@@ -91,7 +80,7 @@ pub async fn close_main_wallet() -> LibvcxResult<()> {
             warn!("Skipping wallet close, no global wallet component available.")
         }
         Some(wallet) => {
-            wallet::indy::wallet::close_wallet(wallet.get_wallet_handle()).await?;
+            wallet.close_wallet().await?;
             let mut b_wallet = GLOBAL_BASE_WALLET.write()?;
             *b_wallet = None;
         }
@@ -106,7 +95,7 @@ pub async fn create_main_wallet(config: &WalletConfig) -> LibvcxResult<()> {
 
     // If MS is already in wallet then just continue
     get_main_anoncreds()?
-        .prover_create_link_secret(wallet.as_ref(), DEFAULT_LINK_SECRET_ALIAS)
+        .prover_create_link_secret(&wallet, DEFAULT_LINK_SECRET_ALIAS)
         .await
         .ok();
 
@@ -146,9 +135,10 @@ pub async fn replace_did_keys_start(did: &str) -> LibvcxResult<String> {
 }
 
 pub async fn rotate_verkey_apply(did: &str, temp_vk: &str) -> LibvcxResult<()> {
+    let wallet = get_main_wallet()?;
     map_ariesvcx_result(
         aries_vcx::common::keys::rotate_verkey_apply(
-            get_main_wallet()?.as_ref(),
+            &wallet,
             get_main_ledger_write()?.as_ref(),
             &did.parse()?,
             temp_vk,
@@ -172,11 +162,8 @@ pub async fn wallet_create_and_store_did(seed: Option<&str>) -> LibvcxResult<Pai
 }
 
 pub async fn wallet_configure_issuer(enterprise_seed: &str) -> LibvcxResult<IssuerConfig> {
-    // TODO - future - use profile wallet to stop indy dependency
-    let wallet = get_main_wallet_handle()?;
-    map_ariesvcx_core_result(
-        wallet::indy::wallet::wallet_configure_issuer(wallet, enterprise_seed).await,
-    )
+    let wallet = get_main_wallet()?;
+    map_ariesvcx_core_result(wallet.configure_issuer(enterprise_seed).await)
 }
 
 pub async fn wallet_add_wallet_record(
@@ -284,67 +271,54 @@ pub async fn wallet_delete_wallet_record(xtype: &str, id: &str) -> LibvcxResult<
     map_ariesvcx_core_result(wallet.delete_record(xtype, id).await)
 }
 
-pub async fn wallet_open_search_wallet(
-    xtype: &str,
-    query_json: &str,
-    options_json: &str,
-) -> LibvcxResult<SearchHandle> {
-    // TODO - future - use profile wallet to stop binding to indy
-    let wallet_handle = get_main_wallet_handle()?;
-    map_ariesvcx_core_result(
-        open_search_wallet(wallet_handle, xtype, query_json, options_json).await,
-    )
-}
+pub async fn wallet_search_records(xtype: &str, query_json: &str) -> LibvcxResult<String> {
+    let wallet = get_main_wallet()?;
+    let records = wallet
+        .search_record(xtype, Some(SearchFilter::JsonFilter(query_json.into())))
+        .await?;
 
-pub async fn wallet_close_search_wallet(wallet_search_handle: SearchHandle) -> LibvcxResult<()> {
-    map_ariesvcx_core_result(close_search_wallet(wallet_search_handle).await)
-}
+    let indy_records = records
+        .into_iter()
+        .map(IndyWalletRecord::from_record)
+        .collect::<Result<Vec<_>, _>>()?;
 
-pub async fn wallet_fetch_next_records_wallet(
-    wallet_search_handle: SearchHandle,
-    count: usize,
-) -> LibvcxResult<String> {
-    // TODO - future - use profile wallet to stop binding to indy
-    let wallet_handle = get_main_wallet_handle()?;
-    map_ariesvcx_core_result(
-        fetch_next_records_wallet(wallet_handle, wallet_search_handle, count).await,
-    )
+    let res = serde_json::to_string(&indy_records)
+        .map_err(|err| AriesVcxCoreError::from_msg(AriesVcxCoreErrorKind::InvalidJson, err));
+
+    map_ariesvcx_core_result(res)
 }
 
 pub async fn wallet_import(config: &RestoreWalletConfigs) -> LibvcxResult<()> {
-    map_ariesvcx_core_result(import(config).await)
+    map_ariesvcx_core_result(config.import_wallet().await)
 }
 
 pub async fn wallet_migrate(wallet_config: &WalletConfig) -> LibvcxResult<()> {
-    let src_wallet_handle = get_main_wallet_handle()?;
+    let src_wallet = get_main_wallet()?;
     info!("Assuring target wallet exists.");
-    create_indy_wallet(wallet_config).await?;
+    wallet_config.create_wallet().await?;
+    let dest_wallet = wallet_config.open_wallet().await?;
     info!("Opening target wallet.");
-    let dest_wallet_handle = open_wallet(wallet_config).await?;
-    info!("Target wallet is ready.");
 
     let migration_res = wallet_migrator::migrate_wallet(
-        src_wallet_handle,
-        dest_wallet_handle,
+        src_wallet,
+        dest_wallet,
         wallet_migrator::vdrtools2credx::migrate_any_record,
     )
     .await;
 
-    info!("Closing source and target wallets");
-    close_wallet(src_wallet_handle).await.ok();
-    close_wallet(dest_wallet_handle).await.ok();
-
     migration_res.map_err(|e| LibvcxError::from_msg(LibvcxErrorKind::WalletMigrationFailed, e))
 }
 
 #[cfg(test)]
 pub mod test_utils {
     use ::test_utils::devsetup::TempFile;
-    use aries_vcx::{
-        aries_vcx_core::wallet::indy::WalletConfig,
-        global::settings::{DEFAULT_WALLET_BACKUP_KEY, DEFAULT_WALLET_KEY, WALLET_KDF_RAW},
+    use aries_vcx::global::settings::{
+        DEFAULT_WALLET_BACKUP_KEY, DEFAULT_WALLET_KEY, WALLET_KDF_RAW,
+    };
+    use aries_vcx_core::wallet::{
+        base_wallet::{did_wallet::DidWallet, record::Record, record_wallet::RecordWallet},
+        indy::wallet_config::WalletConfig,
     };
-    use aries_vcx_core::wallet::base_wallet::{record::Record, DidWallet, RecordWallet};
 
     use crate::{
         api_vcx::api_global::{
@@ -421,11 +395,13 @@ pub mod test_utils {
 #[cfg(test)]
 mod tests {
     use aries_vcx::{
-        aries_vcx_core::wallet::indy::{
-            wallet::delete_wallet, IndyWalletRecord, RestoreWalletConfigs, WalletConfig,
-        },
+        aries_vcx_core::wallet::indy::restore_wallet_configs::RestoreWalletConfigs,
         global::settings::{DEFAULT_WALLET_BACKUP_KEY, DEFAULT_WALLET_KEY, WALLET_KDF_RAW},
     };
+    use aries_vcx_core::wallet::{
+        base_wallet::ManageWallet,
+        indy::{indy_wallet_record::IndyWalletRecord, wallet_config::WalletConfig},
+    };
     use test_utils::devsetup::{SetupMocks, TempFile};
 
     use crate::{
@@ -607,7 +583,7 @@ mod tests {
             .await
             .unwrap();
         close_main_wallet().await.unwrap();
-        delete_wallet(&wallet_config).await.unwrap();
+        wallet_config.delete_wallet().await.unwrap();
         let import_config: RestoreWalletConfigs = serde_json::from_value(json!({
             "wallet_name": wallet_config.wallet_name.clone(),
             "wallet_key": wallet_config.wallet_key.clone(),
@@ -617,7 +593,7 @@ mod tests {
         }))
         .unwrap();
         wallet_import(&import_config).await.unwrap();
-        delete_wallet(&wallet_config).await.unwrap();
+        wallet_config.delete_wallet().await.unwrap();
     }
 
     #[tokio::test]
@@ -671,7 +647,7 @@ mod tests {
         let (export_wallet_path, wallet_name, wallet_config) =
             _create_main_wallet_and_its_backup().await;
 
-        delete_wallet(&wallet_config).await.unwrap();
+        wallet_config.delete_wallet().await.unwrap();
 
         let import_config = RestoreWalletConfigs {
             wallet_name: wallet_name.clone(),
diff --git a/aries/misc/legacy/libvcx_core/src/api_vcx/api_handle/connection.rs b/aries/misc/legacy/libvcx_core/src/api_vcx/api_handle/connection.rs
index c0e60fbb30..a97304ba1a 100644
--- a/aries/misc/legacy/libvcx_core/src/api_vcx/api_handle/connection.rs
+++ b/aries/misc/legacy/libvcx_core/src/api_vcx/api_handle/connection.rs
@@ -138,14 +138,14 @@ where
 // ----------------------------- CONSTRUCTORS ------------------------------------
 pub async fn create_inviter(pw_info: Option<PairwiseInfo>) -> LibvcxResult<u32> {
     trace!("create_inviter >>>");
-    let pw_info = pw_info.unwrap_or(PairwiseInfo::create(get_main_wallet()?.as_ref()).await?);
+    let pw_info = pw_info.unwrap_or(PairwiseInfo::create(&get_main_wallet()?).await?);
     let con = InviterConnection::new_inviter("".to_owned(), pw_info);
     add_connection(con)
 }
 
 pub async fn create_invitee(_invitation: &str) -> LibvcxResult<u32> {
     trace!("create_invitee >>>");
-    let pairwise_info = PairwiseInfo::create(get_main_wallet()?.as_ref()).await?;
+    let pairwise_info = PairwiseInfo::create(&get_main_wallet()?).await?;
     let con = InviteeConnection::new_invitee("".to_owned(), pairwise_info);
     add_connection(con)
 }
@@ -282,7 +282,7 @@ pub async fn process_request(
 
     let con = con
         .handle_request(
-            wallet.as_ref(),
+            &wallet,
             request,
             Url::from_str(&service_endpoint).map_err(|err| {
                 LibvcxError::from_msg(LibvcxErrorKind::InvalidUrl, err.to_string())
@@ -299,9 +299,7 @@ pub async fn process_response(handle: u32, response: &str) -> LibvcxResult<()> {
 
     let con = get_cloned_connection(&handle)?;
     let response = deserialize(response)?;
-    let con = con
-        .handle_response(get_main_wallet()?.as_ref(), response)
-        .await?;
+    let con = con.handle_response(&get_main_wallet()?, response).await?;
 
     insert_connection(handle, con)
 }
@@ -340,7 +338,7 @@ pub async fn send_response(handle: u32) -> LibvcxResult<()> {
 
     let con = get_cloned_connection(&handle)?;
     let response = con.get_connection_response_msg();
-    con.send_message(get_main_wallet()?.as_ref(), &response.into(), &HttpClient)
+    con.send_message(&get_main_wallet()?, &response.into(), &HttpClient)
         .await?;
     insert_connection(handle, con)
 }
@@ -357,7 +355,7 @@ pub async fn send_request(
         .map_err(|err| LibvcxError::from_msg(LibvcxErrorKind::InvalidUrl, err.to_string()))?;
     let con = con.prepare_request(url, routing_keys).await?;
     let request = con.get_request().clone();
-    con.send_message(get_main_wallet()?.as_ref(), &request.into(), &HttpClient)
+    con.send_message(&get_main_wallet()?, &request.into(), &HttpClient)
         .await?;
 
     insert_connection(handle, con)
@@ -367,12 +365,8 @@ pub async fn send_ack(handle: u32) -> LibvcxResult<()> {
     trace!("send_ack >>>");
 
     let con = get_cloned_connection(&handle)?;
-    con.send_message(
-        get_main_wallet()?.as_ref(),
-        &con.get_ack().into(),
-        &HttpClient,
-    )
-    .await?;
+    con.send_message(&get_main_wallet()?, &con.get_ack().into(), &HttpClient)
+        .await?;
     Ok(())
 }
 
@@ -381,7 +375,7 @@ pub async fn send_generic_message(handle: u32, content: String) -> LibvcxResult<
 
     let message = serde_json::from_str(&content)?;
     let con = get_cloned_generic_connection(&handle)?;
-    con.send_message(get_main_wallet()?.as_ref(), &message, &HttpClient)
+    con.send_message(&get_main_wallet()?, &message, &HttpClient)
         .await?;
     Ok(())
 }
diff --git a/aries/misc/legacy/libvcx_core/src/api_vcx/api_handle/credential.rs b/aries/misc/legacy/libvcx_core/src/api_vcx/api_handle/credential.rs
index c1f31208c4..d20c0698db 100644
--- a/aries/misc/legacy/libvcx_core/src/api_vcx/api_handle/credential.rs
+++ b/aries/misc/legacy/libvcx_core/src/api_vcx/api_handle/credential.rs
@@ -226,7 +226,7 @@ pub async fn update_state(
         Some(aries_msg) => {
             credential
                 .process_aries_msg(
-                    get_main_wallet()?.as_ref(),
+                    &get_main_wallet()?,
                     get_main_ledger_read()?.as_ref(),
                     get_main_anoncreds()?.as_ref(),
                     aries_msg.clone(),
@@ -300,7 +300,7 @@ pub async fn delete_credential(handle: u32) -> LibvcxResult<()> {
     );
     let credential = HANDLE_MAP.get_cloned(handle)?;
     credential
-        .delete_credential(get_main_wallet()?.as_ref(), get_main_anoncreds()?.as_ref())
+        .delete_credential(&get_main_wallet()?, get_main_anoncreds()?.as_ref())
         .await?;
     HANDLE_MAP.release(handle)
 }
@@ -331,7 +331,7 @@ pub async fn send_credential_request(handle: u32, connection_handle: u32) -> Lib
     let my_pw_did = mediated_connection::get_pw_did(connection_handle)?;
     let msg_response = credential
         .prepare_credential_request(
-            get_main_wallet()?.as_ref(),
+            &get_main_wallet()?,
             get_main_ledger_read()?.as_ref(),
             get_main_anoncreds()?.as_ref(),
             my_pw_did.parse()?,
diff --git a/aries/misc/legacy/libvcx_core/src/api_vcx/api_handle/credential_def.rs b/aries/misc/legacy/libvcx_core/src/api_vcx/api_handle/credential_def.rs
index a5a69d98a4..bab34b36be 100644
--- a/aries/misc/legacy/libvcx_core/src/api_vcx/api_handle/credential_def.rs
+++ b/aries/misc/legacy/libvcx_core/src/api_vcx/api_handle/credential_def.rs
@@ -43,7 +43,7 @@ pub async fn create(
         })?;
 
     let cred_def = CredentialDef::create(
-        get_main_wallet()?.as_ref(),
+        &get_main_wallet()?,
         get_main_ledger_read()?.as_ref(),
         get_main_anoncreds()?.as_ref(),
         source_id,
@@ -60,7 +60,7 @@ pub async fn publish(handle: u32) -> LibvcxResult<()> {
     if !cd.was_published() {
         cd = cd
             .publish_cred_def(
-                get_main_wallet()?.as_ref(),
+                &get_main_wallet()?,
                 get_main_ledger_read()?.as_ref(),
                 get_main_ledger_write()?.as_ref(),
             )
diff --git a/aries/misc/legacy/libvcx_core/src/api_vcx/api_handle/disclosed_proof.rs b/aries/misc/legacy/libvcx_core/src/api_vcx/api_handle/disclosed_proof.rs
index 796096795a..e250bdd02b 100644
--- a/aries/misc/legacy/libvcx_core/src/api_vcx/api_handle/disclosed_proof.rs
+++ b/aries/misc/legacy/libvcx_core/src/api_vcx/api_handle/disclosed_proof.rs
@@ -287,7 +287,7 @@ pub async fn generate_proof(
     let mut proof = HANDLE_MAP.get_cloned(handle)?;
     proof
         .generate_presentation(
-            get_main_wallet()?.as_ref(),
+            &get_main_wallet()?,
             get_main_ledger_read()?.as_ref(),
             get_main_anoncreds()?.as_ref(),
             serde_json::from_str(credentials)?,
@@ -317,7 +317,7 @@ pub async fn decline_presentation_request(
 pub async fn retrieve_credentials(handle: u32) -> LibvcxResult<String> {
     let proof = HANDLE_MAP.get_cloned(handle)?;
     let retrieved_creds = proof
-        .retrieve_credentials(get_main_wallet()?.as_ref(), get_main_anoncreds()?.as_ref())
+        .retrieve_credentials(&get_main_wallet()?, get_main_anoncreds()?.as_ref())
         .await?;
 
     Ok(serde_json::to_string(&retrieved_creds)?)
diff --git a/aries/misc/legacy/libvcx_core/src/api_vcx/api_handle/issuer_credential.rs b/aries/misc/legacy/libvcx_core/src/api_vcx/api_handle/issuer_credential.rs
index a61d8e93ef..f8760c4187 100644
--- a/aries/misc/legacy/libvcx_core/src/api_vcx/api_handle/issuer_credential.rs
+++ b/aries/misc/legacy/libvcx_core/src/api_vcx/api_handle/issuer_credential.rs
@@ -290,7 +290,7 @@ pub async fn build_credential_offer_msg_v2(
     };
     credential
         .build_credential_offer_msg(
-            get_main_wallet()?.as_ref(),
+            &get_main_wallet()?,
             get_main_anoncreds()?.as_ref(),
             offer_info.clone(),
             comment.map(|s| s.to_string()),
@@ -326,7 +326,7 @@ pub async fn send_credential_offer_nonmediated(
     let wallet = get_main_wallet()?;
 
     let send_message: SendClosure = Box::new(|msg: AriesMessage| {
-        Box::pin(async move { con.send_message(wallet.as_ref(), &msg, &HttpClient).await })
+        Box::pin(async move { con.send_message(&wallet, &msg, &HttpClient).await })
     });
     let credential_offer = credential.get_credential_offer_msg()?;
     send_message(credential_offer).await?;
@@ -338,7 +338,7 @@ pub async fn send_credential_offer_nonmediated(
 pub async fn send_credential(handle: u32, connection_handle: u32) -> LibvcxResult<u32> {
     let mut credential = ISSUER_CREDENTIAL_MAP.get_cloned(handle)?;
     credential
-        .build_credential(get_main_wallet()?.as_ref(), get_main_anoncreds()?.as_ref())
+        .build_credential(&get_main_wallet()?, get_main_anoncreds()?.as_ref())
         .await?;
     match credential.get_state() {
         IssuerState::Failed => {
@@ -360,10 +360,10 @@ pub async fn send_credential_nonmediated(handle: u32, connection_handle: u32) ->
     let con = connection::get_cloned_generic_connection(&connection_handle)?;
     let wallet = get_main_wallet()?;
     let send_closure: SendClosure = Box::new(|msg: AriesMessage| {
-        Box::pin(async move { con.send_message(wallet.as_ref(), &msg, &HttpClient).await })
+        Box::pin(async move { con.send_message(&wallet, &msg, &HttpClient).await })
     });
     credential
-        .build_credential(get_main_wallet()?.as_ref(), get_main_anoncreds()?.as_ref())
+        .build_credential(&get_main_wallet()?, get_main_anoncreds()?.as_ref())
         .await?;
     match credential.get_state() {
         IssuerState::Failed => {
@@ -384,7 +384,7 @@ pub async fn revoke_credential_local(handle: u32) -> LibvcxResult<()> {
     let credential = ISSUER_CREDENTIAL_MAP.get_cloned(handle)?;
     credential
         .revoke_credential_local(
-            get_main_wallet()?.as_ref(),
+            &get_main_wallet()?,
             get_main_anoncreds()?.as_ref(),
             get_main_ledger_read()?.as_ref(),
         )
diff --git a/aries/misc/legacy/libvcx_core/src/api_vcx/api_handle/mediated_connection.rs b/aries/misc/legacy/libvcx_core/src/api_vcx/api_handle/mediated_connection.rs
index 48d60de9b8..2b4f6a2b62 100644
--- a/aries/misc/legacy/libvcx_core/src/api_vcx/api_handle/mediated_connection.rs
+++ b/aries/misc/legacy/libvcx_core/src/api_vcx/api_handle/mediated_connection.rs
@@ -143,7 +143,7 @@ pub async fn create_connection(source_id: &str) -> LibvcxResult<u32> {
     trace!("create_connection >>> source_id: {}", source_id);
     let connection = MediatedConnection::create(
         source_id,
-        get_main_wallet()?.as_ref(),
+        &get_main_wallet()?,
         &get_main_agency_client()?,
         true,
     )
@@ -158,7 +158,7 @@ pub async fn create_connection_with_invite(source_id: &str, details: &str) -> Li
             any_invitation_into_did_doc(get_main_ledger_read()?.as_ref(), &invitation).await?;
         let connection = MediatedConnection::create_with_invite(
             source_id,
-            get_main_wallet()?.as_ref(),
+            &get_main_wallet()?,
             &get_main_agency_client()?,
             invitation,
             ddo,
@@ -183,7 +183,7 @@ pub async fn create_with_request_v2(request: &str, pw_info: PairwiseInfo) -> Lib
     })?;
 
     let connection = MediatedConnection::create_with_request(
-        get_main_wallet()?.as_ref(),
+        &get_main_wallet()?,
         request,
         pw_info,
         &get_main_agency_client()?,
@@ -196,7 +196,7 @@ pub async fn send_generic_message(handle: u32, msg: &str) -> LibvcxResult<String
     let connection = CONNECTION_MAP.get_cloned(handle)?;
 
     connection
-        .send_generic_message(get_main_wallet()?.as_ref(), msg)
+        .send_generic_message(&get_main_wallet()?, msg)
         .await
         .map_err(|err| err.into())
 }
@@ -205,7 +205,7 @@ pub async fn send_handshake_reuse(handle: u32, oob_msg: &str) -> LibvcxResult<()
     let connection = CONNECTION_MAP.get_cloned(handle)?;
 
     connection
-        .send_handshake_reuse(get_main_wallet()?.as_ref(), oob_msg)
+        .send_handshake_reuse(&get_main_wallet()?, oob_msg)
         .await
         .map_err(|err| err.into())
 }
@@ -224,7 +224,7 @@ pub async fn update_state_with_message(handle: u32, message: &str) -> LibvcxResu
 
     connection
         .update_state_with_message(
-            get_main_wallet()?.as_ref(),
+            &get_main_wallet()?,
             get_main_agency_client()?,
             Some(message),
         )
@@ -247,7 +247,7 @@ pub async fn handle_message(handle: u32, message: &str) -> LibvcxResult<()> {
     })?;
 
     connection
-        .handle_message(message, get_main_wallet()?.as_ref())
+        .handle_message(message, &get_main_wallet()?)
         .await?;
     CONNECTION_MAP.insert(handle, connection)
 }
@@ -262,7 +262,7 @@ pub async fn update_state(handle: u32) -> LibvcxResult<u32> {
         );
 
         connection
-            .find_and_handle_message(get_main_wallet()?.as_ref(), &get_main_agency_client()?)
+            .find_and_handle_message(&get_main_wallet()?, &get_main_agency_client()?)
             .await?
     } else {
         info!(
@@ -272,7 +272,7 @@ pub async fn update_state(handle: u32) -> LibvcxResult<u32> {
         );
 
         connection
-            .find_message_and_update_state(get_main_wallet()?.as_ref(), &get_main_agency_client()?)
+            .find_message_and_update_state(&get_main_wallet()?, &get_main_agency_client()?)
             .await?
     };
     let state: u32 = connection.get_state().to_u32();
@@ -290,11 +290,7 @@ pub async fn connect(handle: u32) -> LibvcxResult<Option<String>> {
     let mut connection = CONNECTION_MAP.get_cloned(handle)?;
 
     connection
-        .connect(
-            get_main_wallet()?.as_ref(),
-            &get_main_agency_client()?,
-            None,
-        )
+        .connect(&get_main_wallet()?, &get_main_agency_client()?, None)
         .await?;
     let invitation = connection
         .get_invite_details()
@@ -380,7 +376,7 @@ pub async fn send_message(handle: u32, message: AriesMessage) -> LibvcxResult<()
     trace!("connection::send_message >>>");
     let connection = CONNECTION_MAP.get_cloned(handle)?;
     let wallet = get_main_wallet()?;
-    let send_message = connection.send_message_closure(wallet.as_ref()).await?;
+    let send_message = connection.send_message_closure(&wallet).await?;
     send_message(message).await.map_err(|err| err.into())
 }
 
@@ -388,7 +384,7 @@ pub async fn send_ping(handle: u32, comment: Option<&str>) -> LibvcxResult<()> {
     let mut connection = CONNECTION_MAP.get_cloned(handle)?;
 
     connection
-        .send_ping(get_main_wallet()?.as_ref(), comment.map(String::from))
+        .send_ping(&get_main_wallet()?, comment.map(String::from))
         .await?;
     CONNECTION_MAP.insert(handle, connection)
 }
diff --git a/aries/misc/legacy/libvcx_core/src/api_vcx/api_handle/proof.rs b/aries/misc/legacy/libvcx_core/src/api_vcx/api_handle/proof.rs
index 63c7e70389..7b3c33c81d 100644
--- a/aries/misc/legacy/libvcx_core/src/api_vcx/api_handle/proof.rs
+++ b/aries/misc/legacy/libvcx_core/src/api_vcx/api_handle/proof.rs
@@ -199,7 +199,7 @@ pub async fn update_state_nonmediated(
     let wallet = get_main_wallet()?;
 
     let send_message: SendClosure = Box::new(|msg: AriesMessage| {
-        Box::pin(async move { con.send_message(wallet.as_ref(), &msg, &HttpClient).await })
+        Box::pin(async move { con.send_message(&wallet, &msg, &HttpClient).await })
     });
 
     let message: AriesMessage = serde_json::from_str(message).map_err(|err| {
@@ -286,7 +286,7 @@ pub async fn send_proof_request_nonmediated(
     let wallet = get_main_wallet()?;
 
     let send_message: SendClosure = Box::new(|msg: AriesMessage| {
-        Box::pin(async move { con.send_message(wallet.as_ref(), &msg, &HttpClient).await })
+        Box::pin(async move { con.send_message(&wallet, &msg, &HttpClient).await })
     });
 
     let message = proof.mark_presentation_request_sent()?;
diff --git a/aries/misc/legacy/libvcx_core/src/api_vcx/api_handle/revocation_registry.rs b/aries/misc/legacy/libvcx_core/src/api_vcx/api_handle/revocation_registry.rs
index 568792f56f..1337a61a7e 100644
--- a/aries/misc/legacy/libvcx_core/src/api_vcx/api_handle/revocation_registry.rs
+++ b/aries/misc/legacy/libvcx_core/src/api_vcx/api_handle/revocation_registry.rs
@@ -34,7 +34,7 @@ pub async fn create(config: RevocationRegistryConfig) -> LibvcxResult<u32> {
         tag,
     } = config;
     let rev_reg = RevocationRegistry::create(
-        get_main_wallet()?.as_ref(),
+        &get_main_wallet()?,
         get_main_anoncreds()?.as_ref(),
         &issuer_did.to_string().parse()?,
         &cred_def_id,
@@ -51,7 +51,7 @@ pub async fn publish(handle: u32, tails_url: &str) -> LibvcxResult<u32> {
     let mut rev_reg = REV_REG_MAP.get_cloned(handle)?;
     rev_reg
         .publish_revocation_primitives(
-            get_main_wallet()?.as_ref(),
+            &get_main_wallet()?,
             get_main_ledger_write()?.as_ref(),
             tails_url,
         )
@@ -64,7 +64,7 @@ pub async fn publish_revocations(handle: u32, submitter_did: &str) -> LibvcxResu
     let rev_reg = REV_REG_MAP.get_cloned(handle)?;
     rev_reg
         .publish_local_revocations(
-            get_main_wallet()?.as_ref(),
+            &get_main_wallet()?,
             get_main_anoncreds()?.as_ref(),
             get_main_ledger_write()?.as_ref(),
             &submitter_did.to_string().parse()?,
diff --git a/aries/misc/legacy/libvcx_core/src/api_vcx/api_handle/schema.rs b/aries/misc/legacy/libvcx_core/src/api_vcx/api_handle/schema.rs
index 26d333c208..8a10762491 100644
--- a/aries/misc/legacy/libvcx_core/src/api_vcx/api_handle/schema.rs
+++ b/aries/misc/legacy/libvcx_core/src/api_vcx/api_handle/schema.rs
@@ -52,10 +52,7 @@ pub async fn create_and_publish_schema(
         &data,
     )
     .await?
-    .publish(
-        get_main_wallet()?.as_ref(),
-        get_main_ledger_write()?.as_ref(),
-    )
+    .publish(&get_main_wallet()?, get_main_ledger_write()?.as_ref())
     .await?;
     std::thread::sleep(std::time::Duration::from_millis(100));
     debug!(
diff --git a/aries/misc/legacy/libvdrtools/indy-wallet/src/iterator.rs b/aries/misc/legacy/libvdrtools/indy-wallet/src/iterator.rs
index d72d733a09..81125d769d 100644
--- a/aries/misc/legacy/libvdrtools/indy-wallet/src/iterator.rs
+++ b/aries/misc/legacy/libvdrtools/indy-wallet/src/iterator.rs
@@ -6,7 +6,7 @@ use super::{
     encryption::decrypt_storage_record, storage::StorageIterator, wallet::Keys, WalletRecord,
 };
 
-pub(super) struct WalletIterator {
+pub struct WalletIterator {
     storage_iterator: Box<dyn StorageIterator>,
     keys: Arc<Keys>,
 }
diff --git a/aries/misc/legacy/libvdrtools/indy-wallet/src/lib.rs b/aries/misc/legacy/libvdrtools/indy-wallet/src/lib.rs
index 84bac326bb..7004da52d3 100644
--- a/aries/misc/legacy/libvdrtools/indy-wallet/src/lib.rs
+++ b/aries/misc/legacy/libvdrtools/indy-wallet/src/lib.rs
@@ -8,7 +8,7 @@ use std::{
 };
 
 use indy_api_types::{
-    domain::wallet::{CacheConfig, Config, Credentials, ExportConfig, IndyRecord, Tags},
+    domain::wallet::{CacheConfig, Config, Credentials, ExportConfig, Tags},
     errors::prelude::*,
     WalletHandle,
 };
@@ -16,7 +16,8 @@ use indy_utils::{
     crypto::chacha20poly1305_ietf::{self, Key as MasterKey},
     secret,
 };
-use log::{error, info, trace, warn};
+use iterator::WalletIterator;
+use log::trace;
 use serde::{Deserialize, Serialize};
 use serde_json::Value as SValue;
 
@@ -31,7 +32,7 @@ use crate::{
 };
 
 mod encryption;
-mod iterator;
+pub mod iterator;
 mod query_encryption;
 mod storage;
 
@@ -42,14 +43,6 @@ mod cache;
 mod export_import;
 mod wallet;
 
-#[derive(Debug)]
-pub struct MigrationResult {
-    migrated: u32,
-    skipped: u32,
-    duplicated: u32,
-    failed: u32,
-}
-
 #[allow(clippy::type_complexity)]
 pub struct WalletService {
     storage_types: Mutex<HashMap<String, Arc<dyn WalletStorageType>>>,
@@ -709,126 +702,9 @@ impl WalletService {
         Ok(())
     }
 
-    pub async fn migrate_records<E>(
-        &self,
-        old_wh: WalletHandle,
-        new_wh: WalletHandle,
-        mut migrate_fn: impl FnMut(IndyRecord) -> Result<Option<IndyRecord>, E>,
-    ) -> IndyResult<MigrationResult>
-    where
-        E: std::fmt::Display,
-    {
-        let old_wallet = self.get_wallet(old_wh).await?;
-        let new_wallet = self.get_wallet(new_wh).await?;
-
-        let mut records = old_wallet.get_all().await?;
-        let total = records.get_total_count()?;
-        info!("Migrating {total:?} records");
-        let mut num_record = 0;
-        let mut migration_result = MigrationResult {
-            migrated: 0,
-            skipped: 0,
-            duplicated: 0,
-            failed: 0,
-        };
-
-        while let Some(source_record) = records.next().await? {
-            num_record += 1;
-            if num_record % 1000 == 1 {
-                warn!(
-                    "Migrating wallet record number {num_record} / {total:?}, intermediary \
-                     migration result: ${migration_result:?}"
-                );
-            }
-            trace!("Migrating record: {:?}", source_record);
-            let unwrapped_type_ = match &source_record.type_ {
-                None => {
-                    warn!(
-                        "Skipping item missing 'type' field, record ({num_record}): \
-                         {source_record:?}"
-                    );
-                    migration_result.skipped += 1;
-                    continue;
-                }
-                Some(type_) => type_.clone(),
-            };
-            let unwrapped_value = match &source_record.value {
-                None => {
-                    warn!(
-                        "Skipping item missing 'value' field, record ({num_record}): \
-                         {source_record:?}"
-                    );
-                    migration_result.skipped += 1;
-                    continue;
-                }
-                Some(value) => value.clone(),
-            };
-            let unwrapped_tags = match &source_record.tags {
-                None => HashMap::new(),
-                Some(tags) => tags.clone(),
-            };
-
-            let record = IndyRecord {
-                type_: unwrapped_type_,
-                id: source_record.id.clone(),
-                value: unwrapped_value,
-                tags: unwrapped_tags,
-            };
-
-            let migrated_record = match migrate_fn(record) {
-                Ok(record) => match record {
-                    None => {
-                        warn!("Skipping non-migratable record ({num_record}): {source_record:?}");
-                        migration_result.skipped += 1;
-                        continue;
-                    }
-                    Some(record) => record,
-                },
-                Err(err) => {
-                    warn!(
-                        "Skipping item due failed item migration, record ({num_record}): \
-                         {source_record:?}, err: {err}"
-                    );
-                    migration_result.failed += 1;
-                    continue;
-                }
-            };
-
-            match new_wallet
-                .add(
-                    &migrated_record.type_,
-                    &migrated_record.id,
-                    &migrated_record.value,
-                    &migrated_record.tags,
-                    false,
-                )
-                .await
-            {
-                Err(err) => match err.kind() {
-                    IndyErrorKind::WalletItemAlreadyExists => {
-                        trace!(
-                            "Record type: {migrated_record:?} already exists in destination \
-                             wallet, skipping"
-                        );
-                        migration_result.duplicated += 1;
-                        continue;
-                    }
-                    _ => {
-                        error!(
-                            "Error adding record {migrated_record:?} to destination wallet: \
-                             {err:?}"
-                        );
-                        migration_result.failed += 1;
-                        return Err(err);
-                    }
-                },
-                Ok(()) => {
-                    migration_result.migrated += 1;
-                }
-            }
-        }
-        warn!("Migration of total {total:?} records completed, result: ${migration_result:?}");
-        Ok(migration_result)
+    pub async fn get_all(&self, handle: WalletHandle) -> IndyResult<WalletIterator> {
+        let wallet = self.get_wallet(handle).await?;
+        wallet.get_all().await
     }
 
     pub async fn export_wallet(
diff --git a/aries/misc/legacy/libvdrtools/indy-wallet/src/wallet.rs b/aries/misc/legacy/libvdrtools/indy-wallet/src/wallet.rs
index e21d29afff..3f11b26b8a 100644
--- a/aries/misc/legacy/libvdrtools/indy-wallet/src/wallet.rs
+++ b/aries/misc/legacy/libvdrtools/indy-wallet/src/wallet.rs
@@ -20,7 +20,7 @@ use crate::{
 };
 
 #[derive(Serialize, Deserialize)]
-pub(super) struct Keys {
+pub struct Keys {
     pub type_key: chacha20poly1305_ietf::Key,
     pub name_key: chacha20poly1305_ietf::Key,
     pub value_key: chacha20poly1305_ietf::Key,
@@ -30,6 +30,7 @@ pub(super) struct Keys {
     pub tags_hmac_key: hmacsha256::Key,
 }
 
+#[allow(clippy::new_without_default)]
 impl Keys {
     pub fn new() -> Keys {
         Keys {
diff --git a/aries/misc/legacy/libvdrtools/src/controllers/wallet.rs b/aries/misc/legacy/libvdrtools/src/controllers/wallet.rs
index 11eb3a8404..bc4eaf37ef 100644
--- a/aries/misc/legacy/libvdrtools/src/controllers/wallet.rs
+++ b/aries/misc/legacy/libvdrtools/src/controllers/wallet.rs
@@ -2,14 +2,14 @@ use std::sync::Arc;
 
 // use async_std::task::spawn_blocking;
 use indy_api_types::{
-    domain::wallet::{Config, Credentials, ExportConfig, IndyRecord, KeyConfig},
+    domain::wallet::{Config, Credentials, ExportConfig, KeyConfig},
     errors::prelude::*,
     WalletHandle,
 };
 use indy_utils::crypto::{
     chacha20poly1305_ietf, chacha20poly1305_ietf::Key as MasterKey, randombytes,
 };
-use indy_wallet::{KeyDerivationData, MigrationResult, WalletService};
+use indy_wallet::{iterator::WalletIterator, KeyDerivationData, WalletService};
 
 use crate::{services::CryptoService, utils::crypto::base58::ToBase58};
 
@@ -387,18 +387,8 @@ impl WalletController {
         res
     }
 
-    pub async fn migrate_records<E>(
-        &self,
-        old_wh: WalletHandle,
-        new_wh: WalletHandle,
-        migrate_fn: impl FnMut(IndyRecord) -> Result<Option<IndyRecord>, E>,
-    ) -> IndyResult<MigrationResult>
-    where
-        E: std::fmt::Display,
-    {
-        self.wallet_service
-            .migrate_records(old_wh, new_wh, migrate_fn)
-            .await
+    pub async fn get_all(&self, handle: WalletHandle) -> IndyResult<WalletIterator> {
+        self.wallet_service.get_all(handle).await
     }
 
     /// Generate wallet master key.
diff --git a/aries/misc/legacy/libvdrtools/src/lib.rs b/aries/misc/legacy/libvdrtools/src/lib.rs
index d8e22c6bb2..006e3b81f4 100644
--- a/aries/misc/legacy/libvdrtools/src/lib.rs
+++ b/aries/misc/legacy/libvdrtools/src/lib.rs
@@ -8,6 +8,7 @@ extern crate serde_derive;
 extern crate indy_utils;
 
 pub use indy_api_types as types;
+pub use indy_wallet;
 
 #[macro_use]
 mod utils;
diff --git a/aries/misc/test_utils/src/devsetup.rs b/aries/misc/test_utils/src/devsetup.rs
index 497cd41483..cebf90abeb 100644
--- a/aries/misc/test_utils/src/devsetup.rs
+++ b/aries/misc/test_utils/src/devsetup.rs
@@ -35,8 +35,6 @@ use crate::devsetup::vdr_proxy_ledger::dev_build_profile_vdr_proxy_ledger;
 
 #[cfg(feature = "vdrtools_wallet")]
 pub mod vdrtools_wallet;
-#[cfg(feature = "vdrtools_wallet")]
-use crate::devsetup::vdrtools_wallet::dev_build_indy_wallet;
 
 const DEFAULT_AML_LABEL: &str = "eula";
 
@@ -211,7 +209,9 @@ pub async fn dev_build_featured_wallet(key_seed: &str) -> (String, impl BaseWall
     #[cfg(feature = "vdrtools_wallet")]
     return {
         info!("SetupProfile >> using indy wallet");
-        dev_build_indy_wallet(key_seed).await
+
+        use crate::devsetup::vdrtools_wallet::dev_setup_wallet_indy;
+        dev_setup_wallet_indy(key_seed).await
     };
 
     #[cfg(not(feature = "vdrtools_wallet"))]
diff --git a/aries/misc/test_utils/src/devsetup/vdrtools_wallet.rs b/aries/misc/test_utils/src/devsetup/vdrtools_wallet.rs
index f7c13fc3e9..1ae18c236f 100644
--- a/aries/misc/test_utils/src/devsetup/vdrtools_wallet.rs
+++ b/aries/misc/test_utils/src/devsetup/vdrtools_wallet.rs
@@ -1,17 +1,15 @@
+use std::sync::Arc;
+
 use aries_vcx_core::{
     global::settings::{DEFAULT_WALLET_KEY, WALLET_KDF_RAW},
     wallet::{
-        base_wallet::BaseWallet,
-        indy::{
-            wallet::{create_and_open_wallet, create_and_store_my_did},
-            WalletConfig,
-        },
+        base_wallet::{BaseWallet, ManageWallet},
+        indy::wallet_config::WalletConfig,
     },
-    WalletHandle,
 };
 use log::info;
 
-pub async fn dev_setup_wallet_indy(key_seed: &str) -> (String, WalletHandle) {
+pub async fn dev_setup_wallet_indy(key_seed: &str) -> (String, Arc<dyn BaseWallet>) {
     info!("dev_setup_wallet_indy >>");
     let config_wallet = WalletConfig {
         wallet_name: format!("wallet_{}", uuid::Uuid::new_v4()),
@@ -23,18 +21,14 @@ pub async fn dev_setup_wallet_indy(key_seed: &str) -> (String, WalletHandle) {
         rekey: None,
         rekey_derivation_method: None,
     };
-    let wallet_handle = create_and_open_wallet(&config_wallet).await.unwrap();
-    // todo: can we just extract this away? not always we end up using it (alice test agent)
-    let (did, _vk) = create_and_store_my_did(wallet_handle, Some(key_seed), None)
-        .await
-        .unwrap();
 
-    (did, wallet_handle)
-}
+    config_wallet.create_wallet().await.unwrap();
+    let wallet = config_wallet.open_wallet().await.unwrap();
 
-pub async fn dev_build_indy_wallet(key_seed: &str) -> (String, impl BaseWallet) {
-    use aries_vcx_core::wallet::indy::IndySdkWallet;
+    let did_data = wallet
+        .create_and_store_my_did(Some(key_seed), None)
+        .await
+        .unwrap();
 
-    let (public_did, wallet_handle) = dev_setup_wallet_indy(key_seed).await;
-    (public_did, IndySdkWallet::new(wallet_handle))
+    (did_data.did().to_owned(), wallet)
 }
diff --git a/aries/misc/wallet_migrator/src/error.rs b/aries/misc/wallet_migrator/src/error.rs
index 5db1a8c183..b7cd400526 100644
--- a/aries/misc/wallet_migrator/src/error.rs
+++ b/aries/misc/wallet_migrator/src/error.rs
@@ -1,3 +1,4 @@
+use aries_vcx_core::errors::error::AriesVcxCoreError;
 use serde_json::Error as JsonError;
 use thiserror::Error as ThisError;
 use vdrtools::IndyError;
@@ -10,6 +11,6 @@ pub enum MigrationError {
     Json(#[from] JsonError),
     #[error("Indy error: {0}")]
     Indy(#[from] IndyError),
-    #[error("Source and destination wallets must be different!")]
-    EqualWalletHandles,
+    #[error("VcxCore error: {0}")]
+    VcxCore(#[from] AriesVcxCoreError),
 }
diff --git a/aries/misc/wallet_migrator/src/lib.rs b/aries/misc/wallet_migrator/src/lib.rs
index d29b523efe..bf2ed402d9 100644
--- a/aries/misc/wallet_migrator/src/lib.rs
+++ b/aries/misc/wallet_migrator/src/lib.rs
@@ -4,93 +4,32 @@ pub mod vdrtools2credx;
 
 use std::fmt::Display;
 
+use aries_vcx_core::wallet::base_wallet::{migrate::migrate_records, record::Record, BaseWallet};
 use error::MigrationResult;
-use log::{error, info};
+use log::info;
 pub use vdrtools::types::domain::wallet::IndyRecord;
-use vdrtools::{Locator, WalletHandle};
-
-use crate::error::MigrationError;
 
 /// Retrieves all records from the source wallet and migrates them
 /// by applying the `migrate_fn` argument. The records are then
 /// placed in the destination wallet.
 pub async fn migrate_wallet<E>(
-    src_wallet_handle: WalletHandle,
-    dest_wallet_handle: WalletHandle,
-    migrate_fn: impl FnMut(IndyRecord) -> Result<Option<IndyRecord>, E>,
+    src_wallet: impl BaseWallet,
+    dest_wallet: impl BaseWallet,
+    migrate_fn: impl FnMut(Record) -> Result<Option<Record>, E>,
 ) -> MigrationResult<()>
 where
     E: Display,
 {
     info!("Starting wallet migration");
 
-    if src_wallet_handle == dest_wallet_handle {
-        error!("Equal wallet handles: {src_wallet_handle:?} {dest_wallet_handle:?}");
-        return Err(MigrationError::EqualWalletHandles);
-    }
-
     info!(
-        "Migrating records from wallet with handle {src_wallet_handle:?} to wallet with handle \
-         {dest_wallet_handle:?}"
+        "Migrating records from wallet with handle {src_wallet:?} to wallet with handle \
+         {dest_wallet:?}"
     );
 
-    Locator::instance()
-        .wallet_controller
-        .migrate_records(src_wallet_handle, dest_wallet_handle, migrate_fn)
-        .await?;
+    migrate_records(src_wallet, dest_wallet, migrate_fn).await?;
 
-    info!(
-        "Completed migration from wallet with handle {src_wallet_handle:?} to wallet with handle \
-         {dest_wallet_handle:?}"
-    );
+    info!("Migration completed");
 
     Ok(())
 }
-
-#[cfg(test)]
-mod tests {
-    use vdrtools::{
-        types::domain::wallet::{Config, Credentials, KeyDerivationMethod},
-        Locator,
-    };
-
-    #[tokio::test]
-    #[should_panic]
-    async fn test_cant_open_wallet_twice() {
-        let wallet_key = "8dvfYSt5d1taSd6yJdpjq4emkwsPDDLYxkNFysFD2cZY".to_owned();
-        let wallet_name = "wallet_with_some_name".to_owned();
-
-        let credentials = Credentials {
-            key: wallet_key,
-            key_derivation_method: KeyDerivationMethod::RAW,
-            rekey: None,
-            rekey_derivation_method: KeyDerivationMethod::ARGON2I_MOD,
-            storage_credentials: None,
-        };
-
-        let config = Config {
-            id: wallet_name,
-            storage_type: None,
-            storage_config: None,
-            cache: None,
-        };
-
-        Locator::instance()
-            .wallet_controller
-            .create(config.clone(), credentials.clone())
-            .await
-            .unwrap();
-
-        let _first_wh = Locator::instance()
-            .wallet_controller
-            .open(config.clone(), credentials.clone())
-            .await
-            .unwrap();
-
-        let _second_wh = Locator::instance()
-            .wallet_controller
-            .open(config, credentials)
-            .await
-            .unwrap();
-    }
-}
diff --git a/aries/misc/wallet_migrator/src/vdrtools2credx/mod.rs b/aries/misc/wallet_migrator/src/vdrtools2credx/mod.rs
index f6fb140f7b..9c2f063ca5 100644
--- a/aries/misc/wallet_migrator/src/vdrtools2credx/mod.rs
+++ b/aries/misc/wallet_migrator/src/vdrtools2credx/mod.rs
@@ -1,7 +1,7 @@
 pub mod conv;
 
+use aries_vcx_core::wallet::base_wallet::record::Record;
 use log::trace;
-use vdrtools::types::domain::wallet::IndyRecord;
 
 use crate::error::MigrationResult;
 
@@ -21,30 +21,38 @@ pub(crate) const INDY_REV_REG_DEF: &str = "Indy::RevocationRegistryDefinition";
 pub(crate) const INDY_REV_REG_DEF_PRIV: &str = "Indy::RevocationRegistryDefinitionPrivate";
 
 /// Contains the logic for record mapping and migration.
-pub fn migrate_any_record(record: IndyRecord) -> MigrationResult<Option<IndyRecord>> {
+pub fn migrate_any_record(record: Record) -> MigrationResult<Option<Record>> {
     trace!("Migrating wallet record {record:?}");
 
-    let record = match record.type_.as_str() {
+    let record = match record.category() {
         // Indy wallet records - to be left alone!
         INDY_DID | INDY_KEY => Ok(Some(record)),
         // Master secret
-        INDY_MASTER_SECRET => Some(conv::convert_master_secret(record)).transpose(),
+        INDY_MASTER_SECRET => {
+            conv::convert_master_secret(record.into()).map(|res| Some(res.into()))
+        }
         // Credential
-        INDY_CRED => Some(conv::convert_cred(record)).transpose(),
-        INDY_CRED_DEF => Some(conv::convert_cred_def(record)).transpose(),
-        INDY_CRED_DEF_PRIV => Some(conv::convert_cred_def_priv_key(record)).transpose(),
+        INDY_CRED => conv::convert_cred(record.into()).map(|res| Some(res.into())),
+        INDY_CRED_DEF => conv::convert_cred_def(record.into()).map(|res| Some(res.into())),
+        INDY_CRED_DEF_PRIV => {
+            conv::convert_cred_def_priv_key(record.into()).map(|res| Some(res.into()))
+        }
         INDY_CRED_DEF_CR_PROOF => {
-            Some(conv::convert_cred_def_correctness_proof(record)).transpose()
+            conv::convert_cred_def_correctness_proof(record.into()).map(|res| Some(res.into()))
+        }
+        // // Schema
+        INDY_SCHEMA => conv::convert_schema(record.into()).map(|res| Some(res.into())),
+        INDY_SCHEMA_ID => conv::convert_schema_id(record.into()).map(|res| Some(res.into())),
+        // // Revocation registry
+        INDY_REV_REG => conv::convert_rev_reg(record.into()).map(|res| Some(res.into())),
+        INDY_REV_REG_DELTA => {
+            conv::convert_rev_reg_delta(record.into()).map(|res| Some(res.into()))
+        }
+        INDY_REV_REG_INFO => conv::convert_rev_reg_info(record.into()).map(|res| Some(res.into())),
+        INDY_REV_REG_DEF => conv::convert_rev_reg_def(record.into()).map(|res| Some(res.into())),
+        INDY_REV_REG_DEF_PRIV => {
+            conv::convert_rev_reg_def_priv(record.into()).map(|res| Some(res.into()))
         }
-        // Schema
-        INDY_SCHEMA => Some(conv::convert_schema(record)).transpose(),
-        INDY_SCHEMA_ID => Some(conv::convert_schema_id(record)).transpose(),
-        // Revocation registry
-        INDY_REV_REG => Some(conv::convert_rev_reg(record)).transpose(),
-        INDY_REV_REG_DELTA => Some(conv::convert_rev_reg_delta(record)).transpose(),
-        INDY_REV_REG_INFO => Some(conv::convert_rev_reg_info(record)).transpose(),
-        INDY_REV_REG_DEF => Some(conv::convert_rev_reg_def(record)).transpose(),
-        INDY_REV_REG_DEF_PRIV => Some(conv::convert_rev_reg_def_priv(record)).transpose(),
         _ => Ok(None), // Ignore unknown/uninteresting records
     };
 
@@ -56,11 +64,14 @@ pub fn migrate_any_record(record: IndyRecord) -> MigrationResult<Option<IndyReco
 mod tests {
     use std::collections::{HashMap, HashSet};
 
-    use aries_vcx_core::anoncreds::credx_anoncreds::{
-        RevocationRegistryInfo, CATEGORY_CREDENTIAL, CATEGORY_CRED_DEF, CATEGORY_CRED_DEF_PRIV,
-        CATEGORY_CRED_KEY_CORRECTNESS_PROOF, CATEGORY_CRED_MAP_SCHEMA_ID, CATEGORY_CRED_SCHEMA,
-        CATEGORY_LINK_SECRET, CATEGORY_REV_REG, CATEGORY_REV_REG_DEF, CATEGORY_REV_REG_DEF_PRIV,
-        CATEGORY_REV_REG_DELTA, CATEGORY_REV_REG_INFO,
+    use aries_vcx_core::{
+        anoncreds::credx_anoncreds::{
+            RevocationRegistryInfo, CATEGORY_CREDENTIAL, CATEGORY_CRED_DEF, CATEGORY_CRED_DEF_PRIV,
+            CATEGORY_CRED_KEY_CORRECTNESS_PROOF, CATEGORY_CRED_MAP_SCHEMA_ID, CATEGORY_CRED_SCHEMA,
+            CATEGORY_LINK_SECRET, CATEGORY_REV_REG, CATEGORY_REV_REG_DEF,
+            CATEGORY_REV_REG_DEF_PRIV, CATEGORY_REV_REG_DELTA, CATEGORY_REV_REG_INFO,
+        },
+        wallet::indy::IndySdkWallet,
     };
     use credx::{
         anoncreds_clsignatures::{bn::BigNumber, LinkSecret as ClLinkSecret},
@@ -68,7 +79,7 @@ mod tests {
     };
     use serde_json::json;
     use vdrtools::{
-        types::domain::wallet::{Config, Credentials, KeyDerivationMethod},
+        types::domain::wallet::{Config, Credentials, IndyRecord, KeyDerivationMethod},
         Locator, WalletHandle,
     };
 
@@ -251,8 +262,11 @@ mod tests {
             .await
             .unwrap();
 
+        let src_wallet = IndySdkWallet::new(src_wallet_handle);
+        let dest_wallet = IndySdkWallet::new(dest_wallet_handle);
+
         // Migrate the records
-        migrate_wallet(src_wallet_handle, dest_wallet_handle, migrate_any_record)
+        migrate_wallet(src_wallet, dest_wallet, migrate_any_record)
             .await
             .unwrap();
 
diff --git a/aries/wrappers/uniffi-aries-vcx/core/src/core/profile.rs b/aries/wrappers/uniffi-aries-vcx/core/src/core/profile.rs
index aae27fb251..ed326a28b2 100644
--- a/aries/wrappers/uniffi-aries-vcx/core/src/core/profile.rs
+++ b/aries/wrappers/uniffi-aries-vcx/core/src/core/profile.rs
@@ -9,7 +9,10 @@ use aries_vcx::{
             request_submitter::vdr_ledger::{IndyVdrLedgerPool, IndyVdrSubmitter},
             response_cacher::in_memory::{InMemoryResponseCacher, InMemoryResponseCacherConfig},
         },
-        wallet::indy::{wallet::create_and_open_wallet, IndySdkWallet, WalletConfig},
+        wallet::{
+            base_wallet::{BaseWallet, ManageWallet},
+            indy::wallet_config::WalletConfig,
+        },
         PoolConfig,
     },
     errors::error::{AriesVcxError, AriesVcxErrorKind, VcxResult},
@@ -20,7 +23,7 @@ use crate::{errors::error::VcxUniFFIResult, runtime::block_on};
 
 #[derive(Debug)]
 pub struct UniffiProfile {
-    wallet: IndySdkWallet,
+    wallet: Arc<dyn BaseWallet>,
     anoncreds: IndyCredxAnonCreds,
     ledger_read: IndyVdrLedgerRead<IndyVdrSubmitter, InMemoryResponseCacher>,
 }
@@ -34,7 +37,7 @@ impl UniffiProfile {
         &self.anoncreds
     }
 
-    pub fn wallet(&self) -> &IndySdkWallet {
+    pub fn wallet(&self) -> &Arc<dyn BaseWallet> {
         &self.wallet
     }
 
@@ -58,8 +61,8 @@ pub fn new_indy_profile(
     enable_logging();
 
     block_on(async {
-        let wh = create_and_open_wallet(&wallet_config).await?;
-        let wallet = IndySdkWallet::new(wh);
+        wallet_config.create_wallet().await?;
+        let wallet = wallet_config.open_wallet().await?;
 
         let anoncreds = IndyCredxAnonCreds;
 
diff --git a/aries/wrappers/uniffi-aries-vcx/core/src/core/unpack_message.rs b/aries/wrappers/uniffi-aries-vcx/core/src/core/unpack_message.rs
index f78f1529aa..83f417b03a 100644
--- a/aries/wrappers/uniffi-aries-vcx/core/src/core/unpack_message.rs
+++ b/aries/wrappers/uniffi-aries-vcx/core/src/core/unpack_message.rs
@@ -1,6 +1,8 @@
 use std::sync::Arc;
 
-use aries_vcx::aries_vcx_core::wallet::{base_wallet::DidWallet, structs_io::UnpackMessageOutput};
+use aries_vcx::aries_vcx_core::wallet::{
+    base_wallet::did_wallet::DidWallet, structs_io::UnpackMessageOutput,
+};
 
 use super::profile::ProfileHolder;
 use crate::{errors::error::VcxUniFFIResult, runtime::block_on};
diff --git a/aries/wrappers/uniffi-aries-vcx/core/src/lib.rs b/aries/wrappers/uniffi-aries-vcx/core/src/lib.rs
index da63c32708..db610a813d 100644
--- a/aries/wrappers/uniffi-aries-vcx/core/src/lib.rs
+++ b/aries/wrappers/uniffi-aries-vcx/core/src/lib.rs
@@ -6,7 +6,8 @@ pub mod handlers;
 pub mod runtime;
 
 use aries_vcx::{
-    aries_vcx_core::wallet::indy::WalletConfig, protocols::connection::pairwise_info::PairwiseInfo,
+    aries_vcx_core::wallet::indy::wallet_config::WalletConfig,
+    protocols::connection::pairwise_info::PairwiseInfo,
 };
 use handlers::{connection::*, holder::*};
 
diff --git a/aries/wrappers/vcx-napi-rs/src/api/wallet.rs b/aries/wrappers/vcx-napi-rs/src/api/wallet.rs
index d089b46ada..858a937cda 100644
--- a/aries/wrappers/vcx-napi-rs/src/api/wallet.rs
+++ b/aries/wrappers/vcx-napi-rs/src/api/wallet.rs
@@ -1,11 +1,13 @@
+use std::{ops::Deref, sync::Arc};
+
 use libvcx_core::{
     api_vcx::api_global::{ledger, wallet},
-    aries_vcx::aries_vcx_core::wallet::indy::{
-        wallet::delete_wallet, RestoreWalletConfigs, WalletConfig,
+    aries_vcx::aries_vcx_core::wallet::{
+        base_wallet::{BaseWallet, ManageWallet},
+        indy::{restore_wallet_configs::RestoreWalletConfigs, wallet_config::WalletConfig},
     },
     errors::error::{LibvcxError, LibvcxErrorKind},
-    serde_json,
-    serde_json::json,
+    serde_json::{self, json},
 };
 use napi::bindgen_prelude::Buffer;
 use napi_derive::napi;
@@ -13,7 +15,18 @@ use napi_derive::napi;
 use crate::error::to_napi_err;
 
 #[napi]
-pub async fn wallet_open_as_main(wallet_config: String) -> napi::Result<i32> {
+pub struct NapiWallet(Arc<dyn BaseWallet>);
+
+impl Deref for NapiWallet {
+    type Target = Arc<dyn BaseWallet>;
+
+    fn deref(&self) -> &Self::Target {
+        &self.0
+    }
+}
+
+#[napi]
+pub async fn wallet_open_as_main(wallet_config: String) -> napi::Result<NapiWallet> {
     let wallet_config = serde_json::from_str::<WalletConfig>(&wallet_config)
         .map_err(|err| {
             LibvcxError::from_msg(
@@ -22,10 +35,10 @@ pub async fn wallet_open_as_main(wallet_config: String) -> napi::Result<i32> {
             )
         })
         .map_err(to_napi_err)?;
-    let handle = wallet::open_as_main_wallet(&wallet_config)
+    let wallet = wallet::open_as_main_wallet(&wallet_config)
         .await
         .map_err(to_napi_err)?;
-    Ok(handle.0)
+    Ok(NapiWallet(wallet))
 }
 
 #[napi]
@@ -111,7 +124,7 @@ pub async fn wallet_migrate(wallet_config: String) -> napi::Result<()> {
 
 #[napi]
 pub async fn wallet_delete(wallet_config: String) -> napi::Result<()> {
-    let wallet_config = serde_json::from_str(&wallet_config)
+    let wallet_config: WalletConfig = serde_json::from_str(&wallet_config)
         .map_err(|err| {
             LibvcxError::from_msg(
                 LibvcxErrorKind::InvalidConfiguration,
@@ -120,7 +133,8 @@ pub async fn wallet_delete(wallet_config: String) -> napi::Result<()> {
         })
         .map_err(to_napi_err)?;
 
-    delete_wallet(&wallet_config)
+    wallet_config
+        .delete_wallet()
         .await
         .map_err(|e| napi::Error::from_reason(e.to_string()))
 }