Updates for wizard handling framework