Rework the CannedResultSet