Add support for table headers