Notification Service refactoring