Update notification receivers
Refactoring code that create new Notification
Refactoring by NotificationFactory