Refactoring and new models