Base model refactoring.