Configuration refactor 1