Improve deployment.mc