Refactored Notifier implementation.