Model refactoring.