Added the notification manager