Use the header map for more things