Added NROWS, NCOLS and NCOMP to matrix headers