Add lookup table for message headers instead of doing rumpelstilskin lookup