Improvements for notifications