Refactor Model
Merge origin/master