RowSetMapper refactored