Replaced old Wizards with new generated Wizards