Added Toast and Notification