Refactor register Wallets