API changes to support ES 0.90.0