Refactored header parsers