diff --git a/Packages/io.chainsafe.web3-unity.hyperplay/Runtime/Scripts/HyperPlayWebGLProvider.cs b/Packages/io.chainsafe.web3-unity.hyperplay/Runtime/Scripts/HyperPlayWebGLProvider.cs
index 8abc568f3..2e6efbe7e 100644
--- a/Packages/io.chainsafe.web3-unity.hyperplay/Runtime/Scripts/HyperPlayWebGLProvider.cs
+++ b/Packages/io.chainsafe.web3-unity.hyperplay/Runtime/Scripts/HyperPlayWebGLProvider.cs
@@ -17,6 +17,7 @@ public class HyperPlayWebGLProvider : HyperPlayProvider
         private readonly IHyperPlayConfig _config;
         private readonly IHyperPlayData _data;
         private readonly DataStorage _dataStorage;
+        private readonly IHttpClient _httpClient;
         private readonly IChainConfig _chainConfig;
         private readonly ChainRegistryProvider _chainRegistryProvider;
         private readonly EthereumWindowController _ethereumController;
@@ -27,14 +28,15 @@ public class HyperPlayWebGLProvider : HyperPlayProvider
         /// <param name="config">Injected <see cref="HyperPlayConfig"/>.</param>
         /// <param name="data">Injected <see cref="IHyperPlayData"/>.</param>
         /// <param name="dataStorage">Injected <see cref="DataStorage"/>.</param>
-        /// <param name="httpClient">HttpClient to make requests.</param>
+        /// <param name="environment">Injected <see cref="Web3Environment"/>.</param>
         /// <param name="chainConfig">ChainConfig to fetch chain data.</param>
         /// <param name="chainRegistryProvider">Injected <see cref="ChainRegistryProvider"/>.</param>
-        public HyperPlayWebGLProvider(IHyperPlayConfig config, IHyperPlayData data, DataStorage dataStorage, IHttpClient httpClient, IChainConfig chainConfig, ChainRegistryProvider chainRegistryProvider) : base(config, data, dataStorage, httpClient, chainConfig, chainRegistryProvider)
+        public HyperPlayWebGLProvider(IHyperPlayConfig config, IHyperPlayData data, DataStorage dataStorage, Web3Environment environment, IChainConfig chainConfig, ChainRegistryProvider chainRegistryProvider) : base(config, data, dataStorage, environment, chainConfig, chainRegistryProvider)
         {
             _config = config;
             _data = data;
             _dataStorage = dataStorage;
+            _httpClient = environment.HttpClient;
             _chainConfig = chainConfig;
             _chainRegistryProvider = chainRegistryProvider;
 
@@ -84,7 +86,7 @@ public override async Task<string> Connect()
         /// <param name="parameters">RPC request parameters.</param>
         /// <typeparam name="T">RPC request response type.</typeparam>
         /// <returns>RPC request Response.</returns>
-        public override async Task<T> Perform<T>(string method, params object[] parameters)
+        public override async Task<T> Request<T>(string method, params object[] parameters)
         {
             var response = await _ethereumController.Request(method, parameters);
 
diff --git a/Packages/io.chainsafe.web3-unity.web3auth/Runtime/IWeb3AuthTransactionHandler.cs b/Packages/io.chainsafe.web3-unity.web3auth/Runtime/IWeb3AuthTransactionHandler.cs
index 7b4ec9286..9a120b03b 100644
--- a/Packages/io.chainsafe.web3-unity.web3auth/Runtime/IWeb3AuthTransactionHandler.cs
+++ b/Packages/io.chainsafe.web3-unity.web3auth/Runtime/IWeb3AuthTransactionHandler.cs
@@ -3,22 +3,31 @@
 
 namespace ChainSafe.GamingSdk.Web3Auth
 {
+    /// <summary>
+    /// Handles web3Auth Transaction requests, approvals, declines and confirmations.
+    /// </summary>
     public interface IWeb3AuthTransactionHandler
     {
-        public event Action<TransactionRequested> OnTransactionRequested;
-
-        public event Action<TransactionConfirmed> OnTransactionConfirmed;
-
-        public event Action<TransactionApproved> OnTransactionApproved;
-
-        public event Action<TransactionDeclined> OnTransactionDeclined;
-
-        public void RequestTransaction(TransactionRequested transactionRequested);
-
-        public void ConfirmTransaction(TransactionConfirmed transactionConfirmed);
-
-        public void ApproveTransaction(TransactionApproved transactionApproved);
-
-        public void DeclineTransaction(TransactionDeclined transactionDeclined);
+        /// <summary>
+        /// Invokes when transaction is requested.
+        /// </summary>
+        public event Action<TransactionRequest> OnTransactionRequested;
+
+        /// <summary>
+        /// Invokes when transaction is confirmed on block.
+        /// </summary>
+        public event Action<TransactionResponse> OnTransactionConfirmed;
+
+        /// <summary>
+        /// Transaction got approved.
+        /// </summary>
+        /// <param name="transactionId">Transaction pool Id of Transaction that was approved.</param>
+        public void TransactionApproved(string transactionId);
+
+        /// <summary>
+        /// Transaction got declined.
+        /// </summary>
+        /// <param name="transactionId">Transaction pool Id of Transaction that was declined.</param>
+        public void TransactionDeclined(string transactionId);
     }
 }
\ No newline at end of file
diff --git a/Packages/io.chainsafe.web3-unity.web3auth/Runtime/WalletGUI/Scripts/Web3AuthWalletGUITxManager.cs b/Packages/io.chainsafe.web3-unity.web3auth/Runtime/WalletGUI/Scripts/Web3AuthWalletGUITxManager.cs
index ca7adebaf..b3c79791b 100644
--- a/Packages/io.chainsafe.web3-unity.web3auth/Runtime/WalletGUI/Scripts/Web3AuthWalletGUITxManager.cs
+++ b/Packages/io.chainsafe.web3-unity.web3auth/Runtime/WalletGUI/Scripts/Web3AuthWalletGUITxManager.cs
@@ -14,7 +14,7 @@
 public class Web3AuthWalletGUITxManager : MonoBehaviour
 {
     #region Fields
-
+    
     [SerializeField] private ScrollRect txScrollRect;
     [SerializeField] private TextMeshProUGUI incomingTxActionText;
     [SerializeField] private TextMeshProUGUI incomingTxHashText;
@@ -34,21 +34,21 @@ public class Web3AuthWalletGUITxManager : MonoBehaviour
 
     private bool _processingTransaction;
     private IWeb3AuthTransactionHandler _transactionHandler;
-    private Queue<TransactionRequested> _transactionQueue = new Queue<TransactionRequested>();
-
+    private readonly Queue<TransactionRequest> _transactionQueue = new();
+    
     #endregion
 
     #region Properties
-
+    
     private bool AutoPopUpWalletOnTx { get; set; }
     private bool AutoConfirmTransactions { get; set; }
     private TMP_FontAsset DisplayFont { get; set; }
     private Color SecondaryTextColour { get; set; }
-
+    
     #endregion
 
     #region Methods
-
+    
     /// <summary>
     /// Initializes objects.
     /// </summary>
@@ -61,13 +61,13 @@ private void Awake()
 
         _transactionHandler = Web3Accessor.Web3.ServiceProvider.GetService<IWeb3AuthTransactionHandler>();
     }
-
+    
     /// <summary>
     /// Populates the incoming transaction display.
     /// </summary>
-    private void OnTransactionRequested(TransactionRequested transactionRequested)
+    private void OnTransactionRequested(TransactionRequest request)
     {
-        _transactionQueue.Enqueue(transactionRequested);
+        _transactionQueue.Enqueue(request);
 
         if (_processingTransaction)
         {
@@ -75,23 +75,23 @@ private void OnTransactionRequested(TransactionRequested transactionRequested)
         }
 
         _processingTransaction = true;
-
+        
         PromptTransactionRequest();
     }
-
+    
     /// <summary>
     /// Prompts transaction request display.
     /// </summary>
     private void PromptTransactionRequest()
     {
-        TransactionRequested transactionRequested = _transactionQueue.Peek();
-
+        var transaction = _transactionQueue.Peek();
+        
         incomingTxNotification.SetActive(true);
 
         if (AutoConfirmTransactions)
         {
             AcceptRequest();
-
+            
             return;
         }
 
@@ -102,45 +102,43 @@ private void PromptTransactionRequest()
 
         incomingTxPlaceHolder.SetActive(false);
         incomingTxDisplay.SetActive(true);
-        incomingTxHashText.text = transactionRequested.Transaction.Data;
-        incomingTxActionText.text = transactionRequested.Transaction.Value?.ToString() ?? "Sign Request";
+        incomingTxHashText.text = transaction.Data;
+        incomingTxActionText.text = transaction.Value?.ToString() ?? "Sign Request";
     }
-
+    
     /// <summary>
     /// Accepts an incoming transaction request.
     /// </summary>
     private void AcceptRequest()
     {
-        TransactionRequested transactionRequested = _transactionQueue.Dequeue();
+        var transaction = _transactionQueue.Dequeue();
         ShowTxLoadingMenu();
-        _transactionHandler.ApproveTransaction(new TransactionApproved(transactionRequested.Id));
+        _transactionHandler.TransactionApproved(transaction.Id);
         ResetTransactionDisplay();
     }
-
+    
     /// <summary>
     /// Rejects an incoming transaction request.
     /// </summary>
     private void RejectRequest()
     {
-        TransactionRequested transactionRequested = _transactionQueue.Dequeue();
-        _transactionHandler.DeclineTransaction(new TransactionDeclined(transactionRequested.Id));
+        var transaction = _transactionQueue.Dequeue();
+        _transactionHandler.TransactionDeclined(transaction.Id);
         ResetTransactionDisplay();
     }
-
+    
     /// <summary>
     /// Gets transaction data.
     /// </summary>
-    private void OnTransactionConfirmed(TransactionConfirmed transactionConfirmed)
+    private void OnTransactionConfirmed(TransactionResponse response)
     {
-        var response = transactionConfirmed.Transaction;
-
         var txHash = response.Hash;
         var txTime = DateTime.Now.ToString("hh:mm tt");
         var txAmount = response.Value?.ToString() ?? "0";
         var txAction = response.Value != null ? response.Value.ToString() : "Sign Request";
         AddTransactionToHistory(txTime, txAction, txAmount, txHash);
     }
-
+    
     /// <summary>
     /// Adds a transaction to the history area.
     /// </summary>
@@ -170,7 +168,7 @@ private void AddTransactionToHistory(string time, string action, string amount,
         txObjectNumber++;
         txScrollRect.verticalNormalizedPosition = 0;
     }
-
+    
     /// <summary>
     /// Resets the transaction display.
     /// </summary>
@@ -192,7 +190,7 @@ private void ResetTransactionDisplay()
             _processingTransaction = false;
         }
     }
