Update to notification handling