Began adding support for swapping between multiple accounts