Improvements for custom notifications