Model's refactoring.