Provments on notification service