-
+    
     /// <summary>
     /// Updates the transaction history prefab text.
     /// </summary>
@@ -221,7 +219,7 @@ private void UpdateTransactionHistory(int txObjectIndex, string txNumber, string
         txHistoryObj.GetComponent<Button>().onClick.AddListener(() => OpenBlockExplorer(txHash));
         txHistoryObj.GetComponent<Image>().color = SecondaryTextColour;
     }
-
+    
     /// <summary>
     /// Opens the block explorer url.
     /// </summary>
@@ -230,7 +228,7 @@ private void OpenBlockExplorer(string txHash)
     {
         Application.OpenURL($"{Web3Accessor.Web3.ChainConfig.BlockExplorerUrl}/tx/{txHash}");
     }
-
+    
     /// <summary>
     /// Shows the Tx loading menu
     /// </summary>
@@ -239,7 +237,7 @@ private void ShowTxLoadingMenu()
         incomingTxPlaceHolder.SetActive(true);
         incomingTxDisplay.SetActive(false);
     }
-
+    
     /// <summary>
     /// Toggles auto transactions.
     /// </summary>
@@ -255,10 +253,10 @@ private void ToggleAutoTx(bool arg0)
 	private void OnEnable()
     {
         Web3AuthEventManager.ConfigureTxManager += OnConfigureTxManager;
-        _transactionHandler.OnTransactionRequested += OnTransactionRequested;
-        _transactionHandler.OnTransactionConfirmed += OnTransactionConfirmed;
+		_transactionHandler.OnTransactionRequested += OnTransactionRequested;
+		_transactionHandler.OnTransactionConfirmed += OnTransactionConfirmed;
     }
-
+    
     /// <summary>
     /// Unsubscribes from events.
     /// </summary>
@@ -268,7 +266,7 @@ private void OnDisable()
         _transactionHandler.OnTransactionRequested -= OnTransactionRequested;
         _transactionHandler.OnTransactionConfirmed -= OnTransactionConfirmed;
     }
-
+    
     /// <summary>
     /// Configures class properties.
     /// </summary>
@@ -282,6 +280,6 @@ private void OnConfigureTxManager(object sender, TxManagerConfigEventArgs args)
         AutoConfirmTransactions = args.AutoConfirmTransactions;
         autoTxToggle.isOn = AutoConfirmTransactions;
     }
-
+    
     #endregion
 }
diff --git a/Packages/io.chainsafe.web3-unity.web3auth/Runtime/WalletGUI/Scripts/Web3AuthWalletGUIUIManager.cs b/Packages/io.chainsafe.web3-unity.web3auth/Runtime/WalletGUI/Scripts/Web3AuthWalletGUIUIManager.cs
index 523d003b2..3b0665492 100644
--- a/Packages/io.chainsafe.web3-unity.web3auth/Runtime/WalletGUI/Scripts/Web3AuthWalletGUIUIManager.cs
+++ b/Packages/io.chainsafe.web3-unity.web3auth/Runtime/WalletGUI/Scripts/Web3AuthWalletGUIUIManager.cs
@@ -1,7 +1,9 @@
 using System.Collections;
 using System.Collections.Generic;
+using ChainSafe.Gaming.InProcessSigner;
 using ChainSafe.Gaming.UnityPackage;
 using ChainSafe.GamingSdk.Web3Auth;
+using Nethereum.Web3.Accounts;
 using TMPro;
 using UnityEngine;
 using UnityEngine.EventSystems;
