Changes made for Message