Updated for elasticsearch RC2