Added functionality to notification handlers.