Add support for message header