More model refactoring