added configuration management