Model refactoring 7