Deployment improvements