Notifications moved to the service layer