add support for table generation