Modify NotificationManager to handle Notification correctly