Added a notification manager