Removed JDO and added JPA2, fully working with datastore.