Updates and some sense injected to the NotificationsProvider category :)