ENH: Add header support