Improvements to notification sinks