Added support for tables that look like tables