Configuration refactoring (part 1)