added support for multiple wallets