Model refactoring;