Update existing code for compatibility with ES 1.0.0.RC1