Added support for selection and viewer alerts