Added more options to elasticsearch