Worked on the message parsing