added support for table