Add row mapping handling