Add support for nested tables