Refactor Configuration Loader