Working on the notification API