Added more supprt for the dialog service