Refactored Notification Service