More header map speed improvements