Use dictionary for header storage