Added validation to wizard