Added Notification and Alarm