Adds in support for message_type