Move implementation to the new notification service