Notification refactoring.