Added support for Elasticsearch