Support interface change from JENA-589