Adding parent model
Adding unit tests
Implementing a non static service and some other changes
Making constants final and public

should be in a property?