More work done on Setup Wizard