Adds support for tables and nested tables