Added support for tabularx and multirow headers