Better support for different types of Notification