Upgrading to work with ES 0.90.0