Adapted to ModelManager RowStructure changes.