Message and Notification functionality added