Initial models refactoring.