Adding more notification functionality