PR #219: Headers should be a map, not array