NotificationManager refactor