Updated NotificationEventListener and NotificationEventManager