Add support for tables