Adds custom header support