deployment-related enhancements