Upgrading to comply with ES 1.x