Configuration refactoring