Improve notifier