Support new returned data conventions in ES 1.0 and above