Improvements on notifications