Update for ES 1.0.0 and some enhancements