Refactor RowMapper interface