Restructed the notificationManager to use a discriminator. This has the advantage of rendering the notifications independently depenting on their type