Add Thunderain and Elastic Mesos