Refactoring models and adding strings