Refactored ConfigurationLoader