Update to ES 1.0.0