Added wizard + dialog case