Add multi-row header support