Supporting new header iteration