#4 renamed Row to CompositeRowObject