Gave better architectural structure to parsing of header