Rework of notification operations