Configuration refactoring.
Refactoring configure step.