added support for tables