Improvements to notification manager