Update to AccountController, Account model and Account Service