Support refactored DataCollection.
Updated for changes in DataRecord.