Improved notification usage.