Model
Refactoring