Updated AccountService methods