Rich notification

Enriched the notifications.