Model refactoring