Model refactor.