Update header construction

Update the header construction to be more efficient and expandable in
the future