Refactoring, adding models