Add support for table