@@ -48,6 +50,15 @@ public class Web3AuthWalletGUIUIManager : MonoBehaviour
     /// </summary>
     private void Start()
     {
+        if (Web3Accessor.Web3 == null)
+        {
+            Debug.LogError("Web3 instance not set.");
+            
+            gameObject.SetActive(false);
+            
+            return;
+        }
+        
         InitializeButtons();
         originalOrientation = Screen.orientation;
         walletAddressText.text = Web3Accessor.Web3.Signer.PublicAddress;
@@ -184,8 +195,9 @@ private IEnumerator CheckHoldPrivateKeyButtonInput()
     /// </summary>
     private void SetPrivateKey()
     {
-        var web3AuthWallet = (Web3AuthWallet)Web3Accessor.Web3.ServiceProvider.GetService(typeof(Web3AuthWallet));
-        privateKeyText.text = web3AuthWallet.Key;
+        var accountProvider = (IAccountProvider)Web3Accessor.Web3.ServiceProvider.GetService(typeof(IAccountProvider));
+        
+        privateKeyText.text = ((Account) accountProvider.Account).PrivateKey;
     }
 
     /// <summary>
diff --git a/Packages/io.chainsafe.web3-unity.web3auth/Runtime/Web3AuthEvents.cs b/Packages/io.chainsafe.web3-unity.web3auth/Runtime/Web3AuthEvents.cs
deleted file mode 100644
index ff569872f..000000000
--- a/Packages/io.chainsafe.web3-unity.web3auth/Runtime/Web3AuthEvents.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-using ChainSafe.Gaming.Evm.Transactions;
-
-namespace ChainSafe.GamingSdk.Web3Auth
-{
-    public struct TransactionRequested
-    {
-        public string Id { get; private set; }
-
-        public TransactionRequest Transaction { get; private set; }
-
-        public TransactionRequested(string id, TransactionRequest transaction)
-        {
-            Id = id;
-            Transaction = transaction;
-        }
-    }
-
-    public struct TransactionConfirmed
-    {
-        public TransactionResponse Transaction { get; private set; }
-
-        public TransactionConfirmed(TransactionResponse transaction)
-        {
-            Transaction = transaction;
-        }
-    }
-
-    public struct TransactionApproved
-    {
-        public string Id { get; private set; }
-
-        public TransactionApproved(string id)
-        {
-            Id = id;
-        }
-    }
-
-    public struct TransactionDeclined
-    {
-        public string Id { get; private set; }
-
-        public TransactionDeclined(string id)
-        {
-            Id = id;
-        }
-    }
-}
\ No newline at end of file
diff --git a/Packages/io.chainsafe.web3-unity.web3auth/Runtime/Web3AuthEvents.cs.meta b/Packages/io.chainsafe.web3-unity.web3auth/Runtime/Web3AuthEvents.cs.meta
deleted file mode 100644
index 3c732d5c6..000000000
--- a/Packages/io.chainsafe.web3-unity.web3auth/Runtime/Web3AuthEvents.cs.meta
+++ /dev/null
@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: 96637bb8ac1a4b758de8609db700950f
-timeCreated: 1718953740
\ No newline at end of file
diff --git a/Packages/io.chainsafe.web3-unity.web3auth/Runtime/Web3AuthProvider.cs b/Packages/io.chainsafe.web3-unity.web3auth/Runtime/Web3AuthProvider.cs
new file mode 100644
index 000000000..776477a55
--- /dev/null
+++ b/Packages/io.chainsafe.web3-unity.web3auth/Runtime/Web3AuthProvider.cs
@@ -0,0 +1,114 @@
+using System.Threading.Tasks;
+using ChainSafe.Gaming.Evm;
+using ChainSafe.Gaming.InProcessSigner;
+using ChainSafe.Gaming.Web3;
+using ChainSafe.Gaming.Web3.Environment;
+using ChainSafe.Gaming.Web3.Evm.Wallet;
+using ChainSafe.GamingSdk.Web3Auth;
+using Nethereum.RPC.Accounts;
+using Nethereum.Web3.Accounts;
+using UnityEngine;
+
+/// <summary>
+/// Web3Auth provider allowing users to connect a Web3Auth wallet.
+/// </summary>
+public class Web3AuthProvider : WalletProvider, IAccountProvider
+{
+    private readonly Web3AuthWalletConfig _config;
+    
+    private Web3Auth _coreInstance;
+    private TaskCompletionSource<Web3AuthResponse> _connectTcs;
+    private TaskCompletionSource<object> _disconnectTcs;
+
+    public Web3AuthProvider(Web3AuthWalletConfig config, Web3Environment environment, IChainConfig chainConfig, ChainRegistryProvider chainRegistryProvider) : base(environment, chainRegistryProvider, chainConfig)
+    {
+        _config = config;
+    }
+
+    public IAccount Account { get; private set; }
+    
+    /// <summary>
+    /// Connects Web3Auth wallet.
+    /// </summary>
+    /// <returns>Connected Account.</returns>
+    public override async Task<string> Connect()
+    {
+        _coreInstance = Object.FindObjectOfType<Web3Auth>();
+        
+        if (_coreInstance == null)
+        {
+            var gameObject = new GameObject("Web3Auth", typeof(Web3Auth));
+        
+            Object.DontDestroyOnLoad(gameObject);
+
+            _coreInstance = gameObject.GetComponent<Web3Auth>();
+        }
+        
+        _coreInstance.setOptions(_config.Web3AuthOptions, _config.RememberMe);
+
+        if (_connectTcs != null && !_connectTcs.Task.IsCompleted)
+        {
+            _connectTcs.SetCanceled();
+        }
+        
+        _connectTcs = new TaskCompletionSource<Web3AuthResponse>();
+        
+        _coreInstance.onLogin += OnLogin;
+
+        if (_config.LoginParams != null)
+        {
+            _coreInstance.login(_config.LoginParams);
+        }
+
+        var response = await _connectTcs.Task;
+        
+        Account = new Account(response.privKey);
+
+        Account.TransactionManager.Client = this;
+        
+        return Account.Address;
+    }
+
+    private void OnLogin(Web3AuthResponse response)
+    {
+        _connectTcs.SetResult(response);
+    }
+    
+    /// <summary>
+    /// Disconnect Web3Auth wallet.
+    /// </summary>
+    public override async Task Disconnect()
+    {
+        if (_disconnectTcs != null && !_disconnectTcs.Task.IsCompleted)
+        {
+            _disconnectTcs.SetCanceled();
+        }
+        
+        _disconnectTcs = new TaskCompletionSource<object>();
+        
+        _coreInstance.onLogout += OnLogout;
+        
+        _coreInstance.logout();
+
+        await _disconnectTcs.Task;
+        
+        Object.Destroy(_coreInstance.gameObject);
+        
+        void OnLogout()
+        {
+            _disconnectTcs.SetResult(null);
+        }
+    }
+
+    /// <summary>
+    /// Make RPC requests to the Web3Auth wallet.
+    /// </summary>
+    /// <param name="method">RPC request method.</param>
+    /// <param name="parameters">RPC request parameters.</param>
+    /// <typeparam name="T">Type of response.</typeparam>
+    /// <returns>RPC request response.</returns>
+    public override Task<T> Request<T>(string method, params object[] parameters)
+    {
+        return Perform<T>(method, parameters);
+    }
+}
diff --git a/Packages/io.chainsafe.web3-unity.web3auth/Runtime/Web3AuthWallet.cs.meta b/Packages/io.chainsafe.web3-unity.web3auth/Runtime/Web3AuthProvider.cs.meta
similarity index 83%
rename from Packages/io.chainsafe.web3-unity.web3auth/Runtime/Web3AuthWallet.cs.meta
rename to Packages/io.chainsafe.web3-unity.web3auth/Runtime/Web3AuthProvider.cs.meta
index 9484771f1..af6a84079 100644
--- a/Packages/io.chainsafe.web3-unity.web3auth/Runtime/Web3AuthWallet.cs.meta
+++ b/Packages/io.chainsafe.web3-unity.web3auth/Runtime/Web3AuthProvider.cs.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: c38937061ec1df74c8ce8dc1898238c2
+guid: 315f561b26677c24588d042c02411964
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2
diff --git a/Packages/io.chainsafe.web3-unity.web3auth/Runtime/Web3AuthSigner.cs b/Packages/io.chainsafe.web3-unity.web3auth/Runtime/Web3AuthSigner.cs
new file mode 100644
index 000000000..bd9072388
--- /dev/null
+++ b/Packages/io.chainsafe.web3-unity.web3auth/Runtime/Web3AuthSigner.cs
@@ -0,0 +1,33 @@
+using System.Threading.Tasks;
+using ChainSafe.Gaming.InProcessSigner;
+using ChainSafe.Gaming.Web3.Core;
+using ChainSafe.Gaming.Web3.Core.Logout;
+using ChainSafe.Gaming.Web3.Evm.Wallet;
+
+/// <summary>
+/// Signs using a Web3Auth wallet.
+/// </summary>
+public class Web3AuthSigner : InProcessSigner, ILifecycleParticipant, ILogoutHandler
+{
+    private readonly IWalletProvider _walletProvider;
+    
+    public Web3AuthSigner(IAccountProvider accountProvider, IWalletProvider walletProvider) : base(accountProvider)
+    {
+        _walletProvider = walletProvider;
+    }
+
+    public async ValueTask WillStartAsync()
+    {
+        await _walletProvider.Connect();
+    }
+
+    public virtual ValueTask WillStopAsync()
+    {
+        return new ValueTask(Task.CompletedTask);
+    }
+
+    public async Task OnLogout()
+    {
+        await _walletProvider.Disconnect();
+    }
+}
diff --git a/Packages/io.chainsafe.web3-unity.web3auth/Runtime/Web3AuthSigner.cs.meta b/Packages/io.chainsafe.web3-unity.web3auth/Runtime/Web3AuthSigner.cs.meta
new file mode 100644
index 000000000..0108a8fd8
--- /dev/null
+++ b/Packages/io.chainsafe.web3-unity.web3auth/Runtime/Web3AuthSigner.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: d19f6325a0df498499557519b5ef39a7
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/io.chainsafe.web3-unity.web3auth/Runtime/Web3AuthTransactionExecutor.cs b/Packages/io.chainsafe.web3-unity.web3auth/Runtime/Web3AuthTransactionExecutor.cs
new file mode 100644
index 000000000..bce996bed
--- /dev/null
+++ b/Packages/io.chainsafe.web3-unity.web3auth/Runtime/Web3AuthTransactionExecutor.cs
@@ -0,0 +1,68 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using ChainSafe.Gaming.Evm.Providers;
+using ChainSafe.Gaming.Evm.Transactions;
+using ChainSafe.Gaming.InProcessSigner;
+using ChainSafe.Gaming.InProcessTransactionExecutor;
+using ChainSafe.Gaming.Web3;
+using ChainSafe.GamingSdk.Web3Auth;
+
+/// <summary>
+/// Send Transaction for Web3Auth wallet.
+/// </summary>
+public class Web3AuthTransactionExecutor : InProcessTransactionExecutor, IWeb3AuthTransactionHandler
+{
+    public event Action<TransactionRequest> OnTransactionRequested;
+        
+    public event Action<TransactionResponse> OnTransactionConfirmed;
+        
+    private readonly Dictionary<string, (TransactionRequest request, TaskCompletionSource<TransactionResponse> response)> _transactionPool = new();
+    
+    public Web3AuthTransactionExecutor(IAccountProvider accountProvider, IRpcProvider rpcProvider) : base(accountProvider, rpcProvider)
+    {
+    }
+
+    public override Task<TransactionResponse> SendTransaction(TransactionRequest transaction)
+    {
+        transaction.Id = Guid.NewGuid().ToString();
+        
+        var tcs = new TaskCompletionSource<TransactionResponse>();
+        
+        // Add transaction to pool.
+        _transactionPool.Add(transaction.Id, (transaction, tcs));
+            
+        OnTransactionRequested?.Invoke(transaction);
+            
+        return tcs.Task;
+    }
+    
+    public async void TransactionApproved(string transactionId)
+    {
+        if (!_transactionPool.TryGetValue(transactionId, out var transaction))
+        {
+            throw new Web3Exception("Transaction not found in pool.");
+        }
+        
+        var response = await base.SendTransaction(transaction.request);
+            
+        transaction.response.SetResult(response);
+
+        OnTransactionConfirmed?.Invoke(response);
+        
+        _transactionPool.Remove(transactionId);
+    }
+        
+    public void TransactionDeclined(string transactionId)
+    {
+        if (!_transactionPool.TryGetValue(transactionId, out var transaction))
+        {
+            throw new Web3Exception("Transaction not found in pool.");
+        }
+        
+        transaction.response.SetCanceled();
+
+        _transactionPool.Remove(transactionId);
+    }
+}
diff --git a/Packages/io.chainsafe.web3-unity.web3auth/Runtime/Web3AuthTransactionExecutor.cs.meta b/Packages/io.chainsafe.web3-unity.web3auth/Runtime/Web3AuthTransactionExecutor.cs.meta
new file mode 100644
index 000000000..88efcacc1
--- /dev/null
+++ b/Packages/io.chainsafe.web3-unity.web3auth/Runtime/Web3AuthTransactionExecutor.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 0d28ef6f350480042b13aa99207a6401
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/io.chainsafe.web3-unity.web3auth/Runtime/Web3AuthTransactionHandler.cs b/Packages/io.chainsafe.web3-unity.web3auth/Runtime/Web3AuthTransactionHandler.cs
deleted file mode 100644
index 646a4615a..000000000
--- a/Packages/io.chainsafe.web3-unity.web3auth/Runtime/Web3AuthTransactionHandler.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System;
-using ChainSafe.Gaming.Evm.Transactions;
-
-namespace ChainSafe.GamingSdk.Web3Auth
-{
-    public class Web3AuthTransactionHandler : IWeb3AuthTransactionHandler
-    {
-        public event Action<TransactionRequested> OnTransactionRequested;
-
-        public event Action<TransactionConfirmed> OnTransactionConfirmed;
-
-        public event Action<TransactionApproved> OnTransactionApproved;
-
-        public event Action<TransactionDeclined> OnTransactionDeclined;
-
-        public void RequestTransaction(TransactionRequested transactionRequested)
-        {
-            OnTransactionRequested?.Invoke(transactionRequested);
-        }
-
-        public void ConfirmTransaction(TransactionConfirmed transactionConfirmed)
-        {
-            OnTransactionConfirmed?.Invoke(transactionConfirmed);
-        }
-
-        public void ApproveTransaction(TransactionApproved transactionApproved)
-        {
-            OnTransactionApproved?.Invoke(transactionApproved);
-        }
-
-        public void DeclineTransaction(TransactionDeclined transactionDeclined)
-        {
-            OnTransactionDeclined?.Invoke(transactionDeclined);
-        }
-    }
-}
\ No newline at end of file
diff --git a/Packages/io.chainsafe.web3-unity.web3auth/Runtime/Web3AuthTransactionHandler.cs.meta b/Packages/io.chainsafe.web3-unity.web3auth/Runtime/Web3AuthTransactionHandler.cs.meta
deleted file mode 100644
index f0213295f..000000000
--- a/Packages/io.chainsafe.web3-unity.web3auth/Runtime/Web3AuthTransactionHandler.cs.meta
+++ /dev/null
@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: 4e8795100f1f43cf9df164552a3fd166
-timeCreated: 1718955415
\ No newline at end of file
diff --git a/Packages/io.chainsafe.web3-unity.web3auth/Runtime/Web3AuthWallet.cs b/Packages/io.chainsafe.web3-unity.web3auth/Runtime/Web3AuthWallet.cs
deleted file mode 100644
index b522dc3e0..000000000
--- a/Packages/io.chainsafe.web3-unity.web3auth/Runtime/Web3AuthWallet.cs
+++ /dev/null
@@ -1,200 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using ChainSafe.Gaming.Evm.Providers;
-using ChainSafe.Gaming.Evm.Signers;
-using ChainSafe.Gaming.Evm.Transactions;
-using ChainSafe.Gaming.InProcessSigner;
-using ChainSafe.Gaming.InProcessTransactionExecutor;
-using ChainSafe.Gaming.Web3;
-using ChainSafe.Gaming.Web3.Analytics;
-using ChainSafe.Gaming.Web3.Core;
-using ChainSafe.Gaming.Web3.Core.Evm;
-using Nethereum.JsonRpc.Client;
-using Nethereum.Signer;
-using UnityEngine;
-using Object = UnityEngine.Object;
-using TWeb3Auth = Web3Auth;
-
-namespace ChainSafe.GamingSdk.Web3Auth
-{
-    /// <summary>
-    /// A class that represents a Web3Auth wallet and provides functionality for signing transactions and interacting with a blockchain.
-    /// </summary>
-    public class Web3AuthWallet : ISigner, ITransactionExecutor, ILifecycleParticipant
-    {
-        private readonly Web3AuthWalletConfig config;
-        private readonly IRpcProvider rpcProvider;
-        private TWeb3Auth coreInstance;
-        private InProcessSigner signer;
-        private InProcessTransactionExecutor transactionExecutor;
-        private IClient rpcClient;
-        private readonly IAnalyticsClient analyticsClient;
-        private readonly IWeb3AuthTransactionHandler transactionHandler;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Web3AuthWallet"/> class.
-        /// </summary>
-        /// <param name="config">The configuration for the Web3Auth wallet.</param>
-        /// <param name="rpcProvider">The RPC provider for blockchain interaction.</param>
-        /// <param name="rpcClient"></param>
-        /// <param name="analyticsClient"></param>
-        public Web3AuthWallet(Web3AuthWalletConfig config, IRpcProvider rpcProvider, IClient rpcClient, IWeb3AuthTransactionHandler transactionHandler, IAnalyticsClient analyticsClient)
-        {
-            this.config = config;
-            this.rpcProvider = rpcProvider;
-            this.rpcClient = rpcClient;
-            this.analyticsClient = analyticsClient;
-
-            this.transactionHandler = transactionHandler;
-        }
-
-        /// <summary>
-        /// Gets the blockchain address associated with this wallet.
-        /// </summary>
-        public string PublicAddress => signer.PublicAddress;
-
-        /// <summary>
-        /// Gets key.
-        /// </summary>
-        public string Key => signer.GetKey().GetPrivateKey();
-
-        private readonly Dictionary<TransactionRequested, TaskCompletionSource<TransactionResponse>> _transactionPool =
-            new Dictionary<TransactionRequested, TaskCompletionSource<TransactionResponse>>();
-
-        /// <summary>
-        /// Asynchronously prepares the Web3Auth wallet for operation, triggered when initializing the module in the dependency injection work flow.
-        /// </summary>
-        /// <returns>A <see cref="ValueTask"/> representing the asynchronous operation.</returns>
-        public async ValueTask WillStartAsync()
-        {
-
-            analyticsClient.CaptureEvent(new AnalyticsEvent()
-            {
-                EventName = $"Web3Auth Initialized",
-                PackageName = "io.chainsafe.web3-unity.web3auth",
-            });
-            coreInstance = CreateCoreInstance();
-            TaskCompletionSource<string> loginTcs = new();
-            coreInstance.onLogin += Web3Auth_OnLogin;
-
-            if (config.LoginParams != null) coreInstance.login(config.LoginParams);
-
-            var privateKeyString = await loginTcs.Task;
-            var privateKey = new EthECKey(privateKeyString);
-
-            var signerConfig = new InProcessSignerConfig { PrivateKey = privateKey };
-
-            signer = new InProcessSigner(signerConfig);
-
-
-            transactionExecutor = new InProcessTransactionExecutor(signer, analyticsClient.ChainConfig, rpcProvider, rpcClient);
-
-            transactionHandler.OnTransactionApproved += OnTransactionApproved;
-            transactionHandler.OnTransactionDeclined += OnTransactionDeclined;
-
-            void Web3Auth_OnLogin(Web3AuthResponse response)
-            {
-                coreInstance.onLogin -= Web3Auth_OnLogin;
-                loginTcs.SetResult(response.privKey);
-            }
-        }
-
-        /// <summary>
-        /// Asynchronously cleans up the Web3Auth wallet and logs out.
-        /// </summary>
-        /// <returns>A <see cref="ValueTask"/> representing the asynchronous operation.</returns>
-        public async ValueTask WillStopAsync()
-        {
-            TaskCompletionSource<object> logoutTcs = new();
-            coreInstance.onLogout += Web3Auth_OnLogout;
-            coreInstance.logout();
-
-            await logoutTcs.Task;
-
-            coreInstance.onLogout -= Web3Auth_OnLogout;
-
-            Object.Destroy(coreInstance.gameObject);
-
-            transactionHandler.OnTransactionApproved += OnTransactionApproved;
-            transactionHandler.OnTransactionDeclined += OnTransactionDeclined;
-
-            void Web3Auth_OnLogout()
-            {
-                logoutTcs.SetResult(null);
-            }
-        }
-
-        /// <summary>
-        /// Signs a message using the private key associated with this wallet.
-        /// </summary>
-        /// <param name="message">The message to sign.</param>
-        /// <returns>A <see cref="Task"/> that represents the asynchronous operation and returns the signature as a string.</returns>
-        public Task<string> SignMessage(string message) => signer.SignMessage(message);
-
-        /// <summary>
-        /// Signs an ERC2771 typed data request using the private key associated with this wallet.
-        /// </summary>
-        /// <typeparam name="TStructData">The type of the structured data to sign.</typeparam>
-        /// <param name="domain">The domain information for the typed data.</param>
-        /// <param name="message">The structured data to sign.</param>
-        /// <returns>A <see cref="Task"/> that represents the asynchronous operation and returns the signature as a string.</returns>
-        public Task<string> SignTypedData<TStructData>(SerializableDomain domain, TStructData message) => signer.SignTypedData(domain, message);
-
-        /// <summary>
-        /// Sends a blockchain transaction using the private key associated with this wallet.
-        /// </summary>
-        /// <param name="transaction">The transaction request to send.</param>
-        /// <returns>A <see cref="Task"/> that represents the asynchronous operation and returns a <see cref="TransactionResponse"/>.</returns>
-        public Task<TransactionResponse> SendTransaction(TransactionRequest transaction)
-        {
-            string id = Guid.NewGuid().ToString();
-
-            var request = new TransactionRequested(id, transaction);
-
-            var tcs = new TaskCompletionSource<TransactionResponse>();
-
-            _transactionPool.Add(request, tcs);
-
-            transactionHandler.RequestTransaction(request);
-
-            return tcs.Task;
-        }
-
-        public async void OnTransactionApproved(TransactionApproved transactionApproved)
-        {
-            var pair = _transactionPool.Single(t => t.Key.Id == transactionApproved.Id);
-
-            var response = await transactionExecutor.SendTransaction(pair.Key.Transaction);
-
-            pair.Value.SetResult(response);
-
-            transactionHandler.ConfirmTransaction(new TransactionConfirmed(response));
-
-        }
-
-        public void OnTransactionDeclined(TransactionDeclined transactionDeclined)
-        {
-            var pair = _transactionPool.Single(t => t.Key.Id == transactionDeclined.Id);
-
-            pair.Value.SetCanceled();
-        }
-
-        /// <summary>
-        /// Creates core instance.
-        /// </summary>
-        /// <returns>Core instance.</returns>
-        private TWeb3Auth CreateCoreInstance()
-        {
-            Debug.Log("Creating Core Instance");
-            var gameObject = new GameObject("Web3Auth", typeof(TWeb3Auth));
-            Object.DontDestroyOnLoad(gameObject);
-
-            var instance = gameObject.GetComponent<TWeb3Auth>();
-            instance.setOptions(config.Web3AuthOptions, config.RememberMe);
-
-            return instance;
-        }
-    }
-}
\ No newline at end of file
diff --git a/Packages/io.chainsafe.web3-unity.web3auth/Runtime/Web3AuthWalletExtensions.cs b/Packages/io.chainsafe.web3-unity.web3auth/Runtime/Web3AuthWalletExtensions.cs
index 12604066d..abb119638 100644
--- a/Packages/io.chainsafe.web3-unity.web3auth/Runtime/Web3AuthWalletExtensions.cs
+++ b/Packages/io.chainsafe.web3-unity.web3auth/Runtime/Web3AuthWalletExtensions.cs
@@ -1,7 +1,10 @@
 using ChainSafe.Gaming.Evm.Signers;
+using ChainSafe.Gaming.InProcessSigner;
 using ChainSafe.Gaming.Web3.Build;
 using ChainSafe.Gaming.Web3.Core;
 using ChainSafe.Gaming.Web3.Core.Evm;
+using ChainSafe.Gaming.Web3.Core.Logout;
+using ChainSafe.Gaming.Web3.Evm.Wallet;
 using ChainSafe.GamingSdk.Web3Auth;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
@@ -34,10 +37,12 @@ public static IWeb3ServiceCollection UseWeb3AuthWallet(this IWeb3ServiceCollecti
         collection.AssertServiceNotBound<ISigner>();
         collection.AssertServiceNotBound<ITransactionExecutor>();
 
-        collection.AddSingleton<ISigner, ITransactionExecutor, ILifecycleParticipant, Web3AuthWallet>();
-
-        collection.AddSingleton<IWeb3AuthTransactionHandler, Web3AuthTransactionHandler>();
-
+        collection.AddSingleton<IWalletProvider, IAccountProvider, Web3AuthProvider>();
+        
+        collection.AddSingleton<ISigner, ILifecycleParticipant, ILogoutHandler, Web3AuthSigner>();
+        
+        collection.AddSingleton<ITransactionExecutor, IWeb3AuthTransactionHandler, Web3AuthTransactionExecutor>();
+        
         return collection;
     }
 
diff --git a/Packages/io.chainsafe.web3-unity/Tests/Runtime/StubWalletConnectProvider.cs b/Packages/io.chainsafe.web3-unity/Tests/Runtime/StubWalletConnectProvider.cs
index da257a1a0..f400e5675 100644
--- a/Packages/io.chainsafe.web3-unity/Tests/Runtime/StubWalletConnectProvider.cs
+++ b/Packages/io.chainsafe.web3-unity/Tests/Runtime/StubWalletConnectProvider.cs
@@ -15,11 +15,11 @@ public class StubWalletConnectProvider : WalletProvider
         private readonly IChainConfig chainConfig;
         private readonly IHttpClient httpClient;
 
-        public StubWalletConnectProvider(StubWalletConnectProviderConfig config, IHttpClient httpClient, IChainConfig chainConfig, ChainRegistryProvider chainRegistryProvider) : base(chainRegistryProvider: chainRegistryProvider)
+        public StubWalletConnectProvider(StubWalletConnectProviderConfig config, Web3Environment environment, IChainConfig chainConfig, ChainRegistryProvider chainRegistryProvider) : base(environment, chainRegistryProvider, chainConfig)
         {
             this.config = config;
             this.chainConfig = chainConfig;
-            this.httpClient = httpClient;
+            httpClient = environment.HttpClient;
         }
 
         public override Task<string> Connect()
@@ -33,32 +33,25 @@ public override Task Disconnect()
             return Task.CompletedTask;
         }
 
