Extra Header support

Continuation from #12