Decomposed notification code into notifcation manager