Added Enterprise Config to ConfigManager + minor changes