Configuration refactored