Add support for rowspans