Update for compatibillity with ES 1.0.0.RC1