Config Refactoring