Update to AccountController, AccountService, ModelGenerator