Added support for subtables.