add wizard support