More work on ElasticSearch Provider