Added support for wide tables