-        public override Task<T> Perform<T>(string method, params object[] parameters)
+        public override async Task<T> Request<T>(string method, params object[] parameters)
         {
             switch (method)
             {
-                case "personal_sign":
-                case "eth_signTypedData":
-                case "eth_sendTransaction":
-                    return Task.FromResult((T)Convert.ChangeType(config.StubResponse, typeof(T)));
+                case "personal_sign" : case "eth_signTypedData": case "eth_sendTransaction":
+                    return (T) Convert.ChangeType(config.StubResponse, typeof(T));
                 default:
-                    return Request<T>(method, parameters);
-            }
-        }
-
-        // Direct RPC request via WalletConnect RPC url.
-        private async Task<T> Request<T>(string method, params object[] parameters)
-        {
-            // Using WalletConnect Blockchain API: https://docs.walletconnect.com/cloud/blockchain-api
-            var url = $"https://rpc.walletconnect.com/v1?chainId=eip155:{chainConfig.ChainId}&projectId={config.ProjectId}";
+                    // Direct RPC request via WalletConnect RPC url.
+                    // Using WalletConnect Blockchain API: https://docs.walletconnect.com/cloud/blockchain-api
+                    var url = $"https://rpc.walletconnect.com/v1?chainId=eip155:{chainConfig.ChainId}&projectId={config.ProjectId}";
 
-            string body = JsonConvert.SerializeObject(new RpcRequestMessage(Guid.NewGuid().ToString(), method, parameters));
+                    string body = JsonConvert.SerializeObject(new RpcRequestMessage(Guid.NewGuid().ToString(), method, parameters));
+            
+                    var rawResult = await httpClient.PostRaw(url, body, "application/json");
 
-            var rawResult = await httpClient.PostRaw(url, body, "application/json");
-
-            RpcResponseMessage response = JsonConvert.DeserializeObject<RpcResponseMessage>(rawResult.Response);
-
-            return response.Result.ToObject<T>();
+                    RpcResponseMessage response = JsonConvert.DeserializeObject<RpcResponseMessage>(rawResult.Response);
+            
+                    return response.Result.ToObject<T>();
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/src/ChainSafe.Gaming.HyperPlay/HyperPlayProvider.cs b/src/ChainSafe.Gaming.HyperPlay/HyperPlayProvider.cs
index b2f34687d..f0c6e72a4 100644
--- a/src/ChainSafe.Gaming.HyperPlay/HyperPlayProvider.cs
+++ b/src/ChainSafe.Gaming.HyperPlay/HyperPlayProvider.cs
@@ -24,7 +24,7 @@ public class HyperPlayProvider : WalletProvider
         private readonly IHyperPlayConfig config;
         private readonly IHyperPlayData data;
         private readonly DataStorage dataStorage;
-        private readonly IHttpClient httpClient;
+        private readonly Web3Environment environment;
         private readonly IChainConfig chainConfig;
 
         /// <summary>
@@ -32,17 +32,17 @@ public class HyperPlayProvider : WalletProvider
         /// </summary>
         /// <param name="config">Injected <see cref="HyperPlayConfig"/>.</param>
         /// <param name="data">Injected <see cref="IHyperPlayData"/>.</param>
-        /// <param name="dataStorage">Injected <see cref="DataStorage"/>.</param>
-        /// <param name="httpClient">HttpClient to make requests.</param>
+        /// <param name="dataStorage">Injected <see cref="dataStorage"/>.</param>
+        /// <param name="environment">Injected <see cref="environment"/>.</param>
         /// <param name="chainConfig">ChainConfig to fetch chain data.</param>
         /// <param name="chainRegistryProvider">Injected <see cref="ChainRegistryProvider"/>.</param>
-        public HyperPlayProvider(IHyperPlayConfig config, IHyperPlayData data, DataStorage dataStorage, IHttpClient httpClient, IChainConfig chainConfig, ChainRegistryProvider chainRegistryProvider)
-            : base(chainRegistryProvider: chainRegistryProvider)
+        public HyperPlayProvider(IHyperPlayConfig config, IHyperPlayData data, DataStorage dataStorage, Web3Environment environment, IChainConfig chainConfig, ChainRegistryProvider chainRegistryProvider)
+            : base(environment, chainRegistryProvider, chainConfig)
         {
             this.config = config;
             this.data = data;
             this.dataStorage = dataStorage;
-            this.httpClient = httpClient;
+            this.environment = environment;
             this.chainConfig = chainConfig;
         }
 
@@ -52,7 +52,7 @@ public HyperPlayProvider(IHyperPlayConfig config, IHyperPlayData data, DataStora
         /// <returns>Signed-in account public address.</returns>
         public override async Task<string> Connect()
         {
-            string[] accounts = await Perform<string[]>("eth_accounts");
+            string[] accounts = await Request<string[]>("eth_accounts");
 
             string account = accounts[0];
 
@@ -64,7 +64,7 @@ public override async Task<string> Connect()
 
             string message = "Sign-in with Ethereum";
 
-            string hash = await Perform<string>("personal_sign", message, account);
+            string hash = await Request<string>("personal_sign", message, account);
 
             hash.AssertSignatureValid(message, account);
 
@@ -97,7 +97,7 @@ public override Task Disconnect()
         /// <param name="parameters">RPC request parameters.</param>
         /// <typeparam name="T">RPC request response type.</typeparam>
         /// <returns>RPC request Response.</returns>
-        public override async Task<T> Perform<T>(string method, params object[] parameters)
+        public override async Task<T> Request<T>(string method, params object[] parameters)
         {
             string body = JsonConvert.SerializeObject(new HyperPlayRequest
             {
@@ -112,7 +112,7 @@ public override async Task<T> Perform<T>(string method, params object[] paramete
                 },
             });
 
-            string response = (await httpClient.PostRaw(config.Url, body, "application/json")).Response;
+            string response = (await environment.HttpClient.PostRaw(config.Url, body, "application/json")).Response;
 
             // In case response is just a primitive type like string/number...
             // Deserializing it directly doesn't work.
diff --git a/src/ChainSafe.Gaming.InProcessSigner/IAccountProvider.cs b/src/ChainSafe.Gaming.InProcessSigner/IAccountProvider.cs
new file mode 100644
index 000000000..dfb91b37e
--- /dev/null
+++ b/src/ChainSafe.Gaming.InProcessSigner/IAccountProvider.cs
@@ -0,0 +1,15 @@
+using Nethereum.RPC.Accounts;
+
+namespace ChainSafe.Gaming.InProcessSigner
+{
+    /// <summary>
+    /// Provides the current connected account.
+    /// </summary>
+    public interface IAccountProvider
+    {
+        /// <summary>
+        /// Current connected account.
+        /// </summary>
+        public IAccount Account { get; }
+    }
+}
\ No newline at end of file
diff --git a/src/ChainSafe.Gaming.InProcessSigner/InProcessSigner.cs b/src/ChainSafe.Gaming.InProcessSigner/InProcessSigner.cs
index 51d6d045c..9638d890a 100644
--- a/src/ChainSafe.Gaming.InProcessSigner/InProcessSigner.cs
+++ b/src/ChainSafe.Gaming.InProcessSigner/InProcessSigner.cs
@@ -1,12 +1,10 @@
-using System.Threading.Tasks;
+using System.Text;
+using System.Threading.Tasks;
 using ChainSafe.Gaming.Evm.Signers;
 using ChainSafe.Gaming.Web3;
-using ChainSafe.Gaming.Web3.Core;
 using ChainSafe.Gaming.Web3.Core.Evm;
-using Nethereum.ABI.EIP712;
-using Nethereum.ABI.FunctionEncoding.Attributes;
-using Nethereum.Signer;
-using Nethereum.Signer.EIP712;
+using Nethereum.RPC.Accounts;
+using Newtonsoft.Json;
 
 namespace ChainSafe.Gaming.InProcessSigner
 {
@@ -15,34 +13,34 @@ namespace ChainSafe.Gaming.InProcessSigner
     /// </summary>
     public class InProcessSigner : ISigner
     {
-        private readonly EthECKey privateKey;
-        private readonly EthereumMessageSigner messageSigner;
+        private readonly IAccountProvider accountProvider;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="InProcessSigner"/> class.
         /// </summary>
-        /// <param name="config">Injected Config for signer containing a private key.</param>
         /// <exception cref="Web3Exception">Throws Exception if initializing instance fails.</exception>
-        public InProcessSigner(InProcessSignerConfig config)
+        public InProcessSigner(IAccountProvider accountProvider)
         {
-            privateKey = config.PrivateKey ??
-                throw new Web3Exception($"{nameof(InProcessSignerConfig)}.{nameof(InProcessSignerConfig.PrivateKey)} must be set");
-            messageSigner = new();
+            this.accountProvider = accountProvider;
         }
 
+        private IAccount Account => accountProvider.Account;
+
         /// <summary>
-        /// Implementation of <see cref="ISigner.GetAddress"/> using In Process.
+        /// Public Address.
         /// </summary>
         /// <value>Public address of signer.</value>
-        public string PublicAddress => privateKey.GetPublicAddress();
+        public string PublicAddress => Account.Address;
 
         /// <summary>
         /// Implementation of <see cref="ISigner.SignMessage"/> using In Process.
         /// </summary>
         /// <param name="message">Message to be signed.</param>
         /// <returns>Hash response of a successfully signed message.</returns>
-        public Task<string> SignMessage(string message) =>
-            Task.FromResult(messageSigner.EncodeUTF8AndSign(message, privateKey));
+        public async Task<string> SignMessage(string message)
+        {
+            return await Account.AccountSigningService.PersonalSign.SendRequestAsync(Encoding.UTF8.GetBytes(message));
+        }
 
         /// <summary>
         /// Implementation of <see cref="ISigner.SignTypedData{TStructType}"/> using In Process.
@@ -51,28 +49,11 @@ public Task<string> SignMessage(string message) =>
         /// <param name="message">Message/Data to be signed.</param>
         /// <typeparam name="TStructType">Type of Data to be signed.</typeparam>
         /// <returns>Hash response of a successfully signed typed data.</returns>
-        public Task<string> SignTypedData<TStructType>(SerializableDomain domain, TStructType message)
+        public async Task<string> SignTypedData<TStructType>(SerializableDomain domain, TStructType message)
         {
-            var primaryType = typeof(TStructType).Name;
-            if (StructAttribute.IsStructType(message))
-            {
-                primaryType = StructAttribute.GetAttribute(message).Name;
-            }
+            SerializableTypedData<TStructType> typedData = new SerializableTypedData<TStructType>(domain, message);
 
-            var typedData = new TypedData<SerializableDomain>
-            {
-                PrimaryType = primaryType,
-                Domain = domain,
-                Types = MemberDescriptionFactory.GetTypesMemberDescription(typeof(SerializableDomain), typeof(TStructType)),
-                Message = MemberValueFactory.CreateFromMessage(message),
-            };
-            return Task.FromResult(Eip712TypedDataSigner.Current.SignTypedDataV4(typedData, privateKey));
+            return await Account.AccountSigningService.SignTypedDataV4.SendRequestAsync(JsonConvert.SerializeObject(typedData));
         }
-
-        /// <summary>
-        /// Get private key of <see cref="ISigner"/>.
-        /// </summary>
-        /// <returns>Private key of <see cref="ISigner"/>.</returns>
-        public EthECKey GetKey() => privateKey;
     }
 }
diff --git a/src/ChainSafe.Gaming.InProcessTransactionExecutor/InProcessTransactionExecutor.cs b/src/ChainSafe.Gaming.InProcessTransactionExecutor/InProcessTransactionExecutor.cs
index b2083d10c..a00ab3bca 100644
--- a/src/ChainSafe.Gaming.InProcessTransactionExecutor/InProcessTransactionExecutor.cs
+++ b/src/ChainSafe.Gaming.InProcessTransactionExecutor/InProcessTransactionExecutor.cs
@@ -1,16 +1,13 @@
 using System;
 using System.Threading.Tasks;
 using ChainSafe.Gaming.Evm.Providers;
-using ChainSafe.Gaming.Evm.Signers;
 using ChainSafe.Gaming.Evm.Transactions;
+using ChainSafe.Gaming.InProcessSigner;
 using ChainSafe.Gaming.Web3;
 using ChainSafe.Gaming.Web3.Core.Evm;
 using Nethereum.Hex.HexTypes;
-using Nethereum.JsonRpc.Client;
+using Nethereum.RPC.Accounts;
 using Nethereum.RPC.Eth.DTOs;
-using Nethereum.Web3.Accounts;
-using NIpcClient = Nethereum.JsonRpc.IpcClient.IpcClient;
-using NWeb3 = Nethereum.Web3.Web3;
 
 namespace ChainSafe.Gaming.InProcessTransactionExecutor
 {
@@ -20,45 +17,22 @@ namespace ChainSafe.Gaming.InProcessTransactionExecutor
     public class InProcessTransactionExecutor : ITransactionExecutor
     {
         private readonly IRpcProvider rpcProvider;
-        private readonly string accountAddress;
-
-        private NWeb3 web3;
+        private readonly IAccountProvider accountProvider;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="InProcessTransactionExecutor"/> class.
         /// </summary>
-        /// <param name="signer">Injected <see cref="ISigner"/>.</param>
-        /// <param name="chainConfig">Injected <see cref="IChainConfig"/>.</param>
+        /// <param name="accountProvider">Injected <see cref="IAccountProvider"/>.</param>
         /// <param name="rpcProvider">Injected <see cref="IRpcProvider"/>.</param>
-        /// <param name="rpcClient">Injected <see cref="IClient"/>.</param>
         /// <exception cref="Web3Exception">Throws exception if initializing instance fails.</exception>
-        public InProcessTransactionExecutor(ISigner signer, IChainConfig chainConfig, IRpcProvider rpcProvider, IClient rpcClient)
+        public InProcessTransactionExecutor(IAccountProvider accountProvider, IRpcProvider rpcProvider)
         {
-            // It should be possible to set up other signers to work with this as well.
-            // However, does it make sense to let a remote wallet sign a transaction, but
-            // broadcast it locally? I think not.
-            var privateKey = (signer as InProcessSigner.InProcessSigner)?.GetKey() ??
-                throw new Web3Exception($"{nameof(InProcessTransactionExecutor)} only supports {nameof(InProcessSigner.InProcessSigner)}");
-            accountAddress = privateKey.GetPublicAddress();
-            var account = new Account(privateKey);
-
-            if (chainConfig.Rpc is not null && !string.Empty.Equals(chainConfig.Rpc))
-            {
-                web3 = new NWeb3(account, rpcClient);
-            }
-            else if (chainConfig.Ipc is not null && !string.Empty.Equals(chainConfig.Ipc))
-            {
-                var client = new NIpcClient(chainConfig.Rpc);
-                web3 = new NWeb3(client);
-            }
-            else
-            {
-                throw new Web3Exception($"{nameof(IChainConfig)} should have at least one communication method set.");
-            }
-
             this.rpcProvider = rpcProvider;
+            this.accountProvider = accountProvider;
         }
 
+        private IAccount Account => accountProvider.Account;
+
         /// <summary>
         /// Implementation of <see cref="ITransactionExecutor.SendTransaction"/>.
         /// Send a transaction using Wallet Connect.
@@ -67,11 +41,11 @@ public InProcessTransactionExecutor(ISigner signer, IChainConfig chainConfig, IR
         /// <param name="transaction">Transaction to send.</param>
         /// <returns>Hash response of a successfully executed transaction.</returns>
         /// <exception cref="Web3Exception">Throws Exception if executing transaction fails.</exception>
-        public async Task<TransactionResponse> SendTransaction(TransactionRequest transaction)
+        public virtual async Task<TransactionResponse> SendTransaction(TransactionRequest transaction)
         {
             if (string.IsNullOrEmpty(transaction.From))
             {
-                transaction.From = accountAddress;
+                transaction.From = Account.Address;
             }
 
             if (transaction.GasPrice == null && transaction.MaxFeePerGas == null)
@@ -107,9 +81,9 @@ public async Task<TransactionResponse> SendTransaction(TransactionRequest transa
 
             try
             {
-                var signedTransaction = await web3.TransactionManager.SignTransactionAsync(txInput);
-                var txHash = await web3.Eth.Transactions.SendRawTransaction.SendRequestAsync(signedTransaction);
-                return await rpcProvider.GetTransaction(txHash);
+                var receipt = await Account.TransactionManager.SendTransactionAndWaitForReceiptAsync(txInput);
+
+                return await rpcProvider.GetTransaction(receipt.TransactionHash);
             }
             catch (Exception ex)
             {
diff --git a/src/ChainSafe.Gaming.Unity.MetaMask/MetaMaskProvider.cs b/src/ChainSafe.Gaming.Unity.MetaMask/MetaMaskProvider.cs
index 6810199f7..cfc9f901c 100644
--- a/src/ChainSafe.Gaming.Unity.MetaMask/MetaMaskProvider.cs
+++ b/src/ChainSafe.Gaming.Unity.MetaMask/MetaMaskProvider.cs
@@ -24,23 +24,20 @@ public class MetaMaskProvider : WalletProvider
         /// <summary>
         /// Initializes a new instance of the <see cref="MetaMaskProvider"/> class.
         /// </summary>
-        /// <param name="logWriter">Common Logger used for logging messages and errors.</param>
+        /// <param name="environment">Injected <see cref="Web3Environment"/>.</param>
         /// <param name="chainConfig">Injected <see cref="IChainConfig"/>.</param>
-        /// <param name="projectConfig">Injected <see cref="IProjectConfig"/>.</param>
         /// <param name="chainRegistryProvider">Injected <see cref="ChainRegistryProvider"/>.</param>
-        /// <param name="analyticsClient">Injected <see cref="IAnalyticsClient"/>.</param>
-        public MetaMaskProvider(ILogWriter logWriter, IAnalyticsClient analyticsClient, IChainConfig chainConfig, IProjectConfig projectConfig, ChainRegistryProvider chainRegistryProvider)
-            : base(
-            chainRegistryProvider: chainRegistryProvider)
+        public MetaMaskProvider(Web3Environment environment, IChainConfig chainConfig, ChainRegistryProvider chainRegistryProvider)
+            : base(environment, chainRegistryProvider, chainConfig)
         {
-            this.logWriter = logWriter;
+            logWriter = environment.LogWriter;
             this.chainConfig = chainConfig;
-            this.analyticsClient = analyticsClient;
+            analyticsClient = environment.AnalyticsClient;
             this.chainRegistryProvider = chainRegistryProvider;
 
             if (Application.isEditor || Application.platform != RuntimePlatform.WebGLPlayer)
             {
-                this.logWriter.LogError("You need to build to WebGL platform to run Nethereum.Metamask.Unity");
+                logWriter.LogError("You need to build to WebGL platform to run Nethereum.Metamask.Unity");
 
                 return;
             }
@@ -65,7 +62,7 @@ public override Task Disconnect()
             return Task.CompletedTask;
         }
 
-        public override async Task<T> Perform<T>(string method, params object[] parameters)
+        public override async Task<T> Request<T>(string method, params object[] parameters)
         {
             var response = await metaMaskController.Request(method, parameters);
 
diff --git a/src/ChainSafe.Gaming.WalletConnect/WalletConnectProvider.cs b/src/ChainSafe.Gaming.WalletConnect/WalletConnectProvider.cs
index fab8f6531..125eb5ebc 100644
--- a/src/ChainSafe.Gaming.WalletConnect/WalletConnectProvider.cs
+++ b/src/ChainSafe.Gaming.WalletConnect/WalletConnectProvider.cs
@@ -55,25 +55,22 @@ public class WalletConnectProvider : WalletProvider, ILifecycleParticipant, ICon
         public WalletConnectProvider(
             IWalletConnectConfig config,
             DataStorage storage,
-            ILogWriter logWriter,
             IChainConfig chainConfig,
-            IOperatingSystemMediator osMediator,
             IWalletRegistry walletRegistry,
             RedirectionHandler redirection,
-            IHttpClient httpClient,
-            IAnalyticsClient analyticsClient,
+            Web3Environment environment,
             ChainRegistryProvider chainRegistryProvider)
-            : base(chainRegistryProvider: chainRegistryProvider)
+            : base(environment, chainRegistryProvider, chainConfig)
         {
-            this.analyticsClient = analyticsClient;
+            analyticsClient = environment.AnalyticsClient;
             this.redirection = redirection;
             this.walletRegistry = walletRegistry;
-            this.osMediator = osMediator;
+            osMediator = environment.OperatingSystem;
             this.chainConfig = chainConfig;
             this.storage = storage;
             this.config = config;
-            this.logWriter = logWriter;
-            this.httpClient = httpClient;
+            logWriter = environment.LogWriter;
+            httpClient = environment.HttpClient;
         }
 
         public bool StoredSessionAvailable => localData.SessionTopic != null;
@@ -351,7 +348,7 @@ private async Task RenewSession()
             WCLogger.Log("Renewed session successfully.");
         }
 
-        public override async Task<T> Perform<T>(string method, params object[] parameters)
+        public override async Task<T> Request<T>(string method, params object[] parameters)
         {
             if (!connected)
             {
@@ -488,7 +485,19 @@ async Task<T> MakeRequest<TRequest>()
                 default:
                     try
                     {
-                        return await Request<T>(method, parameters);
+                        // Direct RPC request via http, WalletConnect RPC url.
+                        string chain = session.Namespaces.First().Value.Chains[0];
+
+                        // Using WalletConnect Blockchain API: https://docs.walletconnect.com/cloud/blockchain-api
+                        var url = $"https://rpc.walletconnect.com/v1?chainId={chain}&projectId={config.ProjectId}";
+
+                        string body = JsonConvert.SerializeObject(new RpcRequestMessage(Guid.NewGuid().ToString(), method, parameters));
+
+                        var rawResult = await httpClient.PostRaw(url, body, "application/json");
+
+                        RpcResponseMessage response = JsonConvert.DeserializeObject<RpcResponseMessage>(rawResult.Response);
+
+                        return response.Result.ToObject<T>();
                     }
                     catch (Exception e)
                     {
@@ -496,22 +505,5 @@ async Task<T> MakeRequest<TRequest>()
                     }
             }
         }
-
-        // Direct RPC request via WalletConnect RPC url.
-        private async Task<T> Request<T>(string method, params object[] parameters)
-        {
-            string chain = session.Namespaces.First().Value.Chains[0];
-
-            // Using WalletConnect Blockchain API: https://docs.walletconnect.com/cloud/blockchain-api
-            var url = $"https://rpc.walletconnect.com/v1?chainId={chain}&projectId={config.ProjectId}";
-
-            string body = JsonConvert.SerializeObject(new RpcRequestMessage(Guid.NewGuid().ToString(), method, parameters));
-
-            var rawResult = await httpClient.PostRaw(url, body, "application/json");
-
-            RpcResponseMessage response = JsonConvert.DeserializeObject<RpcResponseMessage>(rawResult.Response);
-
-            return response.Result.ToObject<T>();
-        }
     }
 }
\ No newline at end of file
diff --git a/src/ChainSafe.Gaming/Web3/Core/Evm/Dto/TransactionRequest.cs b/src/ChainSafe.Gaming/Web3/Core/Evm/Dto/TransactionRequest.cs
index 82d3f8189..87e9c3dcc 100644
--- a/src/ChainSafe.Gaming/Web3/Core/Evm/Dto/TransactionRequest.cs
+++ b/src/ChainSafe.Gaming/Web3/Core/Evm/Dto/TransactionRequest.cs
@@ -8,6 +8,9 @@ namespace ChainSafe.Gaming.Evm.Transactions
 {
     public class TransactionRequest : ICloneable
     {
+        [JsonIgnore]
+        public string Id { get; set; }
+
         /// <summary>
         ///    QUANTITY - The transaction type.
         /// </summary>
diff --git a/src/ChainSafe.Gaming/Web3/Evm/JsonRpc/RpcClientConfig.cs b/src/ChainSafe.Gaming/Web3/Evm/JsonRpc/RpcClientConfig.cs
deleted file mode 100644
index ec6d7da60..000000000
--- a/src/ChainSafe.Gaming/Web3/Evm/JsonRpc/RpcClientConfig.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using System;
-
-namespace ChainSafe.Gaming.Evm.Providers
-{
-    [Serializable]
-    public class RpcClientConfig
-    {
-        /// <summary>
-        /// (Optional) Url of RPC Node.
-        /// </summary>
-        public string RpcNodeUrl { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/src/ChainSafe.Gaming/Web3/Evm/JsonRpc/RpcClientExtensions.cs b/src/ChainSafe.Gaming/Web3/Evm/JsonRpc/RpcClientExtensions.cs
index a9438e58d..339034b6e 100644
--- a/src/ChainSafe.Gaming/Web3/Evm/JsonRpc/RpcClientExtensions.cs
+++ b/src/ChainSafe.Gaming/Web3/Evm/JsonRpc/RpcClientExtensions.cs
@@ -9,29 +9,6 @@ namespace ChainSafe.Gaming.Evm.JsonRpc
 {
     public static class RpcClientExtensions
     {
-        private static readonly RpcClientConfig DefaultClientConfig = new();
-
-        /// <summary>
-        /// Binds JSON RPC implementation of EVM Provider to Web3.
-        /// </summary>
-        /// <returns>The same service collection that was passed in. This enables fluent style.</returns>
-        public static IWeb3ServiceCollection UseRpcProvider(this IWeb3ServiceCollection collection, RpcClientConfig config)
-        {
-            collection.ConfigureRpcProvider(config);
-            collection.UseRpcProvider();
-            return collection;
-        }
-
-        /// <summary>
-        /// Configures JSON RPC implementation of EVM Provider.
-        /// </summary>
-        /// <returns>The same service collection that was passed in. This enables fluent style.</returns>
-        public static IWeb3ServiceCollection ConfigureRpcProvider(this IWeb3ServiceCollection collection, RpcClientConfig config)
-        {
-            collection.Replace(ServiceDescriptor.Singleton(config));
-            return collection;
-        }
-
         /// <summary>
         /// Binds JSON RPC implementation of EVM Provider to Web3.
         /// </summary>
@@ -39,7 +16,6 @@ public static IWeb3ServiceCollection ConfigureRpcProvider(this IWeb3ServiceColle
         public static IWeb3ServiceCollection UseRpcProvider(this IWeb3ServiceCollection collection)
         {
             collection.AssertServiceNotBound<IRpcProvider>();
-            collection.TryAddSingleton(DefaultClientConfig);
             collection.AddSingleton<IRpcProvider, ILifecycleParticipant, RpcClientProvider>();
 
             collection.AssertServiceNotBound<IClient>();
diff --git a/src/ChainSafe.Gaming/Web3/Evm/JsonRpc/RpcClientProvider.cs b/src/ChainSafe.Gaming/Web3/Evm/JsonRpc/RpcClientProvider.cs
index 0c3ea01e7..e2125416e 100644
--- a/src/ChainSafe.Gaming/Web3/Evm/JsonRpc/RpcClientProvider.cs
+++ b/src/ChainSafe.Gaming/Web3/Evm/JsonRpc/RpcClientProvider.cs
@@ -14,57 +14,45 @@ namespace ChainSafe.Gaming.Evm.Providers
 {
     public class RpcClientProvider : ClientBase, IRpcProvider, ILifecycleParticipant
     {
-        private readonly RpcClientConfig config;
+        private readonly string rpcNodeUrl;
         private readonly Web3Environment environment;
         private readonly ChainRegistryProvider chainRegistryProvider;
         private readonly IChainConfig chainConfig;
 
-        private Network.Network network;
-
         public RpcClientProvider(
-            RpcClientConfig config,
             Web3Environment environment,
             ChainRegistryProvider chainRegistryProvider,
             IChainConfig chainConfig)
         {
             this.chainRegistryProvider = chainRegistryProvider;
             this.environment = environment;
-            this.config = config;
             this.chainConfig = chainConfig;
-
-            if (string.IsNullOrEmpty(this.config.RpcNodeUrl))
-            {
-                this.config.RpcNodeUrl = chainConfig.Rpc;
-            }
+            rpcNodeUrl = chainConfig.Rpc;
         }
 
-        public Network.Network LastKnownNetwork
-        {
-            get => network;
-            protected set => network = value;
-        }
+        public Network.Network LastKnownNetwork { get; private set; }
 
         public async ValueTask WillStartAsync()
         {
-            if (network is null || network.ChainId == 0)
+            if (LastKnownNetwork is null || LastKnownNetwork.ChainId == 0)
             {
                 if (ulong.TryParse(chainConfig.ChainId, out var chainId))
                 {
                     var chain = await chainRegistryProvider.GetChain(chainId);
-                    network = new Network.Network()
+                    LastKnownNetwork = new Network.Network()
                     {
                         ChainId = chainId,
                         Name = chain?.Name,
                     };
                 }
 
-                network = await RefreshNetwork();
+                LastKnownNetwork = await RefreshNetwork();
             }
         }
 
         public ValueTask WillStopAsync() => new(Task.CompletedTask);
 
-        public async Task<Network.Network> DetectNetwork()
+        public async Task<Network.Network> RefreshNetwork()
         {
             // TODO: cache
             var chainIdHexString = await Perform<string>("eth_chainId");
@@ -75,25 +63,17 @@ public async ValueTask WillStartAsync()
                 throw new Web3Exception("Couldn't detect network");
             }
 
+            if (chainId == LastKnownNetwork.ChainId)
+            {
+                return LastKnownNetwork;
+            }
+
             var chain = await chainRegistryProvider.GetChain(chainId);
             return chain != null
                 ? new Network.Network { Name = chain.Name, ChainId = chainId }
                 : new Network.Network { Name = "Unknown", ChainId = chainId };
         }
 
-        public async Task<Network.Network> RefreshNetwork()
-        {
-            var currentNetwork = await DetectNetwork();
-
-            if (network != null && network.ChainId == currentNetwork.ChainId)
-            {
-                return network;
-            }
-
-            network = currentNetwork;
-            return network;
-        }
-
         public async Task<T> Perform<T>(string method, params object[] parameters)
         {
             // parameters should be skipped or be an empty array if there are none
@@ -142,7 +122,7 @@ protected override async Task<RpcResponseMessage[]> SendAsync(RpcRequestMessage[
 
         private async Task<T> SendAsyncInternally<T>(string body)
         {
-            var result = await environment.HttpClient.PostRaw(config.RpcNodeUrl, body, "application/json");
+            var result = await environment.HttpClient.PostRaw(rpcNodeUrl, body, "application/json");
 
             return JsonConvert.DeserializeObject<T>(result.Response);
         }
diff --git a/src/ChainSafe.Gaming/Web3/Evm/Wallet/IWalletProvider.cs b/src/ChainSafe.Gaming/Web3/Evm/Wallet/IWalletProvider.cs
index 28f97190a..5b30f9bbb 100644
--- a/src/ChainSafe.Gaming/Web3/Evm/Wallet/IWalletProvider.cs
+++ b/src/ChainSafe.Gaming/Web3/Evm/Wallet/IWalletProvider.cs
@@ -19,5 +19,7 @@ public interface IWalletProvider : IRpcProvider
         /// </summary>
         /// <returns>Awaitable disconnect Task.</returns>
         Task Disconnect();
+
+        Task<T> Request<T>(string method, params object[] parameters);
     }
 }
\ No newline at end of file
diff --git a/src/ChainSafe.Gaming/Web3/Evm/Wallet/WalletProvider.cs b/src/ChainSafe.Gaming/Web3/Evm/Wallet/WalletProvider.cs
index 933db7f74..b3f62237c 100644
--- a/src/ChainSafe.Gaming/Web3/Evm/Wallet/WalletProvider.cs
+++ b/src/ChainSafe.Gaming/Web3/Evm/Wallet/WalletProvider.cs
@@ -2,6 +2,7 @@
 using ChainSafe.Gaming.Evm;
 using ChainSafe.Gaming.Evm.Network;
 using ChainSafe.Gaming.Evm.Providers;
+using ChainSafe.Gaming.Web3.Environment;
 using Nethereum.Hex.HexTypes;
 
 namespace ChainSafe.Gaming.Web3.Evm.Wallet
@@ -9,43 +10,23 @@ namespace ChainSafe.Gaming.Web3.Evm.Wallet
     /// <summary>
     /// Concrete implementation of <see cref="IWalletProvider"/>.
     /// </summary>
-    public abstract class WalletProvider : IWalletProvider
+    public abstract class WalletProvider : RpcClientProvider, IWalletProvider
     {
-        private readonly ChainRegistryProvider chainRegistryProvider;
-
         /// <summary>
         /// Initializes a new instance of the <see cref="WalletProvider"/> class.
         /// </summary>
+        /// <param name="environment">Injected <see cref="Web3Environment"/>.</param>
         /// <param name="chainRegistryProvider">Injected <see cref="chainRegistryProvider"/>.</param>
-        protected WalletProvider(ChainRegistryProvider chainRegistryProvider)
-        {
-            this.chainRegistryProvider = chainRegistryProvider;
-        }
-
-        public Network LastKnownNetwork { get; private set; }
-
-        async Task<Network> IRpcProvider.RefreshNetwork()
+        /// <param name="chainConfig">Injected <see cref="chainConfig"/>.</param>
+        protected WalletProvider(Web3Environment environment, ChainRegistryProvider chainRegistryProvider, IChainConfig chainConfig)
+            : base(environment, chainRegistryProvider, chainConfig)
         {
-            string chainIdHex = await Perform<string>("eth_chainId");
-
-            ulong chainId = new HexBigInteger(chainIdHex).ToUlong();
-
-            if (chainId <= 0)
-            {
-                throw new Web3Exception("Couldn't detect network.");
-            }
-
-            var chain = await chainRegistryProvider.GetChain(chainId);
-
-            return chain != null
-                ? new Network { Name = chain.Name, ChainId = chainId }
-                : new Network { Name = "Unknown", ChainId = chainId };
         }
 
         public abstract Task<string> Connect();
 
         public abstract Task Disconnect();
 
-        public abstract Task<T> Perform<T>(string method, params object[] parameters);
+        public abstract Task<T> Request<T>(string method, params object[] parameters);
     }
 }
\ No newline at end of file
diff --git a/src/ChainSafe.Gaming/Web3/Evm/Wallet/WalletSigner.cs b/src/ChainSafe.Gaming/Web3/Evm/Wallet/WalletSigner.cs
index f2b6931e9..cd81ed8f9 100644
--- a/src/ChainSafe.Gaming/Web3/Evm/Wallet/WalletSigner.cs
+++ b/src/ChainSafe.Gaming/Web3/Evm/Wallet/WalletSigner.cs
@@ -33,7 +33,7 @@ public virtual async ValueTask WillStartAsync()
 
         public virtual async Task<string> SignMessage(string message)
         {
-            string hash = await walletProvider.Perform<string>(walletConfig.SignMessageRpcMethodName, message, PublicAddress);
+            string hash = await walletProvider.Request<string>(walletConfig.SignMessageRpcMethodName, message, PublicAddress);
 
             return hash.AssertSignatureValid(message, PublicAddress);
         }
@@ -42,7 +42,7 @@ public virtual async Task<string> SignTypedData<TStructType>(SerializableDomain
         {
             SerializableTypedData<TStructType> typedData = new SerializableTypedData<TStructType>(domain, message);
 
-            string hash = await walletProvider.Perform<string>(walletConfig.SignTypedMessageRpcMethodName, PublicAddress, typedData);
+            string hash = await walletProvider.Request<string>(walletConfig.SignTypedMessageRpcMethodName, PublicAddress, typedData);
 
             return hash.AssertTypedDataSignatureValid(typedData, PublicAddress);
         }
diff --git a/src/ChainSafe.Gaming/Web3/Evm/Wallet/WalletTransactionExecutor.cs b/src/ChainSafe.Gaming/Web3/Evm/Wallet/WalletTransactionExecutor.cs
index 5974a645c..ba651b192 100644
--- a/src/ChainSafe.Gaming/Web3/Evm/Wallet/WalletTransactionExecutor.cs
+++ b/src/ChainSafe.Gaming/Web3/Evm/Wallet/WalletTransactionExecutor.cs
@@ -32,7 +32,7 @@ public async Task<TransactionResponse> SendTransaction(TransactionRequest transa
             transaction.From ??= signer.PublicAddress;
             transaction.Data ??= "0x";
 
-            string hash = await walletProvider.Perform<string>("eth_sendTransaction", transaction.ToTransactionInput());
+            string hash = await walletProvider.Request<string>("eth_sendTransaction", transaction.ToTransactionInput());
 
             hash = hash.AssertTransactionValid();