Notifications Update Refactory