Notifier refactoring.