Added Wizard class
updates