Use correct row type