Refactoring models
Changed some models