Add support for multiple accounts