Updating for custom wizard support. Related to #63