Update query class and Elasticsearch IO class