Refactoring configs