Optimized header map implementation and tests
Use fast iterator mechanism