[ADD] Configuration refactoring