changed models
refactoring models