cqm-models 0.8.3 → 0.8.4

data/dist/index.js

@@ -7,6 +7,7 @@ const Quantity = require('./basetypes/Quantity');
 const DateTime = require('./basetypes/DateTime');
 const { ComponentSchema } = require('./Component');
 const { FacilityLocationSchema } = require('./FacilityLocation');
+const { IdSchema } = require('./Id');
 const Any = require('./basetypes/Any');
 
 const [Number, String] = [
@@ -30,7 +31,7 @@ const AdverseEventSchema = DataElementSchema({
 module.exports.AdverseEventSchema = AdverseEventSchema;
 module.exports.AdverseEvent = mongoose.model('AdverseEvent', AdverseEventSchema);
 
-},{"./Component":10,"./FacilityLocation":22,"./basetypes/Any":68,"./basetypes/Code":69,"./basetypes/DataElement":70,"./basetypes/DateTime":71,"./basetypes/Interval":72,"./basetypes/Quantity":73,"mongoose":402}],2:[function(require,module,exports){
+},{"./Component":10,"./FacilityLocation":22,"./Id":24,"./basetypes/Any":68,"./basetypes/Code":69,"./basetypes/DataElement":70,"./basetypes/DateTime":71,"./basetypes/Interval":72,"./basetypes/Quantity":73,"mongoose":402}],2:[function(require,module,exports){
 module.exports.Patient = require('./Patient.js').Patient;
 module.exports.PatientSchema = require('./Patient.js').PatientSchema;
 module.exports.Id = require('./Id.js').Id;
@@ -161,6 +162,7 @@ const Quantity = require('./basetypes/Quantity');
 const DateTime = require('./basetypes/DateTime');
 const { ComponentSchema } = require('./Component');
 const { FacilityLocationSchema } = require('./FacilityLocation');
+const { IdSchema } = require('./Id');
 const Any = require('./basetypes/Any');
 
 const [Number, String] = [
@@ -184,7 +186,7 @@ const AllergyIntoleranceSchema = DataElementSchema({
 module.exports.AllergyIntoleranceSchema = AllergyIntoleranceSchema;
 module.exports.AllergyIntolerance = mongoose.model('AllergyIntolerance', AllergyIntoleranceSchema);
 
-},{"./Component":10,"./FacilityLocation":22,"./basetypes/Any":68,"./basetypes/Code":69,"./basetypes/DataElement":70,"./basetypes/DateTime":71,"./basetypes/Interval":72,"./basetypes/Quantity":73,"mongoose":402}],4:[function(require,module,exports){
+},{"./Component":10,"./FacilityLocation":22,"./Id":24,"./basetypes/Any":68,"./basetypes/Code":69,"./basetypes/DataElement":70,"./basetypes/DateTime":71,"./basetypes/Interval":72,"./basetypes/Quantity":73,"mongoose":402}],4:[function(require,module,exports){
 const mongoose = require('mongoose');
 const { DataElementSchema } = require('./basetypes/DataElement');
 const Code = require('./basetypes/Code');
@@ -193,6 +195,7 @@ const Quantity = require('./basetypes/Quantity');
 const DateTime = require('./basetypes/DateTime');
 const { ComponentSchema } = require('./Component');
 const { FacilityLocationSchema } = require('./FacilityLocation');
+const { IdSchema } = require('./Id');
 const Any = require('./basetypes/Any');
 
 const [Number, String] = [
@@ -207,7 +210,7 @@ const AssessmentPerformedSchema = DataElementSchema({
   method: Code,
   result: Any,
   components: [ComponentSchema],
-  relatedTo: [String],
+  relatedTo: [IdSchema],
   hqmfOid: { type: String, default: '2.16.840.1.113883.10.20.28.3.117' },
   category: { type: String, default: 'assessment' },
   qdmStatus: { type: String, default: 'performed' },
@@ -219,7 +222,7 @@ const AssessmentPerformedSchema = DataElementSchema({
 module.exports.AssessmentPerformedSchema = AssessmentPerformedSchema;
 module.exports.AssessmentPerformed = mongoose.model('AssessmentPerformed', AssessmentPerformedSchema);
 
-},{"./Component":10,"./FacilityLocation":22,"./basetypes/Any":68,"./basetypes/Code":69,"./basetypes/DataElement":70,"./basetypes/DateTime":71,"./basetypes/Interval":72,"./basetypes/Quantity":73,"mongoose":402}],5:[function(require,module,exports){
+},{"./Component":10,"./FacilityLocation":22,"./Id":24,"./basetypes/Any":68,"./basetypes/Code":69,"./basetypes/DataElement":70,"./basetypes/DateTime":71,"./basetypes/Interval":72,"./basetypes/Quantity":73,"mongoose":402}],5:[function(require,module,exports){
 const mongoose = require('mongoose');
 const { DataElementSchema } = require('./basetypes/DataElement');
 const Code = require('./basetypes/Code');
@@ -228,6 +231,7 @@ const Quantity = require('./basetypes/Quantity');
 const DateTime = require('./basetypes/DateTime');
 const { ComponentSchema } = require('./Component');
 const { FacilityLocationSchema } = require('./FacilityLocation');
+const { IdSchema } = require('./Id');
 const Any = require('./basetypes/Any');
 
 const [Number, String] = [
@@ -251,7 +255,7 @@ const AssessmentRecommendedSchema = DataElementSchema({
 module.exports.AssessmentRecommendedSchema = AssessmentRecommendedSchema;
 module.exports.AssessmentRecommended = mongoose.model('AssessmentRecommended', AssessmentRecommendedSchema);
 
-},{"./Component":10,"./FacilityLocation":22,"./basetypes/Any":68,"./basetypes/Code":69,"./basetypes/DataElement":70,"./basetypes/DateTime":71,"./basetypes/Interval":72,"./basetypes/Quantity":73,"mongoose":402}],6:[function(require,module,exports){
+},{"./Component":10,"./FacilityLocation":22,"./Id":24,"./basetypes/Any":68,"./basetypes/Code":69,"./basetypes/DataElement":70,"./basetypes/DateTime":71,"./basetypes/Interval":72,"./basetypes/Quantity":73,"mongoose":402}],6:[function(require,module,exports){
 const mongoose = require('mongoose');
 const { DataElementSchema } = require('./basetypes/DataElement');
 const Code = require('./basetypes/Code');
@@ -260,6 +264,7 @@ const Quantity = require('./basetypes/Quantity');
 const DateTime = require('./basetypes/DateTime');
 const { ComponentSchema } = require('./Component');
 const { FacilityLocationSchema } = require('./FacilityLocation');
+const { IdSchema } = require('./Id');
 const Any = require('./basetypes/Any');
 
 const [Number, String] = [
@@ -269,7 +274,7 @@ const [Number, String] = [
 
 const CareGoalSchema = DataElementSchema({
   relevantPeriod: Interval,
-  relatedTo: [String],
+  relatedTo: [IdSchema],
   targetOutcome: Any,
   hqmfOid: { type: String, default: '2.16.840.1.113883.10.20.28.3.7' },
   category: { type: String, default: 'care_goal' },
@@ -281,7 +286,7 @@ const CareGoalSchema = DataElementSchema({
 module.exports.CareGoalSchema = CareGoalSchema;
 module.exports.CareGoal = mongoose.model('CareGoal', CareGoalSchema);
 
-},{"./Component":10,"./FacilityLocation":22,"./basetypes/Any":68,"./basetypes/Code":69,"./basetypes/DataElement":70,"./basetypes/DateTime":71,"./basetypes/Interval":72,"./basetypes/Quantity":73,"mongoose":402}],7:[function(require,module,exports){
+},{"./Component":10,"./FacilityLocation":22,"./Id":24,"./basetypes/Any":68,"./basetypes/Code":69,"./basetypes/DataElement":70,"./basetypes/DateTime":71,"./basetypes/Interval":72,"./basetypes/Quantity":73,"mongoose":402}],7:[function(require,module,exports){
 const mongoose = require('mongoose');
 const { DataElementSchema } = require('./basetypes/DataElement');
 const Code = require('./basetypes/Code');
@@ -290,6 +295,7 @@ const Quantity = require('./basetypes/Quantity');
 const DateTime = require('./basetypes/DateTime');
 const { ComponentSchema } = require('./Component');
 const { FacilityLocationSchema } = require('./FacilityLocation');
+const { IdSchema } = require('./Id');
 const Any = require('./basetypes/Any');
 
 const [Number, String] = [
@@ -299,7 +305,7 @@ const [Number, String] = [
 
 const CommunicationFromPatientToProviderSchema = DataElementSchema({
   authorDatetime: DateTime,
-  relatedTo: [String],
+  relatedTo: [IdSchema],
   negationRationale: Code,
   hqmfOid: { type: String, default: '2.16.840.1.113883.10.20.28.3.8' },
   category: { type: String, default: 'communication' },
@@ -312,7 +318,7 @@ const CommunicationFromPatientToProviderSchema = DataElementSchema({
 module.exports.CommunicationFromPatientToProviderSchema = CommunicationFromPatientToProviderSchema;
 module.exports.CommunicationFromPatientToProvider = mongoose.model('CommunicationFromPatientToProvider', CommunicationFromPatientToProviderSchema);
 
-},{"./Component":10,"./FacilityLocation":22,"./basetypes/Any":68,"./basetypes/Code":69,"./basetypes/DataElement":70,"./basetypes/DateTime":71,"./basetypes/Interval":72,"./basetypes/Quantity":73,"mongoose":402}],8:[function(require,module,exports){
+},{"./Component":10,"./FacilityLocation":22,"./Id":24,"./basetypes/Any":68,"./basetypes/Code":69,"./basetypes/DataElement":70,"./basetypes/DateTime":71,"./basetypes/Interval":72,"./basetypes/Quantity":73,"mongoose":402}],8:[function(require,module,exports){
 const mongoose = require('mongoose');
 const { DataElementSchema } = require('./basetypes/DataElement');
 const Code = require('./basetypes/Code');
@@ -321,6 +327,7 @@ const Quantity = require('./basetypes/Quantity');
 const DateTime = require('./basetypes/DateTime');
 const { ComponentSchema } = require('./Component');
 const { FacilityLocationSchema } = require('./FacilityLocation');
+const { IdSchema } = require('./Id');
 const Any = require('./basetypes/Any');
 
 const [Number, String] = [
@@ -330,7 +337,7 @@ const [Number, String] = [
 
 const CommunicationFromProviderToPatientSchema = DataElementSchema({
   authorDatetime: DateTime,
-  relatedTo: [String],
+  relatedTo: [IdSchema],
   negationRationale: Code,
   hqmfOid: { type: String, default: '2.16.840.1.113883.10.20.28.3.9' },
   category: { type: String, default: 'communication' },
@@ -343,7 +350,7 @@ const CommunicationFromProviderToPatientSchema = DataElementSchema({
 module.exports.CommunicationFromProviderToPatientSchema = CommunicationFromProviderToPatientSchema;
 module.exports.CommunicationFromProviderToPatient = mongoose.model('CommunicationFromProviderToPatient', CommunicationFromProviderToPatientSchema);
 
-},{"./Component":10,"./FacilityLocation":22,"./basetypes/Any":68,"./basetypes/Code":69,"./basetypes/DataElement":70,"./basetypes/DateTime":71,"./basetypes/Interval":72,"./basetypes/Quantity":73,"mongoose":402}],9:[function(require,module,exports){
+},{"./Component":10,"./FacilityLocation":22,"./Id":24,"./basetypes/Any":68,"./basetypes/Code":69,"./basetypes/DataElement":70,"./basetypes/DateTime":71,"./basetypes/Interval":72,"./basetypes/Quantity":73,"mongoose":402}],9:[function(require,module,exports){
 const mongoose = require('mongoose');
 const { DataElementSchema } = require('./basetypes/DataElement');
 const Code = require('./basetypes/Code');
@@ -352,6 +359,7 @@ const Quantity = require('./basetypes/Quantity');
 const DateTime = require('./basetypes/DateTime');
 const { ComponentSchema } = require('./Component');
 const { FacilityLocationSchema } = require('./FacilityLocation');
+const { IdSchema } = require('./Id');
 const Any = require('./basetypes/Any');
 
 const [Number, String] = [
@@ -361,7 +369,7 @@ const [Number, String] = [
 
 const CommunicationFromProviderToProviderSchema = DataElementSchema({
   authorDatetime: DateTime,
-  relatedTo: [String],
+  relatedTo: [IdSchema],
   negationRationale: Code,
   hqmfOid: { type: String, default: '2.16.840.1.113883.10.20.28.3.10' },
   category: { type: String, default: 'communication' },
@@ -374,7 +382,7 @@ const CommunicationFromProviderToProviderSchema = DataElementSchema({
 module.exports.CommunicationFromProviderToProviderSchema = CommunicationFromProviderToProviderSchema;
 module.exports.CommunicationFromProviderToProvider = mongoose.model('CommunicationFromProviderToProvider', CommunicationFromProviderToProviderSchema);
 
-},{"./Component":10,"./FacilityLocation":22,"./basetypes/Any":68,"./basetypes/Code":69,"./basetypes/DataElement":70,"./basetypes/DateTime":71,"./basetypes/Interval":72,"./basetypes/Quantity":73,"mongoose":402}],10:[function(require,module,exports){
+},{"./Component":10,"./FacilityLocation":22,"./Id":24,"./basetypes/Any":68,"./basetypes/Code":69,"./basetypes/DataElement":70,"./basetypes/DateTime":71,"./basetypes/Interval":72,"./basetypes/Quantity":73,"mongoose":402}],10:[function(require,module,exports){
 const mongoose = require('mongoose');
 const { DataElementSchema } = require('./basetypes/DataElement');
 const Code = require('./basetypes/Code');
@@ -383,6 +391,7 @@ const Quantity = require('./basetypes/Quantity');
 const DateTime = require('./basetypes/DateTime');
 
 const { FacilityLocationSchema } = require('./FacilityLocation');
+const { IdSchema } = require('./Id');
 const Any = require('./basetypes/Any');
 
 const [Number, String] = [
@@ -401,7 +410,7 @@ const ComponentSchema = new mongoose.Schema({
 module.exports.ComponentSchema = ComponentSchema;
 module.exports.Component = mongoose.model('Component', ComponentSchema);
 
-},{"./FacilityLocation":22,"./basetypes/Any":68,"./basetypes/Code":69,"./basetypes/DataElement":70,"./basetypes/DateTime":71,"./basetypes/Interval":72,"./basetypes/Quantity":73,"mongoose":402}],11:[function(require,module,exports){
+},{"./FacilityLocation":22,"./Id":24,"./basetypes/Any":68,"./basetypes/Code":69,"./basetypes/DataElement":70,"./basetypes/DateTime":71,"./basetypes/Interval":72,"./basetypes/Quantity":73,"mongoose":402}],11:[function(require,module,exports){
 const mongoose = require('mongoose');
 
 const mString = mongoose.Schema.Types.String;
@@ -426,6 +435,7 @@ const Quantity = require('./basetypes/Quantity');
 const DateTime = require('./basetypes/DateTime');
 const { ComponentSchema } = require('./Component');
 const { FacilityLocationSchema } = require('./FacilityLocation');
+const { IdSchema } = require('./Id');
 const Any = require('./basetypes/Any');
 
 const [Number, String] = [
@@ -451,7 +461,7 @@ const DeviceAppliedSchema = DataElementSchema({
 module.exports.DeviceAppliedSchema = DeviceAppliedSchema;
 module.exports.DeviceApplied = mongoose.model('DeviceApplied', DeviceAppliedSchema);
 
-},{"./Component":10,"./FacilityLocation":22,"./basetypes/Any":68,"./basetypes/Code":69,"./basetypes/DataElement":70,"./basetypes/DateTime":71,"./basetypes/Interval":72,"./basetypes/Quantity":73,"mongoose":402}],13:[function(require,module,exports){
+},{"./Component":10,"./FacilityLocation":22,"./Id":24,"./basetypes/Any":68,"./basetypes/Code":69,"./basetypes/DataElement":70,"./basetypes/DateTime":71,"./basetypes/Interval":72,"./basetypes/Quantity":73,"mongoose":402}],13:[function(require,module,exports){
 const mongoose = require('mongoose');
 const { DataElementSchema } = require('./basetypes/DataElement');
 const Code = require('./basetypes/Code');
@@ -460,6 +470,7 @@ const Quantity = require('./basetypes/Quantity');
 const DateTime = require('./basetypes/DateTime');
 const { ComponentSchema } = require('./Component');
 const { FacilityLocationSchema } = require('./FacilityLocation');
+const { IdSchema } = require('./Id');
 const Any = require('./basetypes/Any');
 
 const [Number, String] = [
@@ -482,7 +493,7 @@ const DeviceOrderSchema = DataElementSchema({
 module.exports.DeviceOrderSchema = DeviceOrderSchema;
 module.exports.DeviceOrder = mongoose.model('DeviceOrder', DeviceOrderSchema);
 
-},{"./Component":10,"./FacilityLocation":22,"./basetypes/Any":68,"./basetypes/Code":69,"./basetypes/DataElement":70,"./basetypes/DateTime":71,"./basetypes/Interval":72,"./basetypes/Quantity":73,"mongoose":402}],14:[function(require,module,exports){
+},{"./Component":10,"./FacilityLocation":22,"./Id":24,"./basetypes/Any":68,"./basetypes/Code":69,"./basetypes/DataElement":70,"./basetypes/DateTime":71,"./basetypes/Interval":72,"./basetypes/Quantity":73,"mongoose":402}],14:[function(require,module,exports){
 const mongoose = require('mongoose');
 const { DataElementSchema } = require('./basetypes/DataElement');
 const Code = require('./basetypes/Code');
@@ -491,6 +502,7 @@ const Quantity = require('./basetypes/Quantity');
 const DateTime = require('./basetypes/DateTime');
 const { ComponentSchema } = require('./Component');
 const { FacilityLocationSchema } = require('./FacilityLocation');
+const { IdSchema } = require('./Id');
 const Any = require('./basetypes/Any');
 
 const [Number, String] = [
@@ -513,7 +525,7 @@ const DeviceRecommendedSchema = DataElementSchema({
 module.exports.DeviceRecommendedSchema = DeviceRecommendedSchema;
 module.exports.DeviceRecommended = mongoose.model('DeviceRecommended', DeviceRecommendedSchema);
 
-},{"./Component":10,"./FacilityLocation":22,"./basetypes/Any":68,"./basetypes/Code":69,"./basetypes/DataElement":70,"./basetypes/DateTime":71,"./basetypes/Interval":72,"./basetypes/Quantity":73,"mongoose":402}],15:[function(require,module,exports){
+},{"./Component":10,"./FacilityLocation":22,"./Id":24,"./basetypes/Any":68,"./basetypes/Code":69,"./basetypes/DataElement":70,"./basetypes/DateTime":71,"./basetypes/Interval":72,"./basetypes/Quantity":73,"mongoose":402}],15:[function(require,module,exports){
 const mongoose = require('mongoose');
 const { DataElementSchema } = require('./basetypes/DataElement');
 const Code = require('./basetypes/Code');
@@ -522,6 +534,7 @@ const Quantity = require('./basetypes/Quantity');
 const DateTime = require('./basetypes/DateTime');
 const { ComponentSchema } = require('./Component');
 const { FacilityLocationSchema } = require('./FacilityLocation');
+const { IdSchema } = require('./Id');
 const Any = require('./basetypes/Any');
 
 const [Number, String] = [
@@ -545,7 +558,7 @@ const DiagnosisSchema = DataElementSchema({
 module.exports.DiagnosisSchema = DiagnosisSchema;
 module.exports.Diagnosis = mongoose.model('Diagnosis', DiagnosisSchema);
 
-},{"./Component":10,"./FacilityLocation":22,"./basetypes/Any":68,"./basetypes/Code":69,"./basetypes/DataElement":70,"./basetypes/DateTime":71,"./basetypes/Interval":72,"./basetypes/Quantity":73,"mongoose":402}],16:[function(require,module,exports){
+},{"./Component":10,"./FacilityLocation":22,"./Id":24,"./basetypes/Any":68,"./basetypes/Code":69,"./basetypes/DataElement":70,"./basetypes/DateTime":71,"./basetypes/Interval":72,"./basetypes/Quantity":73,"mongoose":402}],16:[function(require,module,exports){
 const mongoose = require('mongoose');
 const { DataElementSchema } = require('./basetypes/DataElement');
 const Code = require('./basetypes/Code');
@@ -554,6 +567,7 @@ const Quantity = require('./basetypes/Quantity');
 const DateTime = require('./basetypes/DateTime');
 const { ComponentSchema } = require('./Component');
 const { FacilityLocationSchema } = require('./FacilityLocation');
+const { IdSchema } = require('./Id');
 const Any = require('./basetypes/Any');
 
 const [Number, String] = [
@@ -577,7 +591,7 @@ const DiagnosticStudyOrderSchema = DataElementSchema({
 module.exports.DiagnosticStudyOrderSchema = DiagnosticStudyOrderSchema;
 module.exports.DiagnosticStudyOrder = mongoose.model('DiagnosticStudyOrder', DiagnosticStudyOrderSchema);
 
-},{"./Component":10,"./FacilityLocation":22,"./basetypes/Any":68,"./basetypes/Code":69,"./basetypes/DataElement":70,"./basetypes/DateTime":71,"./basetypes/Interval":72,"./basetypes/Quantity":73,"mongoose":402}],17:[function(require,module,exports){
+},{"./Component":10,"./FacilityLocation":22,"./Id":24,"./basetypes/Any":68,"./basetypes/Code":69,"./basetypes/DataElement":70,"./basetypes/DateTime":71,"./basetypes/Interval":72,"./basetypes/Quantity":73,"mongoose":402}],17:[function(require,module,exports){
 const mongoose = require('mongoose');
 const { DataElementSchema } = require('./basetypes/DataElement');
 const Code = require('./basetypes/Code');
@@ -586,6 +600,7 @@ const Quantity = require('./basetypes/Quantity');
 const DateTime = require('./basetypes/DateTime');
 const { ComponentSchema } = require('./Component');
 const { FacilityLocationSchema } = require('./FacilityLocation');
+const { IdSchema } = require('./Id');
 const Any = require('./basetypes/Any');
 
 const [Number, String] = [
@@ -615,7 +630,7 @@ const DiagnosticStudyPerformedSchema = DataElementSchema({
 module.exports.DiagnosticStudyPerformedSchema = DiagnosticStudyPerformedSchema;
 module.exports.DiagnosticStudyPerformed = mongoose.model('DiagnosticStudyPerformed', DiagnosticStudyPerformedSchema);
 
-},{"./Component":10,"./FacilityLocation":22,"./basetypes/Any":68,"./basetypes/Code":69,"./basetypes/DataElement":70,"./basetypes/DateTime":71,"./basetypes/Interval":72,"./basetypes/Quantity":73,"mongoose":402}],18:[function(require,module,exports){
+},{"./Component":10,"./FacilityLocation":22,"./Id":24,"./basetypes/Any":68,"./basetypes/Code":69,"./basetypes/DataElement":70,"./basetypes/DateTime":71,"./basetypes/Interval":72,"./basetypes/Quantity":73,"mongoose":402}],18:[function(require,module,exports){
 const mongoose = require('mongoose');
 const { DataElementSchema } = require('./basetypes/DataElement');
 const Code = require('./basetypes/Code');
@@ -624,6 +639,7 @@ const Quantity = require('./basetypes/Quantity');
 const DateTime = require('./basetypes/DateTime');
 const { ComponentSchema } = require('./Component');
 const { FacilityLocationSchema } = require('./FacilityLocation');
+const { IdSchema } = require('./Id');
 const Any = require('./basetypes/Any');
 
 const [Number, String] = [
@@ -647,7 +663,7 @@ const DiagnosticStudyRecommendedSchema = DataElementSchema({
 module.exports.DiagnosticStudyRecommendedSchema = DiagnosticStudyRecommendedSchema;
 module.exports.DiagnosticStudyRecommended = mongoose.model('DiagnosticStudyRecommended', DiagnosticStudyRecommendedSchema);
 
-},{"./Component":10,"./FacilityLocation":22,"./basetypes/Any":68,"./basetypes/Code":69,"./basetypes/DataElement":70,"./basetypes/DateTime":71,"./basetypes/Interval":72,"./basetypes/Quantity":73,"mongoose":402}],19:[function(require,module,exports){
+},{"./Component":10,"./FacilityLocation":22,"./Id":24,"./basetypes/Any":68,"./basetypes/Code":69,"./basetypes/DataElement":70,"./basetypes/DateTime":71,"./basetypes/Interval":72,"./basetypes/Quantity":73,"mongoose":402}],19:[function(require,module,exports){
 const mongoose = require('mongoose');
 const { DataElementSchema } = require('./basetypes/DataElement');
 const Code = require('./basetypes/Code');
@@ -656,6 +672,7 @@ const Quantity = require('./basetypes/Quantity');
 const DateTime = require('./basetypes/DateTime');
 const { ComponentSchema } = require('./Component');
 const { FacilityLocationSchema } = require('./FacilityLocation');
+const { IdSchema } = require('./Id');
 const Any = require('./basetypes/Any');
 
 const [Number, String] = [
@@ -679,7 +696,7 @@ const EncounterOrderSchema = DataElementSchema({
 module.exports.EncounterOrderSchema = EncounterOrderSchema;
 module.exports.EncounterOrder = mongoose.model('EncounterOrder', EncounterOrderSchema);
 
-},{"./Component":10,"./FacilityLocation":22,"./basetypes/Any":68,"./basetypes/Code":69,"./basetypes/DataElement":70,"./basetypes/DateTime":71,"./basetypes/Interval":72,"./basetypes/Quantity":73,"mongoose":402}],20:[function(require,module,exports){
+},{"./Component":10,"./FacilityLocation":22,"./Id":24,"./basetypes/Any":68,"./basetypes/Code":69,"./basetypes/DataElement":70,"./basetypes/DateTime":71,"./basetypes/Interval":72,"./basetypes/Quantity":73,"mongoose":402}],20:[function(require,module,exports){
 const mongoose = require('mongoose');
 const { DataElementSchema } = require('./basetypes/DataElement');
 const Code = require('./basetypes/Code');
@@ -688,6 +705,7 @@ const Quantity = require('./basetypes/Quantity');
 const DateTime = require('./basetypes/DateTime');
 const { ComponentSchema } = require('./Component');
 const { FacilityLocationSchema } = require('./FacilityLocation');
+const { IdSchema } = require('./Id');
 const Any = require('./basetypes/Any');
 
 const [Number, String] = [
@@ -716,7 +734,7 @@ const EncounterPerformedSchema = DataElementSchema({
 module.exports.EncounterPerformedSchema = EncounterPerformedSchema;
 module.exports.EncounterPerformed = mongoose.model('EncounterPerformed', EncounterPerformedSchema);
 
-},{"./Component":10,"./FacilityLocation":22,"./basetypes/Any":68,"./basetypes/Code":69,"./basetypes/DataElement":70,"./basetypes/DateTime":71,"./basetypes/Interval":72,"./basetypes/Quantity":73,"mongoose":402}],21:[function(require,module,exports){
+},{"./Component":10,"./FacilityLocation":22,"./Id":24,"./basetypes/Any":68,"./basetypes/Code":69,"./basetypes/DataElement":70,"./basetypes/DateTime":71,"./basetypes/Interval":72,"./basetypes/Quantity":73,"mongoose":402}],21:[function(require,module,exports){
 const mongoose = require('mongoose');
 const { DataElementSchema } = require('./basetypes/DataElement');
 const Code = require('./basetypes/Code');
@@ -725,6 +743,7 @@ const Quantity = require('./basetypes/Quantity');
 const DateTime = require('./basetypes/DateTime');
 const { ComponentSchema } = require('./Component');
 const { FacilityLocationSchema } = require('./FacilityLocation');
+const { IdSchema } = require('./Id');
 const Any = require('./basetypes/Any');
 
 const [Number, String] = [
@@ -748,7 +767,7 @@ const EncounterRecommendedSchema = DataElementSchema({
 module.exports.EncounterRecommendedSchema = EncounterRecommendedSchema;
 module.exports.EncounterRecommended = mongoose.model('EncounterRecommended', EncounterRecommendedSchema);
 
-},{"./Component":10,"./FacilityLocation":22,"./basetypes/Any":68,"./basetypes/Code":69,"./basetypes/DataElement":70,"./basetypes/DateTime":71,"./basetypes/Interval":72,"./basetypes/Quantity":73,"mongoose":402}],22:[function(require,module,exports){
+},{"./Component":10,"./FacilityLocation":22,"./Id":24,"./basetypes/Any":68,"./basetypes/Code":69,"./basetypes/DataElement":70,"./basetypes/DateTime":71,"./basetypes/Interval":72,"./basetypes/Quantity":73,"mongoose":402}],22:[function(require,module,exports){
 const mongoose = require('mongoose');
 const { DataElementSchema } = require('./basetypes/DataElement');
 const Code = require('./basetypes/Code');
@@ -757,6 +776,7 @@ const Quantity = require('./basetypes/Quantity');
 const DateTime = require('./basetypes/DateTime');
 const { ComponentSchema } = require('./Component');
 
+const { IdSchema } = require('./Id');
 const Any = require('./basetypes/Any');
 
 const [Number, String] = [
@@ -775,7 +795,7 @@ const FacilityLocationSchema = new mongoose.Schema({
 module.exports.FacilityLocationSchema = FacilityLocationSchema;
 module.exports.FacilityLocation = mongoose.model('FacilityLocation', FacilityLocationSchema);
 
-},{"./Component":10,"./basetypes/Any":68,"./basetypes/Code":69,"./basetypes/DataElement":70,"./basetypes/DateTime":71,"./basetypes/Interval":72,"./basetypes/Quantity":73,"mongoose":402}],23:[function(require,module,exports){
+},{"./Component":10,"./Id":24,"./basetypes/Any":68,"./basetypes/Code":69,"./basetypes/DataElement":70,"./basetypes/DateTime":71,"./basetypes/Interval":72,"./basetypes/Quantity":73,"mongoose":402}],23:[function(require,module,exports){
 const mongoose = require('mongoose');
 const { DataElementSchema } = require('./basetypes/DataElement');
 const Code = require('./basetypes/Code');
@@ -784,6 +804,7 @@ const Quantity = require('./basetypes/Quantity');
 const DateTime = require('./basetypes/DateTime');
 const { ComponentSchema } = require('./Component');
 const { FacilityLocationSchema } = require('./FacilityLocation');
+const { IdSchema } = require('./Id');
 const Any = require('./basetypes/Any');
 
 const [Number, String] = [
@@ -805,34 +826,26 @@ const FamilyHistorySchema = DataElementSchema({
 module.exports.FamilyHistorySchema = FamilyHistorySchema;
 module.exports.FamilyHistory = mongoose.model('FamilyHistory', FamilyHistorySchema);
 
-},{"./Component":10,"./FacilityLocation":22,"./basetypes/Any":68,"./basetypes/Code":69,"./basetypes/DataElement":70,"./basetypes/DateTime":71,"./basetypes/Interval":72,"./basetypes/Quantity":73,"mongoose":402}],24:[function(require,module,exports){
+},{"./Component":10,"./FacilityLocation":22,"./Id":24,"./basetypes/Any":68,"./basetypes/Code":69,"./basetypes/DataElement":70,"./basetypes/DateTime":71,"./basetypes/Interval":72,"./basetypes/Quantity":73,"mongoose":402}],24:[function(require,module,exports){
 const mongoose = require('mongoose');
-const { DataElementSchema } = require('./basetypes/DataElement');
-const Code = require('./basetypes/Code');
-const Interval = require('./basetypes/Interval');
-const Quantity = require('./basetypes/Quantity');
-const DateTime = require('./basetypes/DateTime');
-const { ComponentSchema } = require('./Component');
-const { FacilityLocationSchema } = require('./FacilityLocation');
-const Any = require('./basetypes/Any');
 
 const [Number, String] = [
   mongoose.Schema.Types.Number,
   mongoose.Schema.Types.String,
 ];
 
-const IdSchema = DataElementSchema({
+const IdSchema = mongoose.Schema({
   namingSystem: String,
   value: String,
   qdmVersion: { type: String, default: '5.3' },
   _type: { type: String, default: 'Id' },
 
-});
+}, { _id: false, id: false });
 
 module.exports.IdSchema = IdSchema;
 module.exports.Id = mongoose.model('Id', IdSchema);
 
-},{"./Component":10,"./FacilityLocation":22,"./basetypes/Any":68,"./basetypes/Code":69,"./basetypes/DataElement":70,"./basetypes/DateTime":71,"./basetypes/Interval":72,"./basetypes/Quantity":73,"mongoose":402}],25:[function(require,module,exports){
+},{"mongoose":402}],25:[function(require,module,exports){
 const mongoose = require('mongoose');
 const { DataElementSchema } = require('./basetypes/DataElement');
 const Code = require('./basetypes/Code');
@@ -841,6 +854,7 @@ const Quantity = require('./basetypes/Quantity');
 const DateTime = require('./basetypes/DateTime');
 const { ComponentSchema } = require('./Component');
 const { FacilityLocationSchema } = require('./FacilityLocation');
+const { IdSchema } = require('./Id');
 const Any = require('./basetypes/Any');
 
 const [Number, String] = [
@@ -867,7 +881,7 @@ const ImmunizationAdministeredSchema = DataElementSchema({
 module.exports.ImmunizationAdministeredSchema = ImmunizationAdministeredSchema;
 module.exports.ImmunizationAdministered = mongoose.model('ImmunizationAdministered', ImmunizationAdministeredSchema);
 
-},{"./Component":10,"./FacilityLocation":22,"./basetypes/Any":68,"./basetypes/Code":69,"./basetypes/DataElement":70,"./basetypes/DateTime":71,"./basetypes/Interval":72,"./basetypes/Quantity":73,"mongoose":402}],26:[function(require,module,exports){
+},{"./Component":10,"./FacilityLocation":22,"./Id":24,"./basetypes/Any":68,"./basetypes/Code":69,"./basetypes/DataElement":70,"./basetypes/DateTime":71,"./basetypes/Interval":72,"./basetypes/Quantity":73,"mongoose":402}],26:[function(require,module,exports){
 const mongoose = require('mongoose');
 const { DataElementSchema } = require('./basetypes/DataElement');
 const Code = require('./basetypes/Code');
@@ -876,6 +890,7 @@ const Quantity = require('./basetypes/Quantity');
 const DateTime = require('./basetypes/DateTime');
 const { ComponentSchema } = require('./Component');
 const { FacilityLocationSchema } = require('./FacilityLocation');
+const { IdSchema } = require('./Id');
 const Any = require('./basetypes/Any');
 
 const [Number, String] = [
@@ -902,7 +917,7 @@ const ImmunizationOrderSchema = DataElementSchema({
 module.exports.ImmunizationOrderSchema = ImmunizationOrderSchema;
 module.exports.ImmunizationOrder = mongoose.model('ImmunizationOrder', ImmunizationOrderSchema);
 
-},{"./Component":10,"./FacilityLocation":22,"./basetypes/Any":68,"./basetypes/Code":69,"./basetypes/DataElement":70,"./basetypes/DateTime":71,"./basetypes/Interval":72,"./basetypes/Quantity":73,"mongoose":402}],27:[function(require,module,exports){
+},{"./Component":10,"./FacilityLocation":22,"./Id":24,"./basetypes/Any":68,"./basetypes/Code":69,"./basetypes/DataElement":70,"./basetypes/DateTime":71,"./basetypes/Interval":72,"./basetypes/Quantity":73,"mongoose":402}],27:[function(require,module,exports){
 const mongoose = require('mongoose');
 
 const [Number, String, Mixed, ObjectId] = [
@@ -970,6 +985,7 @@ const Quantity = require('./basetypes/Quantity');
 const DateTime = require('./basetypes/DateTime');
 const { ComponentSchema } = require('./Component');
 const { FacilityLocationSchema } = require('./FacilityLocation');
+const { IdSchema } = require('./Id');
 const Any = require('./basetypes/Any');
 
 const [Number, String] = [
@@ -992,7 +1008,7 @@ const InterventionOrderSchema = DataElementSchema({
 module.exports.InterventionOrderSchema = InterventionOrderSchema;
 module.exports.InterventionOrder = mongoose.model('InterventionOrder', InterventionOrderSchema);
 
-},{"./Component":10,"./FacilityLocation":22,"./basetypes/Any":68,"./basetypes/Code":69,"./basetypes/DataElement":70,"./basetypes/DateTime":71,"./basetypes/Interval":72,"./basetypes/Quantity":73,"mongoose":402}],29:[function(require,module,exports){
+},{"./Component":10,"./FacilityLocation":22,"./Id":24,"./basetypes/Any":68,"./basetypes/Code":69,"./basetypes/DataElement":70,"./basetypes/DateTime":71,"./basetypes/Interval":72,"./basetypes/Quantity":73,"mongoose":402}],29:[function(require,module,exports){
 const mongoose = require('mongoose');
 const { DataElementSchema } = require('./basetypes/DataElement');
 const Code = require('./basetypes/Code');
@@ -1001,6 +1017,7 @@ const Quantity = require('./basetypes/Quantity');
 const DateTime = require('./basetypes/DateTime');
 const { ComponentSchema } = require('./Component');
 const { FacilityLocationSchema } = require('./FacilityLocation');
+const { IdSchema } = require('./Id');
 const Any = require('./basetypes/Any');
 
 const [Number, String] = [
@@ -1026,7 +1043,7 @@ const InterventionPerformedSchema = DataElementSchema({
 module.exports.InterventionPerformedSchema = InterventionPerformedSchema;
 module.exports.InterventionPerformed = mongoose.model('InterventionPerformed', InterventionPerformedSchema);
 
-},{"./Component":10,"./FacilityLocation":22,"./basetypes/Any":68,"./basetypes/Code":69,"./basetypes/DataElement":70,"./basetypes/DateTime":71,"./basetypes/Interval":72,"./basetypes/Quantity":73,"mongoose":402}],30:[function(require,module,exports){
+},{"./Component":10,"./FacilityLocation":22,"./Id":24,"./basetypes/Any":68,"./basetypes/Code":69,"./basetypes/DataElement":70,"./basetypes/DateTime":71,"./basetypes/Interval":72,"./basetypes/Quantity":73,"mongoose":402}],30:[function(require,module,exports){
 const mongoose = require('mongoose');
 const { DataElementSchema } = require('./basetypes/DataElement');
 const Code = require('./basetypes/Code');
@@ -1035,6 +1052,7 @@ const Quantity = require('./basetypes/Quantity');
 const DateTime = require('./basetypes/DateTime');
 const { ComponentSchema } = require('./Component');
 const { FacilityLocationSchema } = require('./FacilityLocation');
+const { IdSchema } = require('./Id');
 const Any = require('./basetypes/Any');
 
 const [Number, String] = [
@@ -1057,7 +1075,7 @@ const InterventionRecommendedSchema = DataElementSchema({
 module.exports.InterventionRecommendedSchema = InterventionRecommendedSchema;
 module.exports.InterventionRecommended = mongoose.model('InterventionRecommended', InterventionRecommendedSchema);
 
-},{"./Component":10,"./FacilityLocation":22,"./basetypes/Any":68,"./basetypes/Code":69,"./basetypes/DataElement":70,"./basetypes/DateTime":71,"./basetypes/Interval":72,"./basetypes/Quantity":73,"mongoose":402}],31:[function(require,module,exports){
+},{"./Component":10,"./FacilityLocation":22,"./Id":24,"./basetypes/Any":68,"./basetypes/Code":69,"./basetypes/DataElement":70,"./basetypes/DateTime":71,"./basetypes/Interval":72,"./basetypes/Quantity":73,"mongoose":402}],31:[function(require,module,exports){
 const mongoose = require('mongoose');
 const { DataElementSchema } = require('./basetypes/DataElement');
 const Code = require('./basetypes/Code');
@@ -1066,6 +1084,7 @@ const Quantity = require('./basetypes/Quantity');
 const DateTime = require('./basetypes/DateTime');
 const { ComponentSchema } = require('./Component');
 const { FacilityLocationSchema } = require('./FacilityLocation');
+const { IdSchema } = require('./Id');
 const Any = require('./basetypes/Any');
 
 const [Number, String] = [
@@ -1089,7 +1108,7 @@ const LaboratoryTestOrderSchema = DataElementSchema({
 module.exports.LaboratoryTestOrderSchema = LaboratoryTestOrderSchema;
 module.exports.LaboratoryTestOrder = mongoose.model('LaboratoryTestOrder', LaboratoryTestOrderSchema);
 
-},{"./Component":10,"./FacilityLocation":22,"./basetypes/Any":68,"./basetypes/Code":69,"./basetypes/DataElement":70,"./basetypes/DateTime":71,"./basetypes/Interval":72,"./basetypes/Quantity":73,"mongoose":402}],32:[function(require,module,exports){
+},{"./Component":10,"./FacilityLocation":22,"./Id":24,"./basetypes/Any":68,"./basetypes/Code":69,"./basetypes/DataElement":70,"./basetypes/DateTime":71,"./basetypes/Interval":72,"./basetypes/Quantity":73,"mongoose":402}],32:[function(require,module,exports){
 const mongoose = require('mongoose');
 const { DataElementSchema } = require('./basetypes/DataElement');
 const Code = require('./basetypes/Code');
@@ -1098,6 +1117,7 @@ const Quantity = require('./basetypes/Quantity');
 const DateTime = require('./basetypes/DateTime');
 const { ComponentSchema } = require('./Component');
 const { FacilityLocationSchema } = require('./FacilityLocation');
+const { IdSchema } = require('./Id');
 const Any = require('./basetypes/Any');
 
 const [Number, String] = [
@@ -1127,7 +1147,7 @@ const LaboratoryTestPerformedSchema = DataElementSchema({
 module.exports.LaboratoryTestPerformedSchema = LaboratoryTestPerformedSchema;
 module.exports.LaboratoryTestPerformed = mongoose.model('LaboratoryTestPerformed', LaboratoryTestPerformedSchema);
 
-},{"./Component":10,"./FacilityLocation":22,"./basetypes/Any":68,"./basetypes/Code":69,"./basetypes/DataElement":70,"./basetypes/DateTime":71,"./basetypes/Interval":72,"./basetypes/Quantity":73,"mongoose":402}],33:[function(require,module,exports){
+},{"./Component":10,"./FacilityLocation":22,"./Id":24,"./basetypes/Any":68,"./basetypes/Code":69,"./basetypes/DataElement":70,"./basetypes/DateTime":71,"./basetypes/Interval":72,"./basetypes/Quantity":73,"mongoose":402}],33:[function(require,module,exports){
 const mongoose = require('mongoose');
 const { DataElementSchema } = require('./basetypes/DataElement');
 const Code = require('./basetypes/Code');
@@ -1136,6 +1156,7 @@ const Quantity = require('./basetypes/Quantity');
 const DateTime = require('./basetypes/DateTime');
 const { ComponentSchema } = require('./Component');
 const { FacilityLocationSchema } = require('./FacilityLocation');
+const { IdSchema } = require('./Id');
 const Any = require('./basetypes/Any');
 
 const [Number, String] = [
@@ -1159,7 +1180,7 @@ const LaboratoryTestRecommendedSchema = DataElementSchema({
 module.exports.LaboratoryTestRecommendedSchema = LaboratoryTestRecommendedSchema;
 module.exports.LaboratoryTestRecommended = mongoose.model('LaboratoryTestRecommended', LaboratoryTestRecommendedSchema);
 
-},{"./Component":10,"./FacilityLocation":22,"./basetypes/Any":68,"./basetypes/Code":69,"./basetypes/DataElement":70,"./basetypes/DateTime":71,"./basetypes/Interval":72,"./basetypes/Quantity":73,"mongoose":402}],34:[function(require,module,exports){
+},{"./Component":10,"./FacilityLocation":22,"./Id":24,"./basetypes/Any":68,"./basetypes/Code":69,"./basetypes/DataElement":70,"./basetypes/DateTime":71,"./basetypes/Interval":72,"./basetypes/Quantity":73,"mongoose":402}],34:[function(require,module,exports){
 const mongoose = require('mongoose');
 const Code = require('./basetypes/Code');
 const Interval = require('./basetypes/Interval');
@@ -1270,6 +1291,7 @@ const Quantity = require('./basetypes/Quantity');
 const DateTime = require('./basetypes/DateTime');
 const { ComponentSchema } = require('./Component');
 const { FacilityLocationSchema } = require('./FacilityLocation');
+const { IdSchema } = require('./Id');
 const Any = require('./basetypes/Any');
 
 const [Number, String] = [
@@ -1294,7 +1316,7 @@ const MedicationActiveSchema = DataElementSchema({
 module.exports.MedicationActiveSchema = MedicationActiveSchema;
 module.exports.MedicationActive = mongoose.model('MedicationActive', MedicationActiveSchema);
 
-},{"./Component":10,"./FacilityLocation":22,"./basetypes/Any":68,"./basetypes/Code":69,"./basetypes/DataElement":70,"./basetypes/DateTime":71,"./basetypes/Interval":72,"./basetypes/Quantity":73,"mongoose":402}],37:[function(require,module,exports){
+},{"./Component":10,"./FacilityLocation":22,"./Id":24,"./basetypes/Any":68,"./basetypes/Code":69,"./basetypes/DataElement":70,"./basetypes/DateTime":71,"./basetypes/Interval":72,"./basetypes/Quantity":73,"mongoose":402}],37:[function(require,module,exports){
 const mongoose = require('mongoose');
 const { DataElementSchema } = require('./basetypes/DataElement');
 const Code = require('./basetypes/Code');
@@ -1303,6 +1325,7 @@ const Quantity = require('./basetypes/Quantity');
 const DateTime = require('./basetypes/DateTime');
 const { ComponentSchema } = require('./Component');
 const { FacilityLocationSchema } = require('./FacilityLocation');
+const { IdSchema } = require('./Id');
 const Any = require('./basetypes/Any');
 
 const [Number, String] = [
@@ -1330,7 +1353,7 @@ const MedicationAdministeredSchema = DataElementSchema({
 module.exports.MedicationAdministeredSchema = MedicationAdministeredSchema;
 module.exports.MedicationAdministered = mongoose.model('MedicationAdministered', MedicationAdministeredSchema);
 
-},{"./Component":10,"./FacilityLocation":22,"./basetypes/Any":68,"./basetypes/Code":69,"./basetypes/DataElement":70,"./basetypes/DateTime":71,"./basetypes/Interval":72,"./basetypes/Quantity":73,"mongoose":402}],38:[function(require,module,exports){
+},{"./Component":10,"./FacilityLocation":22,"./Id":24,"./basetypes/Any":68,"./basetypes/Code":69,"./basetypes/DataElement":70,"./basetypes/DateTime":71,"./basetypes/Interval":72,"./basetypes/Quantity":73,"mongoose":402}],38:[function(require,module,exports){
 const mongoose = require('mongoose');
 const { DataElementSchema } = require('./basetypes/DataElement');
 const Code = require('./basetypes/Code');
@@ -1339,6 +1362,7 @@ const Quantity = require('./basetypes/Quantity');
 const DateTime = require('./basetypes/DateTime');
 const { ComponentSchema } = require('./Component');
 const { FacilityLocationSchema } = require('./FacilityLocation');
+const { IdSchema } = require('./Id');
 const Any = require('./basetypes/Any');
 
 const [Number, String] = [
@@ -1365,7 +1389,7 @@ const MedicationDischargeSchema = DataElementSchema({
 module.exports.MedicationDischargeSchema = MedicationDischargeSchema;
 module.exports.MedicationDischarge = mongoose.model('MedicationDischarge', MedicationDischargeSchema);
 
-},{"./Component":10,"./FacilityLocation":22,"./basetypes/Any":68,"./basetypes/Code":69,"./basetypes/DataElement":70,"./basetypes/DateTime":71,"./basetypes/Interval":72,"./basetypes/Quantity":73,"mongoose":402}],39:[function(require,module,exports){
+},{"./Component":10,"./FacilityLocation":22,"./Id":24,"./basetypes/Any":68,"./basetypes/Code":69,"./basetypes/DataElement":70,"./basetypes/DateTime":71,"./basetypes/Interval":72,"./basetypes/Quantity":73,"mongoose":402}],39:[function(require,module,exports){
 const mongoose = require('mongoose');
 const { DataElementSchema } = require('./basetypes/DataElement');
 const Code = require('./basetypes/Code');
@@ -1374,6 +1398,7 @@ const Quantity = require('./basetypes/Quantity');
 const DateTime = require('./basetypes/DateTime');
 const { ComponentSchema } = require('./Component');
 const { FacilityLocationSchema } = require('./FacilityLocation');
+const { IdSchema } = require('./Id');
 const Any = require('./basetypes/Any');
 
 const [Number, String] = [
@@ -1401,7 +1426,7 @@ const MedicationDispensedSchema = DataElementSchema({
 module.exports.MedicationDispensedSchema = MedicationDispensedSchema;
 module.exports.MedicationDispensed = mongoose.model('MedicationDispensed', MedicationDispensedSchema);
 
-},{"./Component":10,"./FacilityLocation":22,"./basetypes/Any":68,"./basetypes/Code":69,"./basetypes/DataElement":70,"./basetypes/DateTime":71,"./basetypes/Interval":72,"./basetypes/Quantity":73,"mongoose":402}],40:[function(require,module,exports){
+},{"./Component":10,"./FacilityLocation":22,"./Id":24,"./basetypes/Any":68,"./basetypes/Code":69,"./basetypes/DataElement":70,"./basetypes/DateTime":71,"./basetypes/Interval":72,"./basetypes/Quantity":73,"mongoose":402}],40:[function(require,module,exports){
 const mongoose = require('mongoose');
 const { DataElementSchema } = require('./basetypes/DataElement');
 const Code = require('./basetypes/Code');
@@ -1410,6 +1435,7 @@ const Quantity = require('./basetypes/Quantity');
 const DateTime = require('./basetypes/DateTime');
 const { ComponentSchema } = require('./Component');
 const { FacilityLocationSchema } = require('./FacilityLocation');
+const { IdSchema } = require('./Id');
 const Any = require('./basetypes/Any');
 
 const [Number, String] = [
@@ -1440,7 +1466,7 @@ const MedicationOrderSchema = DataElementSchema({
 module.exports.MedicationOrderSchema = MedicationOrderSchema;
 module.exports.MedicationOrder = mongoose.model('MedicationOrder', MedicationOrderSchema);
 
-},{"./Component":10,"./FacilityLocation":22,"./basetypes/Any":68,"./basetypes/Code":69,"./basetypes/DataElement":70,"./basetypes/DateTime":71,"./basetypes/Interval":72,"./basetypes/Quantity":73,"mongoose":402}],41:[function(require,module,exports){
+},{"./Component":10,"./FacilityLocation":22,"./Id":24,"./basetypes/Any":68,"./basetypes/Code":69,"./basetypes/DataElement":70,"./basetypes/DateTime":71,"./basetypes/Interval":72,"./basetypes/Quantity":73,"mongoose":402}],41:[function(require,module,exports){
 const mongoose = require('mongoose');
 const { DataElementSchema } = require('./basetypes/DataElement');
 const Code = require('./basetypes/Code');
@@ -1449,6 +1475,7 @@ const Quantity = require('./basetypes/Quantity');
 const DateTime = require('./basetypes/DateTime');
 const { ComponentSchema } = require('./Component');
 const { FacilityLocationSchema } = require('./FacilityLocation');
+const { IdSchema } = require('./Id');
 const Any = require('./basetypes/Any');
 
 const [Number, String] = [
@@ -1468,7 +1495,7 @@ const ParticipationSchema = DataElementSchema({
 module.exports.ParticipationSchema = ParticipationSchema;
 module.exports.Participation = mongoose.model('Participation', ParticipationSchema);
 
-},{"./Component":10,"./FacilityLocation":22,"./basetypes/Any":68,"./basetypes/Code":69,"./basetypes/DataElement":70,"./basetypes/DateTime":71,"./basetypes/Interval":72,"./basetypes/Quantity":73,"mongoose":402}],42:[function(require,module,exports){
+},{"./Component":10,"./FacilityLocation":22,"./Id":24,"./basetypes/Any":68,"./basetypes/Code":69,"./basetypes/DataElement":70,"./basetypes/DateTime":71,"./basetypes/Interval":72,"./basetypes/Quantity":73,"mongoose":402}],42:[function(require,module,exports){
 const mongoose = require('mongoose');
 const Code = require('./basetypes/Code');
 const Interval = require('./basetypes/Interval');
@@ -1561,15 +1588,11 @@ PatientSchema.methods.getByProfile = function getByProfile(profile, isNegated =
   // If isNegated == null, return all matching data elements by type, regardless of negationRationale.
   const results = this.dataElements.filter(element => element._type === `QDM::${profile}` && (isNegated === null || !!element.negationRationale === isNegated));
   return results.map((result) => {
-    const getCodeFunction = Object.getPrototypeOf(result).getCode;
-    const codeFunction = Object.getPrototypeOf(result).code;
-    const idField = result.id;
     const removedMongooseItems = AllDataElements[profile](result).toObject();
-    // toObject() will remove all mongoose functions but also removed the getCode and code functions
-    // the execution engine requires the code and getCode functions so we have to add them back
-    removedMongooseItems.getCode = getCodeFunction;
-    removedMongooseItems.code = codeFunction;
-    removedMongooseItems.id = idField;
+    // toObject() will remove all mongoose functions but also remove the schema methods, so we add them back
+    Object.entries(Object.getPrototypeOf(result).schema.methods).forEach(([method_name, method]) => {
+      removedMongooseItems[method_name] = method;
+    });
     return removedMongooseItems;
   });
 };
@@ -1745,6 +1768,7 @@ const Quantity = require('./basetypes/Quantity');
 const DateTime = require('./basetypes/DateTime');
 const { ComponentSchema } = require('./Component');
 const { FacilityLocationSchema } = require('./FacilityLocation');
+const { IdSchema } = require('./Id');
 const Any = require('./basetypes/Any');
 
 const [Number, String] = [
@@ -1764,7 +1788,7 @@ const PatientCareExperienceSchema = DataElementSchema({
 module.exports.PatientCareExperienceSchema = PatientCareExperienceSchema;
 module.exports.PatientCareExperience = mongoose.model('PatientCareExperience', PatientCareExperienceSchema);
 
-},{"./Component":10,"./FacilityLocation":22,"./basetypes/Any":68,"./basetypes/Code":69,"./basetypes/DataElement":70,"./basetypes/DateTime":71,"./basetypes/Interval":72,"./basetypes/Quantity":73,"mongoose":402}],44:[function(require,module,exports){
+},{"./Component":10,"./FacilityLocation":22,"./Id":24,"./basetypes/Any":68,"./basetypes/Code":69,"./basetypes/DataElement":70,"./basetypes/DateTime":71,"./basetypes/Interval":72,"./basetypes/Quantity":73,"mongoose":402}],44:[function(require,module,exports){
 const mongoose = require('mongoose');
 const { DataElementSchema } = require('./basetypes/DataElement');
 const Code = require('./basetypes/Code');
@@ -1773,6 +1797,7 @@ const Quantity = require('./basetypes/Quantity');
 const DateTime = require('./basetypes/DateTime');
 const { ComponentSchema } = require('./Component');
 const { FacilityLocationSchema } = require('./FacilityLocation');
+const { IdSchema } = require('./Id');
 const Any = require('./basetypes/Any');
 
 const [Number, String] = [
@@ -1792,7 +1817,7 @@ const PatientCharacteristicSchema = DataElementSchema({
 module.exports.PatientCharacteristicSchema = PatientCharacteristicSchema;
 module.exports.PatientCharacteristic = mongoose.model('PatientCharacteristic', PatientCharacteristicSchema);
 
-},{"./Component":10,"./FacilityLocation":22,"./basetypes/Any":68,"./basetypes/Code":69,"./basetypes/DataElement":70,"./basetypes/DateTime":71,"./basetypes/Interval":72,"./basetypes/Quantity":73,"mongoose":402}],45:[function(require,module,exports){
+},{"./Component":10,"./FacilityLocation":22,"./Id":24,"./basetypes/Any":68,"./basetypes/Code":69,"./basetypes/DataElement":70,"./basetypes/DateTime":71,"./basetypes/Interval":72,"./basetypes/Quantity":73,"mongoose":402}],45:[function(require,module,exports){
 const mongoose = require('mongoose');
 const { DataElementSchema } = require('./basetypes/DataElement');
 const Code = require('./basetypes/Code');
@@ -1801,6 +1826,7 @@ const Quantity = require('./basetypes/Quantity');
 const DateTime = require('./basetypes/DateTime');
 const { ComponentSchema } = require('./Component');
 const { FacilityLocationSchema } = require('./FacilityLocation');
+const { IdSchema } = require('./Id');
 const Any = require('./basetypes/Any');
 
 const [Number, String] = [
@@ -1821,7 +1847,7 @@ const PatientCharacteristicBirthdateSchema = DataElementSchema({
 module.exports.PatientCharacteristicBirthdateSchema = PatientCharacteristicBirthdateSchema;
 module.exports.PatientCharacteristicBirthdate = mongoose.model('PatientCharacteristicBirthdate', PatientCharacteristicBirthdateSchema);
 
-},{"./Component":10,"./FacilityLocation":22,"./basetypes/Any":68,"./basetypes/Code":69,"./basetypes/DataElement":70,"./basetypes/DateTime":71,"./basetypes/Interval":72,"./basetypes/Quantity":73,"mongoose":402}],46:[function(require,module,exports){
+},{"./Component":10,"./FacilityLocation":22,"./Id":24,"./basetypes/Any":68,"./basetypes/Code":69,"./basetypes/DataElement":70,"./basetypes/DateTime":71,"./basetypes/Interval":72,"./basetypes/Quantity":73,"mongoose":402}],46:[function(require,module,exports){
 const mongoose = require('mongoose');
 const { DataElementSchema } = require('./basetypes/DataElement');
 const Code = require('./basetypes/Code');
@@ -1830,6 +1856,7 @@ const Quantity = require('./basetypes/Quantity');
 const DateTime = require('./basetypes/DateTime');
 const { ComponentSchema } = require('./Component');
 const { FacilityLocationSchema } = require('./FacilityLocation');
+const { IdSchema } = require('./Id');
 const Any = require('./basetypes/Any');
 
 const [Number, String] = [
@@ -1852,7 +1879,7 @@ const PatientCharacteristicClinicalTrialParticipantSchema = DataElementSchema({
 module.exports.PatientCharacteristicClinicalTrialParticipantSchema = PatientCharacteristicClinicalTrialParticipantSchema;
 module.exports.PatientCharacteristicClinicalTrialParticipant = mongoose.model('PatientCharacteristicClinicalTrialParticipant', PatientCharacteristicClinicalTrialParticipantSchema);
 
-},{"./Component":10,"./FacilityLocation":22,"./basetypes/Any":68,"./basetypes/Code":69,"./basetypes/DataElement":70,"./basetypes/DateTime":71,"./basetypes/Interval":72,"./basetypes/Quantity":73,"mongoose":402}],47:[function(require,module,exports){
+},{"./Component":10,"./FacilityLocation":22,"./Id":24,"./basetypes/Any":68,"./basetypes/Code":69,"./basetypes/DataElement":70,"./basetypes/DateTime":71,"./basetypes/Interval":72,"./basetypes/Quantity":73,"mongoose":402}],47:[function(require,module,exports){
 const mongoose = require('mongoose');
 const { DataElementSchema } = require('./basetypes/DataElement');
 const Code = require('./basetypes/Code');
@@ -1861,6 +1888,7 @@ const Quantity = require('./basetypes/Quantity');
 const DateTime = require('./basetypes/DateTime');
 const { ComponentSchema } = require('./Component');
 const { FacilityLocationSchema } = require('./FacilityLocation');
+const { IdSchema } = require('./Id');
 const Any = require('./basetypes/Any');
 
 const [Number, String] = [
@@ -1880,7 +1908,7 @@ const PatientCharacteristicEthnicitySchema = DataElementSchema({
 module.exports.PatientCharacteristicEthnicitySchema = PatientCharacteristicEthnicitySchema;
 module.exports.PatientCharacteristicEthnicity = mongoose.model('PatientCharacteristicEthnicity', PatientCharacteristicEthnicitySchema);
 
-},{"./Component":10,"./FacilityLocation":22,"./basetypes/Any":68,"./basetypes/Code":69,"./basetypes/DataElement":70,"./basetypes/DateTime":71,"./basetypes/Interval":72,"./basetypes/Quantity":73,"mongoose":402}],48:[function(require,module,exports){
+},{"./Component":10,"./FacilityLocation":22,"./Id":24,"./basetypes/Any":68,"./basetypes/Code":69,"./basetypes/DataElement":70,"./basetypes/DateTime":71,"./basetypes/Interval":72,"./basetypes/Quantity":73,"mongoose":402}],48:[function(require,module,exports){
 const mongoose = require('mongoose');
 const { DataElementSchema } = require('./basetypes/DataElement');
 const Code = require('./basetypes/Code');
@@ -1889,6 +1917,7 @@ const Quantity = require('./basetypes/Quantity');
 const DateTime = require('./basetypes/DateTime');
 const { ComponentSchema } = require('./Component');
 const { FacilityLocationSchema } = require('./FacilityLocation');
+const { IdSchema } = require('./Id');
 const Any = require('./basetypes/Any');
 
 const [Number, String] = [
@@ -1910,7 +1939,7 @@ const PatientCharacteristicExpiredSchema = DataElementSchema({
 module.exports.PatientCharacteristicExpiredSchema = PatientCharacteristicExpiredSchema;
 module.exports.PatientCharacteristicExpired = mongoose.model('PatientCharacteristicExpired', PatientCharacteristicExpiredSchema);
 
-},{"./Component":10,"./FacilityLocation":22,"./basetypes/Any":68,"./basetypes/Code":69,"./basetypes/DataElement":70,"./basetypes/DateTime":71,"./basetypes/Interval":72,"./basetypes/Quantity":73,"mongoose":402}],49:[function(require,module,exports){
+},{"./Component":10,"./FacilityLocation":22,"./Id":24,"./basetypes/Any":68,"./basetypes/Code":69,"./basetypes/DataElement":70,"./basetypes/DateTime":71,"./basetypes/Interval":72,"./basetypes/Quantity":73,"mongoose":402}],49:[function(require,module,exports){
 const mongoose = require('mongoose');
 const { DataElementSchema } = require('./basetypes/DataElement');
 const Code = require('./basetypes/Code');
@@ -1919,6 +1948,7 @@ const Quantity = require('./basetypes/Quantity');
 const DateTime = require('./basetypes/DateTime');
 const { ComponentSchema } = require('./Component');
 const { FacilityLocationSchema } = require('./FacilityLocation');
+const { IdSchema } = require('./Id');
 const Any = require('./basetypes/Any');
 
 const [Number, String] = [
@@ -1939,7 +1969,7 @@ const PatientCharacteristicPayerSchema = DataElementSchema({
 module.exports.PatientCharacteristicPayerSchema = PatientCharacteristicPayerSchema;
 module.exports.PatientCharacteristicPayer = mongoose.model('PatientCharacteristicPayer', PatientCharacteristicPayerSchema);
 
-},{"./Component":10,"./FacilityLocation":22,"./basetypes/Any":68,"./basetypes/Code":69,"./basetypes/DataElement":70,"./basetypes/DateTime":71,"./basetypes/Interval":72,"./basetypes/Quantity":73,"mongoose":402}],50:[function(require,module,exports){
+},{"./Component":10,"./FacilityLocation":22,"./Id":24,"./basetypes/Any":68,"./basetypes/Code":69,"./basetypes/DataElement":70,"./basetypes/DateTime":71,"./basetypes/Interval":72,"./basetypes/Quantity":73,"mongoose":402}],50:[function(require,module,exports){
 const mongoose = require('mongoose');
 const { DataElementSchema } = require('./basetypes/DataElement');
 const Code = require('./basetypes/Code');
@@ -1948,6 +1978,7 @@ const Quantity = require('./basetypes/Quantity');
 const DateTime = require('./basetypes/DateTime');
 const { ComponentSchema } = require('./Component');
 const { FacilityLocationSchema } = require('./FacilityLocation');
+const { IdSchema } = require('./Id');
 const Any = require('./basetypes/Any');
 
 const [Number, String] = [
@@ -1967,7 +1998,7 @@ const PatientCharacteristicRaceSchema = DataElementSchema({
 module.exports.PatientCharacteristicRaceSchema = PatientCharacteristicRaceSchema;
 module.exports.PatientCharacteristicRace = mongoose.model('PatientCharacteristicRace', PatientCharacteristicRaceSchema);
 
-},{"./Component":10,"./FacilityLocation":22,"./basetypes/Any":68,"./basetypes/Code":69,"./basetypes/DataElement":70,"./basetypes/DateTime":71,"./basetypes/Interval":72,"./basetypes/Quantity":73,"mongoose":402}],51:[function(require,module,exports){
+},{"./Component":10,"./FacilityLocation":22,"./Id":24,"./basetypes/Any":68,"./basetypes/Code":69,"./basetypes/DataElement":70,"./basetypes/DateTime":71,"./basetypes/Interval":72,"./basetypes/Quantity":73,"mongoose":402}],51:[function(require,module,exports){
 const mongoose = require('mongoose');
 const { DataElementSchema } = require('./basetypes/DataElement');
 const Code = require('./basetypes/Code');
@@ -1976,6 +2007,7 @@ const Quantity = require('./basetypes/Quantity');
 const DateTime = require('./basetypes/DateTime');
 const { ComponentSchema } = require('./Component');
 const { FacilityLocationSchema } = require('./FacilityLocation');
+const { IdSchema } = require('./Id');
 const Any = require('./basetypes/Any');
 
 const [Number, String] = [
@@ -1995,7 +2027,7 @@ const PatientCharacteristicSexSchema = DataElementSchema({
 module.exports.PatientCharacteristicSexSchema = PatientCharacteristicSexSchema;
 module.exports.PatientCharacteristicSex = mongoose.model('PatientCharacteristicSex', PatientCharacteristicSexSchema);
 
-},{"./Component":10,"./FacilityLocation":22,"./basetypes/Any":68,"./basetypes/Code":69,"./basetypes/DataElement":70,"./basetypes/DateTime":71,"./basetypes/Interval":72,"./basetypes/Quantity":73,"mongoose":402}],52:[function(require,module,exports){
+},{"./Component":10,"./FacilityLocation":22,"./Id":24,"./basetypes/Any":68,"./basetypes/Code":69,"./basetypes/DataElement":70,"./basetypes/DateTime":71,"./basetypes/Interval":72,"./basetypes/Quantity":73,"mongoose":402}],52:[function(require,module,exports){
 const mongoose = require('mongoose');
 const { DataElementSchema } = require('./basetypes/DataElement');
 const Code = require('./basetypes/Code');
@@ -2004,6 +2036,7 @@ const Quantity = require('./basetypes/Quantity');
 const DateTime = require('./basetypes/DateTime');
 const { ComponentSchema } = require('./Component');
 const { FacilityLocationSchema } = require('./FacilityLocation');
+const { IdSchema } = require('./Id');
 const Any = require('./basetypes/Any');
 
 const [Number, String] = [
@@ -2028,7 +2061,7 @@ const PhysicalExamOrderSchema = DataElementSchema({
 module.exports.PhysicalExamOrderSchema = PhysicalExamOrderSchema;
 module.exports.PhysicalExamOrder = mongoose.model('PhysicalExamOrder', PhysicalExamOrderSchema);
 
-},{"./Component":10,"./FacilityLocation":22,"./basetypes/Any":68,"./basetypes/Code":69,"./basetypes/DataElement":70,"./basetypes/DateTime":71,"./basetypes/Interval":72,"./basetypes/Quantity":73,"mongoose":402}],53:[function(require,module,exports){
+},{"./Component":10,"./FacilityLocation":22,"./Id":24,"./basetypes/Any":68,"./basetypes/Code":69,"./basetypes/DataElement":70,"./basetypes/DateTime":71,"./basetypes/Interval":72,"./basetypes/Quantity":73,"mongoose":402}],53:[function(require,module,exports){
 const mongoose = require('mongoose');
 const { DataElementSchema } = require('./basetypes/DataElement');
 const Code = require('./basetypes/Code');
@@ -2037,6 +2070,7 @@ const Quantity = require('./basetypes/Quantity');
 const DateTime = require('./basetypes/DateTime');
 const { ComponentSchema } = require('./Component');
 const { FacilityLocationSchema } = require('./FacilityLocation');
+const { IdSchema } = require('./Id');
 const Any = require('./basetypes/Any');
 
 const [Number, String] = [
@@ -2064,7 +2098,7 @@ const PhysicalExamPerformedSchema = DataElementSchema({
 module.exports.PhysicalExamPerformedSchema = PhysicalExamPerformedSchema;
 module.exports.PhysicalExamPerformed = mongoose.model('PhysicalExamPerformed', PhysicalExamPerformedSchema);
 
-},{"./Component":10,"./FacilityLocation":22,"./basetypes/Any":68,"./basetypes/Code":69,"./basetypes/DataElement":70,"./basetypes/DateTime":71,"./basetypes/Interval":72,"./basetypes/Quantity":73,"mongoose":402}],54:[function(require,module,exports){
+},{"./Component":10,"./FacilityLocation":22,"./Id":24,"./basetypes/Any":68,"./basetypes/Code":69,"./basetypes/DataElement":70,"./basetypes/DateTime":71,"./basetypes/Interval":72,"./basetypes/Quantity":73,"mongoose":402}],54:[function(require,module,exports){
 const mongoose = require('mongoose');
 const { DataElementSchema } = require('./basetypes/DataElement');
 const Code = require('./basetypes/Code');
@@ -2073,6 +2107,7 @@ const Quantity = require('./basetypes/Quantity');
 const DateTime = require('./basetypes/DateTime');
 const { ComponentSchema } = require('./Component');
 const { FacilityLocationSchema } = require('./FacilityLocation');
+const { IdSchema } = require('./Id');
 const Any = require('./basetypes/Any');
 
 const [Number, String] = [
@@ -2097,7 +2132,7 @@ const PhysicalExamRecommendedSchema = DataElementSchema({
 module.exports.PhysicalExamRecommendedSchema = PhysicalExamRecommendedSchema;
 module.exports.PhysicalExamRecommended = mongoose.model('PhysicalExamRecommended', PhysicalExamRecommendedSchema);
 
-},{"./Component":10,"./FacilityLocation":22,"./basetypes/Any":68,"./basetypes/Code":69,"./basetypes/DataElement":70,"./basetypes/DateTime":71,"./basetypes/Interval":72,"./basetypes/Quantity":73,"mongoose":402}],55:[function(require,module,exports){
+},{"./Component":10,"./FacilityLocation":22,"./Id":24,"./basetypes/Any":68,"./basetypes/Code":69,"./basetypes/DataElement":70,"./basetypes/DateTime":71,"./basetypes/Interval":72,"./basetypes/Quantity":73,"mongoose":402}],55:[function(require,module,exports){
 const mongoose = require('mongoose');
 const { DataElementSchema } = require('./basetypes/DataElement');
 const Code = require('./basetypes/Code');
@@ -2106,6 +2141,7 @@ const Quantity = require('./basetypes/Quantity');
 const DateTime = require('./basetypes/DateTime');
 const { ComponentSchema } = require('./Component');
 const { FacilityLocationSchema } = require('./FacilityLocation');
+const { IdSchema } = require('./Id');
 const Any = require('./basetypes/Any');
 
 const [Number, String] = [
@@ -2132,7 +2168,7 @@ const ProcedureOrderSchema = DataElementSchema({
 module.exports.ProcedureOrderSchema = ProcedureOrderSchema;
 module.exports.ProcedureOrder = mongoose.model('ProcedureOrder', ProcedureOrderSchema);
 
-},{"./Component":10,"./FacilityLocation":22,"./basetypes/Any":68,"./basetypes/Code":69,"./basetypes/DataElement":70,"./basetypes/DateTime":71,"./basetypes/Interval":72,"./basetypes/Quantity":73,"mongoose":402}],56:[function(require,module,exports){
+},{"./Component":10,"./FacilityLocation":22,"./Id":24,"./basetypes/Any":68,"./basetypes/Code":69,"./basetypes/DataElement":70,"./basetypes/DateTime":71,"./basetypes/Interval":72,"./basetypes/Quantity":73,"mongoose":402}],56:[function(require,module,exports){
 const mongoose = require('mongoose');
 const { DataElementSchema } = require('./basetypes/DataElement');
 const Code = require('./basetypes/Code');
@@ -2141,6 +2177,7 @@ const Quantity = require('./basetypes/Quantity');
 const DateTime = require('./basetypes/DateTime');
 const { ComponentSchema } = require('./Component');
 const { FacilityLocationSchema } = require('./FacilityLocation');
+const { IdSchema } = require('./Id');
 const Any = require('./basetypes/Any');
 
 const [Number, String] = [
@@ -2172,7 +2209,7 @@ const ProcedurePerformedSchema = DataElementSchema({
 module.exports.ProcedurePerformedSchema = ProcedurePerformedSchema;
 module.exports.ProcedurePerformed = mongoose.model('ProcedurePerformed', ProcedurePerformedSchema);
 
-},{"./Component":10,"./FacilityLocation":22,"./basetypes/Any":68,"./basetypes/Code":69,"./basetypes/DataElement":70,"./basetypes/DateTime":71,"./basetypes/Interval":72,"./basetypes/Quantity":73,"mongoose":402}],57:[function(require,module,exports){
+},{"./Component":10,"./FacilityLocation":22,"./Id":24,"./basetypes/Any":68,"./basetypes/Code":69,"./basetypes/DataElement":70,"./basetypes/DateTime":71,"./basetypes/Interval":72,"./basetypes/Quantity":73,"mongoose":402}],57:[function(require,module,exports){
 const mongoose = require('mongoose');
 const { DataElementSchema } = require('./basetypes/DataElement');
 const Code = require('./basetypes/Code');
@@ -2181,6 +2218,7 @@ const Quantity = require('./basetypes/Quantity');
 const DateTime = require('./basetypes/DateTime');
 const { ComponentSchema } = require('./Component');
 const { FacilityLocationSchema } = require('./FacilityLocation');
+const { IdSchema } = require('./Id');
 const Any = require('./basetypes/Any');
 
 const [Number, String] = [
@@ -2207,7 +2245,7 @@ const ProcedureRecommendedSchema = DataElementSchema({
 module.exports.ProcedureRecommendedSchema = ProcedureRecommendedSchema;
 module.exports.ProcedureRecommended = mongoose.model('ProcedureRecommended', ProcedureRecommendedSchema);
 
-},{"./Component":10,"./FacilityLocation":22,"./basetypes/Any":68,"./basetypes/Code":69,"./basetypes/DataElement":70,"./basetypes/DateTime":71,"./basetypes/Interval":72,"./basetypes/Quantity":73,"mongoose":402}],58:[function(require,module,exports){
+},{"./Component":10,"./FacilityLocation":22,"./Id":24,"./basetypes/Any":68,"./basetypes/Code":69,"./basetypes/DataElement":70,"./basetypes/DateTime":71,"./basetypes/Interval":72,"./basetypes/Quantity":73,"mongoose":402}],58:[function(require,module,exports){
 const mongoose = require('mongoose');
 const { DataElementSchema } = require('./basetypes/DataElement');
 const Code = require('./basetypes/Code');
@@ -2216,6 +2254,7 @@ const Quantity = require('./basetypes/Quantity');
 const DateTime = require('./basetypes/DateTime');
 const { ComponentSchema } = require('./Component');
 const { FacilityLocationSchema } = require('./FacilityLocation');
+const { IdSchema } = require('./Id');
 const Any = require('./basetypes/Any');
 
 const [Number, String] = [
@@ -2235,7 +2274,7 @@ const ProviderCareExperienceSchema = DataElementSchema({
 module.exports.ProviderCareExperienceSchema = ProviderCareExperienceSchema;
 module.exports.ProviderCareExperience = mongoose.model('ProviderCareExperience', ProviderCareExperienceSchema);
 
-},{"./Component":10,"./FacilityLocation":22,"./basetypes/Any":68,"./basetypes/Code":69,"./basetypes/DataElement":70,"./basetypes/DateTime":71,"./basetypes/Interval":72,"./basetypes/Quantity":73,"mongoose":402}],59:[function(require,module,exports){
+},{"./Component":10,"./FacilityLocation":22,"./Id":24,"./basetypes/Any":68,"./basetypes/Code":69,"./basetypes/DataElement":70,"./basetypes/DateTime":71,"./basetypes/Interval":72,"./basetypes/Quantity":73,"mongoose":402}],59:[function(require,module,exports){
 const mongoose = require('mongoose');
 const { DataElementSchema } = require('./basetypes/DataElement');
 const Code = require('./basetypes/Code');
@@ -2244,6 +2283,7 @@ const Quantity = require('./basetypes/Quantity');
 const DateTime = require('./basetypes/DateTime');
 const { ComponentSchema } = require('./Component');
 const { FacilityLocationSchema } = require('./FacilityLocation');
+const { IdSchema } = require('./Id');
 const Any = require('./basetypes/Any');
 
 const [Number, String] = [
@@ -2263,7 +2303,7 @@ const ProviderCharacteristicSchema = DataElementSchema({
 module.exports.ProviderCharacteristicSchema = ProviderCharacteristicSchema;
 module.exports.ProviderCharacteristic = mongoose.model('ProviderCharacteristic', ProviderCharacteristicSchema);
 
-},{"./Component":10,"./FacilityLocation":22,"./basetypes/Any":68,"./basetypes/Code":69,"./basetypes/DataElement":70,"./basetypes/DateTime":71,"./basetypes/Interval":72,"./basetypes/Quantity":73,"mongoose":402}],60:[function(require,module,exports){
+},{"./Component":10,"./FacilityLocation":22,"./Id":24,"./basetypes/Any":68,"./basetypes/Code":69,"./basetypes/DataElement":70,"./basetypes/DateTime":71,"./basetypes/Interval":72,"./basetypes/Quantity":73,"mongoose":402}],60:[function(require,module,exports){
 const mongoose = require('mongoose');
 const { DataElementSchema } = require('./basetypes/DataElement');
 const Code = require('./basetypes/Code');
@@ -2272,6 +2312,7 @@ const Quantity = require('./basetypes/Quantity');
 const DateTime = require('./basetypes/DateTime');
 const { ComponentSchema } = require('./Component');
 const { FacilityLocationSchema } = require('./FacilityLocation');
+const { IdSchema } = require('./Id');
 const Any = require('./basetypes/Any');
 
 const [Number, String] = [
@@ -2290,7 +2331,7 @@ const RatioSchema = DataElementSchema({
 module.exports.RatioSchema = RatioSchema;
 module.exports.Ratio = mongoose.model('Ratio', RatioSchema);
 
-},{"./Component":10,"./FacilityLocation":22,"./basetypes/Any":68,"./basetypes/Code":69,"./basetypes/DataElement":70,"./basetypes/DateTime":71,"./basetypes/Interval":72,"./basetypes/Quantity":73,"mongoose":402}],61:[function(require,module,exports){
+},{"./Component":10,"./FacilityLocation":22,"./Id":24,"./basetypes/Any":68,"./basetypes/Code":69,"./basetypes/DataElement":70,"./basetypes/DateTime":71,"./basetypes/Interval":72,"./basetypes/Quantity":73,"mongoose":402}],61:[function(require,module,exports){
 const mongoose = require('mongoose');
 
 const PlaceholderResultSchema = mongoose.Schema({
@@ -2329,6 +2370,7 @@ const Quantity = require('./basetypes/Quantity');
 const DateTime = require('./basetypes/DateTime');
 
 const { FacilityLocationSchema } = require('./FacilityLocation');
+const { IdSchema } = require('./Id');
 const Any = require('./basetypes/Any');
 
 const [Number, String] = [
@@ -2346,7 +2388,7 @@ const ResultComponentSchema = DataElementSchema({
 module.exports.ResultComponentSchema = ResultComponentSchema;
 module.exports.ResultComponent = mongoose.model('ResultComponent', ResultComponentSchema);
 
-},{"./FacilityLocation":22,"./basetypes/Any":68,"./basetypes/Code":69,"./basetypes/DataElement":70,"./basetypes/DateTime":71,"./basetypes/Interval":72,"./basetypes/Quantity":73,"mongoose":402}],63:[function(require,module,exports){
+},{"./FacilityLocation":22,"./Id":24,"./basetypes/Any":68,"./basetypes/Code":69,"./basetypes/DataElement":70,"./basetypes/DateTime":71,"./basetypes/Interval":72,"./basetypes/Quantity":73,"mongoose":402}],63:[function(require,module,exports){
 const mongoose = require('mongoose');
 const { DataElementSchema } = require('./basetypes/DataElement');
 const Code = require('./basetypes/Code');
@@ -2355,6 +2397,7 @@ const Quantity = require('./basetypes/Quantity');
 const DateTime = require('./basetypes/DateTime');
 const { ComponentSchema } = require('./Component');
 const { FacilityLocationSchema } = require('./FacilityLocation');
+const { IdSchema } = require('./Id');
 const Any = require('./basetypes/Any');
 
 const [Number, String] = [
@@ -2381,7 +2424,7 @@ const SubstanceAdministeredSchema = DataElementSchema({
 module.exports.SubstanceAdministeredSchema = SubstanceAdministeredSchema;
 module.exports.SubstanceAdministered = mongoose.model('SubstanceAdministered', SubstanceAdministeredSchema);
 
-},{"./Component":10,"./FacilityLocation":22,"./basetypes/Any":68,"./basetypes/Code":69,"./basetypes/DataElement":70,"./basetypes/DateTime":71,"./basetypes/Interval":72,"./basetypes/Quantity":73,"mongoose":402}],64:[function(require,module,exports){
+},{"./Component":10,"./FacilityLocation":22,"./Id":24,"./basetypes/Any":68,"./basetypes/Code":69,"./basetypes/DataElement":70,"./basetypes/DateTime":71,"./basetypes/Interval":72,"./basetypes/Quantity":73,"mongoose":402}],64:[function(require,module,exports){
 const mongoose = require('mongoose');
 const { DataElementSchema } = require('./basetypes/DataElement');
 const Code = require('./basetypes/Code');
@@ -2390,6 +2433,7 @@ const Quantity = require('./basetypes/Quantity');
 const DateTime = require('./basetypes/DateTime');
 const { ComponentSchema } = require('./Component');
 const { FacilityLocationSchema } = require('./FacilityLocation');
+const { IdSchema } = require('./Id');
 const Any = require('./basetypes/Any');
 
 const [Number, String] = [
@@ -2418,7 +2462,7 @@ const SubstanceOrderSchema = DataElementSchema({
 module.exports.SubstanceOrderSchema = SubstanceOrderSchema;
 module.exports.SubstanceOrder = mongoose.model('SubstanceOrder', SubstanceOrderSchema);
 
-},{"./Component":10,"./FacilityLocation":22,"./basetypes/Any":68,"./basetypes/Code":69,"./basetypes/DataElement":70,"./basetypes/DateTime":71,"./basetypes/Interval":72,"./basetypes/Quantity":73,"mongoose":402}],65:[function(require,module,exports){
+},{"./Component":10,"./FacilityLocation":22,"./Id":24,"./basetypes/Any":68,"./basetypes/Code":69,"./basetypes/DataElement":70,"./basetypes/DateTime":71,"./basetypes/Interval":72,"./basetypes/Quantity":73,"mongoose":402}],65:[function(require,module,exports){
 const mongoose = require('mongoose');
 const { DataElementSchema } = require('./basetypes/DataElement');
 const Code = require('./basetypes/Code');
@@ -2427,6 +2471,7 @@ const Quantity = require('./basetypes/Quantity');
 const DateTime = require('./basetypes/DateTime');
 const { ComponentSchema } = require('./Component');
 const { FacilityLocationSchema } = require('./FacilityLocation');
+const { IdSchema } = require('./Id');
 const Any = require('./basetypes/Any');
 
 const [Number, String] = [
@@ -2455,7 +2500,7 @@ const SubstanceRecommendedSchema = DataElementSchema({
 module.exports.SubstanceRecommendedSchema = SubstanceRecommendedSchema;
 module.exports.SubstanceRecommended = mongoose.model('SubstanceRecommended', SubstanceRecommendedSchema);
 
-},{"./Component":10,"./FacilityLocation":22,"./basetypes/Any":68,"./basetypes/Code":69,"./basetypes/DataElement":70,"./basetypes/DateTime":71,"./basetypes/Interval":72,"./basetypes/Quantity":73,"mongoose":402}],66:[function(require,module,exports){
+},{"./Component":10,"./FacilityLocation":22,"./Id":24,"./basetypes/Any":68,"./basetypes/Code":69,"./basetypes/DataElement":70,"./basetypes/DateTime":71,"./basetypes/Interval":72,"./basetypes/Quantity":73,"mongoose":402}],66:[function(require,module,exports){
 const mongoose = require('mongoose');
 const { DataElementSchema } = require('./basetypes/DataElement');
 const Code = require('./basetypes/Code');
@@ -2464,6 +2509,7 @@ const Quantity = require('./basetypes/Quantity');
 const DateTime = require('./basetypes/DateTime');
 const { ComponentSchema } = require('./Component');
 const { FacilityLocationSchema } = require('./FacilityLocation');
+const { IdSchema } = require('./Id');
 const Any = require('./basetypes/Any');
 
 const [Number, String] = [
@@ -2485,7 +2531,7 @@ const SymptomSchema = DataElementSchema({
 module.exports.SymptomSchema = SymptomSchema;
 module.exports.Symptom = mongoose.model('Symptom', SymptomSchema);
 
-},{"./Component":10,"./FacilityLocation":22,"./basetypes/Any":68,"./basetypes/Code":69,"./basetypes/DataElement":70,"./basetypes/DateTime":71,"./basetypes/Interval":72,"./basetypes/Quantity":73,"mongoose":402}],67:[function(require,module,exports){
+},{"./Component":10,"./FacilityLocation":22,"./Id":24,"./basetypes/Any":68,"./basetypes/Code":69,"./basetypes/DataElement":70,"./basetypes/DateTime":71,"./basetypes/Interval":72,"./basetypes/Quantity":73,"mongoose":402}],67:[function(require,module,exports){
 const mongoose = require('mongoose');
 const Concept = require('./Concept.js');
 
@@ -2573,7 +2619,7 @@ function RecursiveCast(any) {
     });
     return casted;
   }
-  if (Number.isInteger(any)) {
+  if (Number.isFinite(any)) {
     return any;
   }
   if (Date.parse(any)) {
@@ -2628,6 +2674,7 @@ module.exports = Code;
 const mongoose = require('mongoose');
 const Code = require('./Code.js');
 const cql = require('cql-execution');
+const Id = require('../Id');
 
 const [Schema] = [mongoose.Schema];
 
@@ -2635,6 +2682,12 @@ function DataElementSchema(add, options) {
   const extended = new Schema({
     dataElementCodes: { type: [] },
     description: { type: String },
+    id: {
+      type: Id.IdSchema,
+      default() {
+        return new Id.Id({ value: (this._id ? this._id.toString() : mongoose.Types.ObjectId().toString()), namingSystem: null });
+      },
+    },
   }, options);
 
   if (add) {
@@ -2662,7 +2715,7 @@ function DataElementSchema(add, options) {
 
 module.exports.DataElementSchema = DataElementSchema;
 
-},{"./Code.js":69,"cql-execution":151,"mongoose":402}],71:[function(require,module,exports){
+},{"../Id":24,"./Code.js":69,"cql-execution":151,"mongoose":402}],71:[function(require,module,exports){
 const mongoose = require('mongoose');
 const cql = require('cql-execution');