Extra Header support

Continuation