added custom header support