Some modifs in NotificationEventListener