Update creation of notifications to match spec