added mesos support