Added Notification Manager

I added but not sure if it going to work