Added wizard functionality