Added row_major conversion