Added the notification manager
12 files changed