Refactoring models. WIP