Major ElasticSearch updates