More model refactoring.