Refactoring of configuration wizard