improved header support