Improve notificationStreamEntry()