More model refactorinng.