Add infrastructure to allow row and column labels with multiple span