Added Notification and checks and alerts