Updated for changes in DataRecord.