Small model refactoring.