Changes for new configuration management