Simplifying notify module and making it safer.