Include dialogs if appropriate

And include data