adding support for tables