More changes to support dialogs as features