Switch to using notification notifier