Expand support for extended headers