Added support for elasticsearch