changes for latest esi4j version