Added MessageType support.