Improve notification generation