Changed the header parsers to extract header and parse a header in 2 steps.