Added Elasticsearch support