Tweaks to elasticsearch so different versions can be added