Modify for ElasticSearch