Update to use Notification base