Update Global configuration to match refactoring