Implemented models
Implemented models
Merge origin/master