various Model refactoring