Notification handler improved implementations.