Rework DeployTool