Improve notifications