Added NotificationManager