Updated the account to be a singleton