Updated notification handler