Updates for configuration to support deployment