Small changes to ConfigManager class