Improve new SetupWizard API