improved Watcher and DeployManager classes