Add support for wallets; partial for transfers