Use objects for headers instead of map