Configuration loader refactoring