enhanced notification handling