updated with regard to 0.20.0 vers of openentity api