Refacotring model
Merge remote-tracking branch 'origin/master'
Adjusting changes to model
Merge remote-tracking branch 'origin/master'