Notification refactoring