Updated handling of notification