add generic header support