Add base class for models
Change models to extend base class
Merge remote-tracking branch 'origin/master'