Added basic event support in NotificationService