Adding support for JDO and Datastore