Added more stuffs in the wizards