Add support for row/columns with measures.