Add table support (with headers)