Add a bit of message parsing