Changed header storage to key-value pairs from numeric index, but kept numeric setting, resetting, and removal for backwards compatibility.