Begin refactoring model