Account refactor.