Update to use notification class