Models refactoring