Added AccountManager and UserAccount