Updated Wizard class