change header structure
Add get functions for headers