Configuration refactor