Elasticsearch support added