Refactoring of models to use Model