Issue #2 - Notification improvements