Support to the new persistence api added (6.0.x)