Changed to model class to ease override
Merge pull request #37 from Takeatea/master

Changed to model class to ease override