Added support for multiple Message Formats