Updated row mapping