Refactoring of Configuration