added mappings to the message header, which will be removed in a new revision;