Updated the parsing of message