Updated notification handling