Updated convertor to convert messages
Updated convertor for messages