Added support for table data