Make compatible with Java 7 for now

* Add BaseModelObject
* Polish