add Message Type and small changes in Notifications. This is still not implemented.