Upgrade to ES 1.0