Add extra header support