Added support for multiple wallets