Fixed Notification handling and usage