Setup Wizard enhanced.