Now handles multiple accounts