Added rudimentary wizard support