Improve the notification mechanism.