Added templating for marathon file
Small changes