Updated Notification system to use latest API