Adding support for Mesos