Improved notification engine