Refactoring NotificationManagementServiceComponent