cqm-models 0.8.0 → 0.8.1

data/dist/index.js

@@ -5,6 +5,8 @@ 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] = [
@@ -16,7 +18,7 @@ const AdverseEventSchema = DataElementSchema({
   authorDatetime: DateTime,
   relevantPeriod: Interval,
   severity: Code,
-  facilityLocation: Code,
+  facilityLocation: FacilityLocationSchema,
   type: Code,
   hqmfOid: { type: String, default: '2.16.840.1.113883.10.20.28.3.120' },
   category: { type: String, default: 'adverse_event' },
@@ -28,7 +30,7 @@ const AdverseEventSchema = DataElementSchema({
 module.exports.AdverseEventSchema = AdverseEventSchema;
 module.exports.AdverseEvent = mongoose.model('AdverseEvent', AdverseEventSchema);
 
-},{"./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,"./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;
@@ -157,6 +159,8 @@ 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] = [
@@ -180,7 +184,7 @@ const AllergyIntoleranceSchema = DataElementSchema({
 module.exports.AllergyIntoleranceSchema = AllergyIntoleranceSchema;
 module.exports.AllergyIntolerance = mongoose.model('AllergyIntolerance', AllergyIntoleranceSchema);
 
-},{"./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,"./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');
@@ -188,6 +192,7 @@ 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] = [
@@ -214,13 +219,15 @@ const AssessmentPerformedSchema = DataElementSchema({
 module.exports.AssessmentPerformedSchema = AssessmentPerformedSchema;
 module.exports.AssessmentPerformed = mongoose.model('AssessmentPerformed', AssessmentPerformedSchema);
 
-},{"./Component":10,"./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,"./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');
 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] = [
@@ -244,13 +251,15 @@ const AssessmentRecommendedSchema = DataElementSchema({
 module.exports.AssessmentRecommendedSchema = AssessmentRecommendedSchema;
 module.exports.AssessmentRecommended = mongoose.model('AssessmentRecommended', AssessmentRecommendedSchema);
 
-},{"./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,"./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');
 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] = [
@@ -272,13 +281,15 @@ const CareGoalSchema = DataElementSchema({
 module.exports.CareGoalSchema = CareGoalSchema;
 module.exports.CareGoal = mongoose.model('CareGoal', CareGoalSchema);
 
-},{"./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,"./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');
 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] = [
@@ -301,13 +312,15 @@ const CommunicationFromPatientToProviderSchema = DataElementSchema({
 module.exports.CommunicationFromPatientToProviderSchema = CommunicationFromPatientToProviderSchema;
 module.exports.CommunicationFromPatientToProvider = mongoose.model('CommunicationFromPatientToProvider', CommunicationFromPatientToProviderSchema);
 
-},{"./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,"./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');
 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] = [
@@ -330,13 +343,15 @@ const CommunicationFromProviderToPatientSchema = DataElementSchema({
 module.exports.CommunicationFromProviderToPatientSchema = CommunicationFromProviderToPatientSchema;
 module.exports.CommunicationFromProviderToPatient = mongoose.model('CommunicationFromProviderToPatient', CommunicationFromProviderToPatientSchema);
 
-},{"./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,"./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');
 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] = [
@@ -359,13 +374,15 @@ const CommunicationFromProviderToProviderSchema = DataElementSchema({
 module.exports.CommunicationFromProviderToProviderSchema = CommunicationFromProviderToProviderSchema;
 module.exports.CommunicationFromProviderToProvider = mongoose.model('CommunicationFromProviderToProvider', CommunicationFromProviderToProviderSchema);
 
-},{"./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,"./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');
 const Interval = require('./basetypes/Interval');
 const Quantity = require('./basetypes/Quantity');
 const DateTime = require('./basetypes/DateTime');
+
+const { FacilityLocationSchema } = require('./FacilityLocation');
 const Any = require('./basetypes/Any');
 
 const [Number, String] = [
@@ -373,7 +390,7 @@ const [Number, String] = [
   mongoose.Schema.Types.String,
 ];
 
-const ComponentSchema = DataElementSchema({
+const ComponentSchema = new mongoose.Schema({
   code: Code,
   result: Any,
   qdmVersion: { type: String, default: '5.3' },
@@ -384,7 +401,7 @@ const ComponentSchema = DataElementSchema({
 module.exports.ComponentSchema = ComponentSchema;
 module.exports.Component = mongoose.model('Component', ComponentSchema);
 
-},{"./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,"./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;
@@ -407,6 +424,8 @@ 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] = [
@@ -432,13 +451,15 @@ const DeviceAppliedSchema = DataElementSchema({
 module.exports.DeviceAppliedSchema = DeviceAppliedSchema;
 module.exports.DeviceApplied = mongoose.model('DeviceApplied', DeviceAppliedSchema);
 
-},{"./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,"./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');
 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] = [
@@ -461,13 +482,15 @@ const DeviceOrderSchema = DataElementSchema({
 module.exports.DeviceOrderSchema = DeviceOrderSchema;
 module.exports.DeviceOrder = mongoose.model('DeviceOrder', DeviceOrderSchema);
 
-},{"./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,"./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');
 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] = [
@@ -490,13 +513,15 @@ const DeviceRecommendedSchema = DataElementSchema({
 module.exports.DeviceRecommendedSchema = DeviceRecommendedSchema;
 module.exports.DeviceRecommended = mongoose.model('DeviceRecommended', DeviceRecommendedSchema);
 
-},{"./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,"./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');
 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] = [
@@ -520,13 +545,15 @@ const DiagnosisSchema = DataElementSchema({
 module.exports.DiagnosisSchema = DiagnosisSchema;
 module.exports.Diagnosis = mongoose.model('Diagnosis', DiagnosisSchema);
 
-},{"./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,"./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');
 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] = [
@@ -550,7 +577,7 @@ const DiagnosticStudyOrderSchema = DataElementSchema({
 module.exports.DiagnosticStudyOrderSchema = DiagnosticStudyOrderSchema;
 module.exports.DiagnosticStudyOrder = mongoose.model('DiagnosticStudyOrder', DiagnosticStudyOrderSchema);
 
-},{"./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,"./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');
@@ -558,6 +585,7 @@ 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] = [
@@ -573,7 +601,7 @@ const DiagnosticStudyPerformedSchema = DataElementSchema({
   resultDatetime: DateTime,
   status: Code,
   method: Code,
-  facilityLocation: Code,
+  facilityLocation: FacilityLocationSchema,
   negationRationale: Code,
   components: [ComponentSchema],
   hqmfOid: { type: String, default: '2.16.840.1.113883.10.20.28.3.23' },
@@ -587,13 +615,15 @@ const DiagnosticStudyPerformedSchema = DataElementSchema({
 module.exports.DiagnosticStudyPerformedSchema = DiagnosticStudyPerformedSchema;
 module.exports.DiagnosticStudyPerformed = mongoose.model('DiagnosticStudyPerformed', DiagnosticStudyPerformedSchema);
 
-},{"./Component":10,"./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,"./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');
 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] = [
@@ -617,13 +647,15 @@ const DiagnosticStudyRecommendedSchema = DataElementSchema({
 module.exports.DiagnosticStudyRecommendedSchema = DiagnosticStudyRecommendedSchema;
 module.exports.DiagnosticStudyRecommended = mongoose.model('DiagnosticStudyRecommended', DiagnosticStudyRecommendedSchema);
 
-},{"./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,"./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');
 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] = [
@@ -634,7 +666,7 @@ const [Number, String] = [
 const EncounterOrderSchema = DataElementSchema({
   authorDatetime: DateTime,
   reason: Code,
-  facilityLocation: Code,
+  facilityLocation: FacilityLocationSchema,
   negationRationale: Code,
   hqmfOid: { type: String, default: '2.16.840.1.113883.10.20.28.3.27' },
   category: { type: String, default: 'encounter' },
@@ -647,13 +679,14 @@ const EncounterOrderSchema = DataElementSchema({
 module.exports.EncounterOrderSchema = EncounterOrderSchema;
 module.exports.EncounterOrder = mongoose.model('EncounterOrder', EncounterOrderSchema);
 
-},{"./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,"./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');
 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');
 
@@ -683,13 +716,15 @@ const EncounterPerformedSchema = DataElementSchema({
 module.exports.EncounterPerformedSchema = EncounterPerformedSchema;
 module.exports.EncounterPerformed = mongoose.model('EncounterPerformed', EncounterPerformedSchema);
 
-},{"./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,"./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');
 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] = [
@@ -700,7 +735,7 @@ const [Number, String] = [
 const EncounterRecommendedSchema = DataElementSchema({
   authorDatetime: DateTime,
   reason: Code,
-  facilityLocation: Code,
+  facilityLocation: FacilityLocationSchema,
   negationRationale: Code,
   hqmfOid: { type: String, default: '2.16.840.1.113883.10.20.28.3.28' },
   category: { type: String, default: 'encounter' },
@@ -713,13 +748,15 @@ const EncounterRecommendedSchema = DataElementSchema({
 module.exports.EncounterRecommendedSchema = EncounterRecommendedSchema;
 module.exports.EncounterRecommended = mongoose.model('EncounterRecommended', EncounterRecommendedSchema);
 
-},{"./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,"./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');
 const Interval = require('./basetypes/Interval');
 const Quantity = require('./basetypes/Quantity');
 const DateTime = require('./basetypes/DateTime');
+const { ComponentSchema } = require('./Component');
+
 const Any = require('./basetypes/Any');
 
 const [Number, String] = [
@@ -727,7 +764,7 @@ const [Number, String] = [
   mongoose.Schema.Types.String,
 ];
 
-const FacilityLocationSchema = DataElementSchema({
+const FacilityLocationSchema = new mongoose.Schema({
   code: Code,
   locationPeriod: Interval,
   qdmVersion: { type: String, default: '5.3' },
@@ -738,13 +775,15 @@ const FacilityLocationSchema = DataElementSchema({
 module.exports.FacilityLocationSchema = FacilityLocationSchema;
 module.exports.FacilityLocation = mongoose.model('FacilityLocation', FacilityLocationSchema);
 
-},{"./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,"./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');
 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] = [
@@ -766,13 +805,15 @@ const FamilyHistorySchema = DataElementSchema({
 module.exports.FamilyHistorySchema = FamilyHistorySchema;
 module.exports.FamilyHistory = mongoose.model('FamilyHistory', FamilyHistorySchema);
 
-},{"./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,"./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] = [
@@ -791,13 +832,15 @@ const IdSchema = DataElementSchema({
 module.exports.IdSchema = IdSchema;
 module.exports.Id = mongoose.model('Id', IdSchema);
 
-},{"./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){
+},{"./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){
 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] = [
@@ -824,13 +867,15 @@ const ImmunizationAdministeredSchema = DataElementSchema({
 module.exports.ImmunizationAdministeredSchema = ImmunizationAdministeredSchema;
 module.exports.ImmunizationAdministered = mongoose.model('ImmunizationAdministered', ImmunizationAdministeredSchema);
 
-},{"./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,"./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');
 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] = [
@@ -857,7 +902,7 @@ const ImmunizationOrderSchema = DataElementSchema({
 module.exports.ImmunizationOrderSchema = ImmunizationOrderSchema;
 module.exports.ImmunizationOrder = mongoose.model('ImmunizationOrder', ImmunizationOrderSchema);
 
-},{"./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,"./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] = [
@@ -889,7 +934,10 @@ const IndividualResultSchema = mongoose.Schema(
     // This field is for application specific information only. If both Bonnie and
     // Cypress use a common field, it should be made a field on this model,
     // and not put into extendedData.
-    extendedData: {},
+    extendedData: {
+      type: Mixed,
+      default: {},
+    },
 
     // Calculation State attributes
     state: {
@@ -920,6 +968,8 @@ 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] = [
@@ -942,13 +992,15 @@ const InterventionOrderSchema = DataElementSchema({
 module.exports.InterventionOrderSchema = InterventionOrderSchema;
 module.exports.InterventionOrder = mongoose.model('InterventionOrder', InterventionOrderSchema);
 
-},{"./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,"./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');
 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] = [
@@ -974,13 +1026,15 @@ const InterventionPerformedSchema = DataElementSchema({
 module.exports.InterventionPerformedSchema = InterventionPerformedSchema;
 module.exports.InterventionPerformed = mongoose.model('InterventionPerformed', InterventionPerformedSchema);
 
-},{"./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,"./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');
 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] = [
@@ -1003,13 +1057,15 @@ const InterventionRecommendedSchema = DataElementSchema({
 module.exports.InterventionRecommendedSchema = InterventionRecommendedSchema;
 module.exports.InterventionRecommended = mongoose.model('InterventionRecommended', InterventionRecommendedSchema);
 
-},{"./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,"./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');
 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] = [
@@ -1033,7 +1089,7 @@ const LaboratoryTestOrderSchema = DataElementSchema({
 module.exports.LaboratoryTestOrderSchema = LaboratoryTestOrderSchema;
 module.exports.LaboratoryTestOrder = mongoose.model('LaboratoryTestOrder', LaboratoryTestOrderSchema);
 
-},{"./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,"./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');
@@ -1041,6 +1097,7 @@ 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] = [
@@ -1070,13 +1127,15 @@ const LaboratoryTestPerformedSchema = DataElementSchema({
 module.exports.LaboratoryTestPerformedSchema = LaboratoryTestPerformedSchema;
 module.exports.LaboratoryTestPerformed = mongoose.model('LaboratoryTestPerformed', LaboratoryTestPerformedSchema);
 
-},{"./Component":10,"./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,"./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');
 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] = [
@@ -1100,7 +1159,7 @@ const LaboratoryTestRecommendedSchema = DataElementSchema({
 module.exports.LaboratoryTestRecommendedSchema = LaboratoryTestRecommendedSchema;
 module.exports.LaboratoryTestRecommended = mongoose.model('LaboratoryTestRecommended', LaboratoryTestRecommendedSchema);
 
-},{"./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,"./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');
@@ -1209,6 +1268,8 @@ 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] = [
@@ -1233,13 +1294,15 @@ const MedicationActiveSchema = DataElementSchema({
 module.exports.MedicationActiveSchema = MedicationActiveSchema;
 module.exports.MedicationActive = mongoose.model('MedicationActive', MedicationActiveSchema);
 
-},{"./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,"./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');
 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] = [
@@ -1267,13 +1330,15 @@ const MedicationAdministeredSchema = DataElementSchema({
 module.exports.MedicationAdministeredSchema = MedicationAdministeredSchema;
 module.exports.MedicationAdministered = mongoose.model('MedicationAdministered', MedicationAdministeredSchema);
 
-},{"./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,"./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');
 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] = [
@@ -1300,13 +1365,15 @@ const MedicationDischargeSchema = DataElementSchema({
 module.exports.MedicationDischargeSchema = MedicationDischargeSchema;
 module.exports.MedicationDischarge = mongoose.model('MedicationDischarge', MedicationDischargeSchema);
 
-},{"./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,"./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');
 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] = [
@@ -1334,13 +1401,15 @@ const MedicationDispensedSchema = DataElementSchema({
 module.exports.MedicationDispensedSchema = MedicationDispensedSchema;
 module.exports.MedicationDispensed = mongoose.model('MedicationDispensed', MedicationDispensedSchema);
 
-},{"./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,"./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');
 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] = [
@@ -1371,13 +1440,15 @@ const MedicationOrderSchema = DataElementSchema({
 module.exports.MedicationOrderSchema = MedicationOrderSchema;
 module.exports.MedicationOrder = mongoose.model('MedicationOrder', MedicationOrderSchema);
 
-},{"./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,"./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');
 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] = [
@@ -1397,7 +1468,7 @@ const ParticipationSchema = DataElementSchema({
 module.exports.ParticipationSchema = ParticipationSchema;
 module.exports.Participation = mongoose.model('Participation', ParticipationSchema);
 
-},{"./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,"./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');
@@ -1405,10 +1476,11 @@ const Quantity = require('./basetypes/Quantity');
 const DateTime = require('./basetypes/DateTime');
 const AllDataElements = require('./AllDataElements');
 
-const [Schema, Number, String] = [
+const [Schema, Number, String, Mixed] = [
   mongoose.Schema,
   mongoose.Schema.Types.Number,
   mongoose.Schema.Types.String,
+  mongoose.Schema.Types.Mixed,
 ];
 
 const PatientSchema = new Schema({
@@ -1425,7 +1497,10 @@ const PatientSchema = new Schema({
   // This field is for application specific information only. If both Bonnie
   // Cypress use a common field, it should be made a field on this model,
   // and not put into extendedData.
-  extendedData: {},
+  extendedData: {
+    type: Mixed,
+    default: {},
+  },
 }, { id: false });
 
 // After initialization of a Patient model, initialize every individual data element
@@ -1478,19 +1553,27 @@ PatientSchema.methods.getDataElements = function getDataElements(params) {
 // Returns an array of dataElements that exist on the patient, queried by
 // QDM profile
 PatientSchema.methods.getByProfile = function getByProfile(profile, isNegated = null) {
-  if (isNegated === true) {
-    return this.dataElements.filter(element => element._type === `QDM::${profile}` && (typeof element.negationRationale !== 'undefined' && element.negationRationale != null));
-  } else if (isNegated === false) {
-    return this.dataElements.filter(element => element._type === `QDM::${profile}` && (typeof element.negationRationale === 'undefined' || element.negationRationale == null));
-  }
-  return this.dataElements.filter(element => element._type === `QDM::${profile}`);
+  // If isNegated == true, only return data elements with a negationRationale that is not null.
+  // If isNegated == false, only return data elements with a null negationRationale.
+  // 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 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;
+    return removedMongooseItems;
+  });
 };
 
 // This method is called by the CQL execution engine on a CQLPatient when
 // the execution engine wants information on a record. A record could be patient
 // characteristic information about the patient, or it could be data criteria
 // that currently exist on this patient (data criteria you drag on a patient
-// in Bonnie's patient builder).
+// in Bonnie patient builder).
 // @param {String} profile - the data criteria requested by the execution engine
 // @returns {Object}
 PatientSchema.methods.findRecords = function findRecords(profile) {
@@ -1507,7 +1590,7 @@ PatientSchema.methods.findRecords = function findRecords(profile) {
     // Requested something else (probably a QDM data type).
 
     // Strip model details from request. The requested profile string contains
-    // a lot of things we don't need or care about. Example, we might see
+    // a lot of things we do not need or care about. Example, we might see
     // something like:
     // "{urn:healthit-gov:qdm:v5_0_draft}PatientCharacteristicEthnicity"
     // Where we only care about: "PatientCharacteristicEthnicity".
@@ -1655,6 +1738,8 @@ 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] = [
@@ -1674,13 +1759,15 @@ const PatientCareExperienceSchema = DataElementSchema({
 module.exports.PatientCareExperienceSchema = PatientCareExperienceSchema;
 module.exports.PatientCareExperience = mongoose.model('PatientCareExperience', PatientCareExperienceSchema);
 
-},{"./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,"./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');
 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] = [
@@ -1700,13 +1787,15 @@ const PatientCharacteristicSchema = DataElementSchema({
 module.exports.PatientCharacteristicSchema = PatientCharacteristicSchema;
 module.exports.PatientCharacteristic = mongoose.model('PatientCharacteristic', PatientCharacteristicSchema);
 
-},{"./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,"./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');
 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] = [
@@ -1727,13 +1816,15 @@ const PatientCharacteristicBirthdateSchema = DataElementSchema({
 module.exports.PatientCharacteristicBirthdateSchema = PatientCharacteristicBirthdateSchema;
 module.exports.PatientCharacteristicBirthdate = mongoose.model('PatientCharacteristicBirthdate', PatientCharacteristicBirthdateSchema);
 
-},{"./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,"./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');
 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] = [
@@ -1756,13 +1847,15 @@ const PatientCharacteristicClinicalTrialParticipantSchema = DataElementSchema({
 module.exports.PatientCharacteristicClinicalTrialParticipantSchema = PatientCharacteristicClinicalTrialParticipantSchema;
 module.exports.PatientCharacteristicClinicalTrialParticipant = mongoose.model('PatientCharacteristicClinicalTrialParticipant', PatientCharacteristicClinicalTrialParticipantSchema);
 
-},{"./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,"./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');
 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] = [
@@ -1782,13 +1875,15 @@ const PatientCharacteristicEthnicitySchema = DataElementSchema({
 module.exports.PatientCharacteristicEthnicitySchema = PatientCharacteristicEthnicitySchema;
 module.exports.PatientCharacteristicEthnicity = mongoose.model('PatientCharacteristicEthnicity', PatientCharacteristicEthnicitySchema);
 
-},{"./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,"./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');
 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] = [
@@ -1810,13 +1905,15 @@ const PatientCharacteristicExpiredSchema = DataElementSchema({
 module.exports.PatientCharacteristicExpiredSchema = PatientCharacteristicExpiredSchema;
 module.exports.PatientCharacteristicExpired = mongoose.model('PatientCharacteristicExpired', PatientCharacteristicExpiredSchema);
 
-},{"./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,"./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');
 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] = [
@@ -1837,13 +1934,15 @@ const PatientCharacteristicPayerSchema = DataElementSchema({
 module.exports.PatientCharacteristicPayerSchema = PatientCharacteristicPayerSchema;
 module.exports.PatientCharacteristicPayer = mongoose.model('PatientCharacteristicPayer', PatientCharacteristicPayerSchema);
 
-},{"./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,"./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');
 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] = [
@@ -1863,13 +1962,15 @@ const PatientCharacteristicRaceSchema = DataElementSchema({
 module.exports.PatientCharacteristicRaceSchema = PatientCharacteristicRaceSchema;
 module.exports.PatientCharacteristicRace = mongoose.model('PatientCharacteristicRace', PatientCharacteristicRaceSchema);
 
-},{"./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,"./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');
 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] = [
@@ -1889,13 +1990,15 @@ const PatientCharacteristicSexSchema = DataElementSchema({
 module.exports.PatientCharacteristicSexSchema = PatientCharacteristicSexSchema;
 module.exports.PatientCharacteristicSex = mongoose.model('PatientCharacteristicSex', PatientCharacteristicSexSchema);
 
-},{"./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,"./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');
 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] = [
@@ -1920,7 +2023,7 @@ const PhysicalExamOrderSchema = DataElementSchema({
 module.exports.PhysicalExamOrderSchema = PhysicalExamOrderSchema;
 module.exports.PhysicalExamOrder = mongoose.model('PhysicalExamOrder', PhysicalExamOrderSchema);
 
-},{"./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,"./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');
@@ -1928,6 +2031,7 @@ 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] = [
@@ -1955,13 +2059,15 @@ const PhysicalExamPerformedSchema = DataElementSchema({
 module.exports.PhysicalExamPerformedSchema = PhysicalExamPerformedSchema;
 module.exports.PhysicalExamPerformed = mongoose.model('PhysicalExamPerformed', PhysicalExamPerformedSchema);
 
-},{"./Component":10,"./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,"./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');
 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] = [
@@ -1986,13 +2092,15 @@ const PhysicalExamRecommendedSchema = DataElementSchema({
 module.exports.PhysicalExamRecommendedSchema = PhysicalExamRecommendedSchema;
 module.exports.PhysicalExamRecommended = mongoose.model('PhysicalExamRecommended', PhysicalExamRecommendedSchema);
 
-},{"./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,"./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');
 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] = [
@@ -2019,16 +2127,16 @@ const ProcedureOrderSchema = DataElementSchema({
 module.exports.ProcedureOrderSchema = ProcedureOrderSchema;
 module.exports.ProcedureOrder = mongoose.model('ProcedureOrder', ProcedureOrderSchema);
 
-},{"./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,"./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');
 const Interval = require('./basetypes/Interval');
 const Quantity = require('./basetypes/Quantity');
 const DateTime = require('./basetypes/DateTime');
-const Any = require('./basetypes/Any');
-
 const { ComponentSchema } = require('./Component');
+const { FacilityLocationSchema } = require('./FacilityLocation');
+const Any = require('./basetypes/Any');
 
 const [Number, String] = [
   mongoose.Schema.Types.Number,
@@ -2059,13 +2167,15 @@ const ProcedurePerformedSchema = DataElementSchema({
 module.exports.ProcedurePerformedSchema = ProcedurePerformedSchema;
 module.exports.ProcedurePerformed = mongoose.model('ProcedurePerformed', ProcedurePerformedSchema);
 
-},{"./Component":10,"./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,"./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');
 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] = [
@@ -2092,13 +2202,15 @@ const ProcedureRecommendedSchema = DataElementSchema({
 module.exports.ProcedureRecommendedSchema = ProcedureRecommendedSchema;
 module.exports.ProcedureRecommended = mongoose.model('ProcedureRecommended', ProcedureRecommendedSchema);
 
-},{"./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,"./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');
 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] = [
@@ -2118,13 +2230,15 @@ const ProviderCareExperienceSchema = DataElementSchema({
 module.exports.ProviderCareExperienceSchema = ProviderCareExperienceSchema;
 module.exports.ProviderCareExperience = mongoose.model('ProviderCareExperience', ProviderCareExperienceSchema);
 
-},{"./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,"./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');
 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] = [
@@ -2144,13 +2258,15 @@ const ProviderCharacteristicSchema = DataElementSchema({
 module.exports.ProviderCharacteristicSchema = ProviderCharacteristicSchema;
 module.exports.ProviderCharacteristic = mongoose.model('ProviderCharacteristic', ProviderCharacteristicSchema);
 
-},{"./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,"./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');
 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] = [
@@ -2169,7 +2285,7 @@ const RatioSchema = DataElementSchema({
 module.exports.RatioSchema = RatioSchema;
 module.exports.Ratio = mongoose.model('Ratio', RatioSchema);
 
-},{"./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,"./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({
@@ -2206,6 +2322,8 @@ const Code = require('./basetypes/Code');
 const Interval = require('./basetypes/Interval');
 const Quantity = require('./basetypes/Quantity');
 const DateTime = require('./basetypes/DateTime');
+
+const { FacilityLocationSchema } = require('./FacilityLocation');
 const Any = require('./basetypes/Any');
 
 const [Number, String] = [
@@ -2223,13 +2341,15 @@ const ResultComponentSchema = DataElementSchema({
 module.exports.ResultComponentSchema = ResultComponentSchema;
 module.exports.ResultComponent = mongoose.model('ResultComponent', ResultComponentSchema);
 
-},{"./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,"./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');
 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] = [
@@ -2256,13 +2376,15 @@ const SubstanceAdministeredSchema = DataElementSchema({
 module.exports.SubstanceAdministeredSchema = SubstanceAdministeredSchema;
 module.exports.SubstanceAdministered = mongoose.model('SubstanceAdministered', SubstanceAdministeredSchema);
 
-},{"./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,"./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');
 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] = [
@@ -2291,13 +2413,15 @@ const SubstanceOrderSchema = DataElementSchema({
 module.exports.SubstanceOrderSchema = SubstanceOrderSchema;
 module.exports.SubstanceOrder = mongoose.model('SubstanceOrder', SubstanceOrderSchema);
 
-},{"./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,"./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');
 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] = [
@@ -2326,13 +2450,15 @@ const SubstanceRecommendedSchema = DataElementSchema({
 module.exports.SubstanceRecommendedSchema = SubstanceRecommendedSchema;
 module.exports.SubstanceRecommended = mongoose.model('SubstanceRecommended', SubstanceRecommendedSchema);
 
-},{"./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,"./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');
 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] = [
@@ -2354,7 +2480,7 @@ const SymptomSchema = DataElementSchema({
 module.exports.SymptomSchema = SymptomSchema;
 module.exports.Symptom = mongoose.model('Symptom', SymptomSchema);
 
-},{"./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,"./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');
 
@@ -2399,6 +2525,21 @@ function RecursiveCast(any) {
   if (any && any.value && any.unit) {
     return new cql.Quantity(any);
   }
+  if (any && any.code && any.codeSystem) {
+    if (typeof any.code === 'undefined') {
+      throw new Error(`Code: ${any} does not have a code`);
+    } else if (typeof any.codeSystem === 'undefined') {
+      throw new Error(`Code: ${any} does not have a codeSystem`);
+    }
+
+    const val = { code: any.code, codeSystem: any.codeSystem };
+
+    val.descriptor = (typeof any.descriptor !== 'undefined') ? any.descriptor : null;
+    val.codeSystemOid = (typeof any.codeSystemOid !== 'undefined') ? any.codeSystemOid : null;
+    val.version = (typeof any.version !== 'undefined') ? any.version : null;
+
+    return new cql.Code(val.code, val.codeSystem, val.version, val.descriptor);
+  }
   if (any && any.low) {
     const casted = new cql.Interval(any.low, any.high, any.lowClosed, any.highClosed);
 
@@ -2443,6 +2584,7 @@ module.exports = Any;
 
 },{"cql-execution":151,"mongoose":402}],69:[function(require,module,exports){
 const mongoose = require('mongoose');
+const cql = require('cql-execution');
 
 function Code(key, options) {
   mongoose.SchemaType.call(this, key, options, 'Code');
@@ -2450,33 +2592,43 @@ function Code(key, options) {
 Code.prototype = Object.create(mongoose.SchemaType.prototype);
 
 Code.prototype.cast = (code) => {
-  if (typeof code.code === 'undefined') {
-    throw new Error(`Code: ${code} does not have a code`);
-  } else if (typeof code.codeSystem === 'undefined') {
-    throw new Error(`Code: ${code} does not have a codeSystem`);
-  }
+  if (code != null) {
+    // handles codes that have not yet been cast to a code and those that have already been cast to a code
+    if (code.code && (code.codeSystem || code.system)) {
+      if (typeof code.code === 'undefined') {
+        throw new Error(`Code: ${code} does not have a code`);
+      } else if (typeof code.codeSystem === 'undefined' && typeof code.system === 'undefined') {
+        throw new Error(`Code: ${code} does not have a system`);
+      }
 
-  const val = { code: code.code, codeSystem: code.codeSystem };
+      const val = { code: code.code, codeSystem: code.codeSystem || code.system };
 
-  val.descriptor = (typeof code.descriptor !== 'undefined') ? code.descriptor : null;
-  val.codeSystemOid = (typeof code.codeSystemOid !== 'undefined') ? code.codeSystemOid : null;
-  val.version = (typeof code.version !== 'undefined') ? code.version : null;
+      val.descriptor = (typeof code.descriptor !== 'undefined') ? code.descriptor : null;
+      val.codeSystemOid = (typeof code.codeSystemOid !== 'undefined') ? code.codeSystemOid : null;
+      val.version = (typeof code.version !== 'undefined') ? code.version : null;
 
-  return val;
+      return new cql.Code(val.code, val.codeSystem, val.version, val.descriptor);
+    }
+    throw new Error(`Expected a code. Received ${code}.`);
+  } else {
+    // returns a null or undefined if what is passed in is null or undefined
+    return code;
+  }
 };
 
 mongoose.Schema.Types.Code = Code;
 module.exports = Code;
 
-},{"mongoose":402}],70:[function(require,module,exports){
+},{"cql-execution":151,"mongoose":402}],70:[function(require,module,exports){
 const mongoose = require('mongoose');
 const Code = require('./Code.js');
+const cql = require('cql-execution');
 
 const [Schema] = [mongoose.Schema];
 
 function DataElementSchema(add, options) {
   const extended = new Schema({
-    dataElementCodes: { type: [Code] },
+    dataElementCodes: { type: [] },
     description: { type: String },
   }, options);
 
@@ -2484,21 +2636,20 @@ function DataElementSchema(add, options) {
     extended.add(add);
   }
 
-  // Returns all of the codes on this data element
-  // in a format usable by the cql-execution framework
+  // Returns all of the codes on this data element in a format usable by
+  // the cql-execution framework.
   extended.methods.getCode = function getCode() {
-    return this.dataElementCodes.map((code) => {
-      const result = {};
-      result.code = code.code;
-      result.system = code.code_system;
-      return result;
-    });
+    return this.dataElementCodes.map(code => new cql.Code(code.code, code.codeSystem, code.version, code.descriptor));
   };
 
-  // Returns all of the codes on this data element
-  // in their normal form.
-  extended.methods.codes = function getCodes() {
-    return this.dataElementCodes;
+  // Return the first code on this data element in a format usable by
+  // the cql-execution framework.
+  extended.methods.code = function code() {
+    if (this.dataElementCodes && this.dataElementCodes[0]) {
+      const qdmCode = this.dataElementCodes[0];
+      return new cql.Code(qdmCode.code, qdmCode.codeSystem, qdmCode.version, qdmCode.descriptor);
+    }
+    return null;
   };
 
   return extended;
@@ -2506,7 +2657,7 @@ function DataElementSchema(add, options) {
 
 module.exports.DataElementSchema = DataElementSchema;
 
-},{"./Code.js":69,"mongoose":402}],71:[function(require,module,exports){
+},{"./Code.js":69,"cql-execution":151,"mongoose":402}],71:[function(require,module,exports){
 const mongoose = require('mongoose');
 const cql = require('cql-execution');
 
@@ -25836,7 +25987,7 @@ function objectToString(o) {
 },{"./clinical":152,"./datetime":154,"./interval":156,"./logic":157,"./uncertainty":158}],154:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
-  var DateTime, Uncertainty, moment;
+  var DateTime, Uncertainty, cqlFormatStringToMomentFormatString, getTimezoneSeparatorFromString, isValidDateTimeStringFormat, moment, normalizeMillisecondsField, normalizeMillisecondsFieldInString;
 
   Uncertainty = require('./uncertainty').Uncertainty;
 
@@ -25857,36 +26008,51 @@ function objectToString(o) {
     DateTime.FIELDS = [DateTime.Unit.YEAR, DateTime.Unit.MONTH, DateTime.Unit.DAY, DateTime.Unit.HOUR, DateTime.Unit.MINUTE, DateTime.Unit.SECOND, DateTime.Unit.MILLISECOND];
 
     DateTime.parse = function(string) {
-      var arg, args, match, num, regex;
-      match = regex = /(\d{4})(-(\d{2}))?(-(\d{2}))?(T((\d{2})(\:(\d{2})(\:(\d{2})(\.(\d+))?)?)?)?(Z|(([+-])(\d{2})(\:?(\d{2}))?))?)?/.exec(string);
-      if ((match != null ? match[0] : void 0) === string) {
-        args = [match[1], match[3], match[5], match[8], match[10], match[12], match[14]];
-        if (args[6] != null) {
-          args[6] = (args[6] + "00").substring(0, 3);
-        }
-        args = (function() {
-          var i, len, results;
-          results = [];
-          for (i = 0, len = args.length; i < len; i++) {
-            arg = args[i];
-            results.push(arg != null ? parseInt(arg, 10) : void 0);
-          }
-          return results;
-        })();
-        if (match[18] != null) {
-          num = parseInt(match[18], 10) + (match[20] != null ? parseInt(match[20], 10) / 60 : 0);
-          args.push(match[17] === '+' ? num : num * -1);
-        } else if (match[15] === 'Z') {
-          args.push(0);
-        }
-        return (function(func, args, ctor) {
-          ctor.prototype = func.prototype;
-          var child = new ctor, result = func.apply(child, args);
-          return Object(result) === result ? result : child;
-        })(DateTime, args, function(){});
-      } else {
+      var arg, args, days, hours, matches, milliseconds, minutes, months, num, seconds, years;
+      if (string === null) {
         return null;
       }
+      matches = /(\d{4})(-(\d{2}))?(-(\d{2}))?(T((\d{2})(\:(\d{2})(\:(\d{2})(\.(\d+))?)?)?)?(Z|(([+-])(\d{2})(\:?(\d{2}))?))?)?/.exec(string);
+      if (matches == null) {
+        throw new Error('Invalid DateTime String: ' + string);
+      }
+      years = matches[1];
+      months = matches[3];
+      days = matches[5];
+      hours = matches[8];
+      minutes = matches[10];
+      seconds = matches[12];
+      milliseconds = matches[14];
+      if (milliseconds != null) {
+        milliseconds = normalizeMillisecondsField(milliseconds);
+      }
+      if (milliseconds != null) {
+        string = normalizeMillisecondsFieldInString(string, matches);
+      }
+      if (!isValidDateTimeStringFormat(string)) {
+        throw new Error('Invalid DateTime String: ' + string);
+      }
+      args = [years, months, days, hours, minutes, seconds, milliseconds];
+      args = (function() {
+        var i, len, results;
+        results = [];
+        for (i = 0, len = args.length; i < len; i++) {
+          arg = args[i];
+          results.push(arg != null ? parseInt(arg, 10) : void 0);
+        }
+        return results;
+      })();
+      if (matches[18] != null) {
+        num = parseInt(matches[18], 10) + (matches[20] != null ? parseInt(matches[20], 10) / 60 : 0);
+        args.push(matches[17] === '+' ? num : num * -1);
+      } else if (matches[15] === 'Z') {
+        args.push(0);
+      }
+      return (function(func, args, ctor) {
+        ctor.prototype = func.prototype;
+        var child = new ctor, result = func.apply(child, args);
+        return Object(result) === result ? result : child;
+      })(DateTime, args, function(){});
     };
 
     DateTime.fromDate = function(date, timezoneOffset) {
@@ -26399,6 +26565,72 @@ function objectToString(o) {
 
   })();
 
+  normalizeMillisecondsFieldInString = function(string, matches) {
+    var beforeMs, msAndAfter, msString, ref, timezoneField, timezoneSeparator;
+    msString = matches[14];
+    msString = normalizeMillisecondsField(msString);
+    ref = string.split('.'), beforeMs = ref[0], msAndAfter = ref[1];
+    timezoneSeparator = getTimezoneSeparatorFromString(msAndAfter);
+    if (!!timezoneSeparator) {
+      timezoneField = msAndAfter != null ? msAndAfter.split(timezoneSeparator)[1] : void 0;
+    }
+    if (timezoneField == null) {
+      timezoneField = '';
+    }
+    return string = beforeMs + '.' + msString + timezoneSeparator + timezoneField;
+  };
+
+  normalizeMillisecondsField = function(msString) {
+    return msString = (msString + "00").substring(0, 3);
+  };
+
+  isValidDateTimeStringFormat = function(string) {
+    var cqlFormatStringWithLength, cqlFormats, format, i, len, strict;
+    if (typeof string !== 'string') {
+      return false;
+    }
+    cqlFormats = ['YYYY', 'YYYY-MM', 'YYYY-MM-DD', 'YYYY-MM-DDTZ', 'YYYY-MM-DDT+hh', 'YYYY-MM-DDT+hh:mm', 'YYYY-MM-DDT-hh', 'YYYY-MM-DDT-hh:mm', 'YYYY-MM-DDThh', 'YYYY-MM-DDThhZ', 'YYYY-MM-DDThh+hh', 'YYYY-MM-DDThh+hh:mm', 'YYYY-MM-DDThh-hh', 'YYYY-MM-DDThh-hh:mm', 'YYYY-MM-DDThh:mm', 'YYYY-MM-DDThh:mmZ', 'YYYY-MM-DDThh:mm+hh', 'YYYY-MM-DDThh:mm+hh:mm', 'YYYY-MM-DDThh:mm-hh', 'YYYY-MM-DDThh:mm-hh:mm', 'YYYY-MM-DDThh:mm:ss', 'YYYY-MM-DDThh:mm:ssZ', 'YYYY-MM-DDThh:mm:ss+hh', 'YYYY-MM-DDThh:mm:ss+hh:mm', 'YYYY-MM-DDThh:mm:ss-hh', 'YYYY-MM-DDThh:mm:ss-hh:mm', 'YYYY-MM-DDThh:mm:ss.fff', 'YYYY-MM-DDThh:mm:ss.fffZ', 'YYYY-MM-DDThh:mm:ss.fff+hh', 'YYYY-MM-DDThh:mm:ss.fff+hh:mm', 'YYYY-MM-DDThh:mm:ss.fff-hh', 'YYYY-MM-DDThh:mm:ss.fff-hh:mm'];
+    cqlFormatStringWithLength = {};
+    for (i = 0, len = cqlFormats.length; i < len; i++) {
+      format = cqlFormats[i];
+      cqlFormatStringWithLength[format.length] = format;
+    }
+    if (cqlFormatStringWithLength[string.length] == null) {
+      return false;
+    }
+    strict = false;
+    return moment(string, cqlFormatStringToMomentFormatString(cqlFormatStringWithLength[string.length]), strict).isValid();
+  };
+
+  cqlFormatStringToMomentFormatString = function(string) {
+    var momentString, ref, timeAndTimeZoneOffset, timezoneSeparator, yearMonthDay;
+    ref = string.split('T'), yearMonthDay = ref[0], timeAndTimeZoneOffset = ref[1];
+    if (timeAndTimeZoneOffset != null) {
+      timezoneSeparator = getTimezoneSeparatorFromString(timeAndTimeZoneOffset);
+    }
+    momentString = yearMonthDay;
+    if (string.match(/T/) != null) {
+      momentString += '[T]';
+    }
+    if (!!timezoneSeparator) {
+      momentString += timeAndTimeZoneOffset.substring(0, timeAndTimeZoneOffset.search(timezoneSeparator)) + '[Z]';
+    } else {
+      momentString += timeAndTimeZoneOffset;
+    }
+    return momentString = momentString.replace(/f/g, 'S');
+  };
+
+  getTimezoneSeparatorFromString = function(string) {
+    var ref, ref1, timezoneSeparator;
+    if ((string != null ? (ref = string.match(/-/)) != null ? ref.length : void 0 : void 0) === 1) {
+      return timezoneSeparator = '-';
+    } else if ((string != null ? (ref1 = string.match(/\+/)) != null ? ref1.length : void 0 : void 0) === 1) {
+      return timezoneSeparator = '+';
+    } else {
+      return timezoneSeparator = '';
+    }
+  };
+
 }).call(this);
 
 
@@ -28216,20 +28448,14 @@ function objectToString(o) {
     }
 
     Less.prototype.exec = function(ctx) {
-      var args, error;
+      var args;
       args = this.execArgs(ctx).map(function(x) {
         return Uncertainty.from(x);
       });
-      try {
-        return args[0].lessThan(args[1]);
-      } catch (error1) {
-        error = error1;
-        if (error instanceof IncompatibleTypesException) {
-          return null;
-        } else {
-          throw error;
-        }
+      if (!((args[0] != null) && (args[1] != null))) {
+        return null;
       }
+      return args[0].lessThan(args[1]);
     };
 
     return Less;
@@ -28244,20 +28470,14 @@ function objectToString(o) {
     }
 
     LessOrEqual.prototype.exec = function(ctx) {
-      var args, error;
+      var args;
       args = this.execArgs(ctx).map(function(x) {
         return Uncertainty.from(x);
       });
-      try {
-        return args[0].lessThanOrEquals(args[1]);
-      } catch (error1) {
-        error = error1;
-        if (error instanceof IncompatibleTypesException) {
-          return null;
-        } else {
-          throw error;
-        }
+      if (!((args[0] != null) && (args[1] != null))) {
+        return null;
       }
+      return args[0].lessThanOrEquals(args[1]);
     };
 
     return LessOrEqual;
@@ -28272,20 +28492,14 @@ function objectToString(o) {
     }
 
     Greater.prototype.exec = function(ctx) {
-      var args, error;
+      var args;
       args = this.execArgs(ctx).map(function(x) {
         return Uncertainty.from(x);
       });
-      try {
-        return args[0].greaterThan(args[1]);
-      } catch (error1) {
-        error = error1;
-        if (error instanceof IncompatibleTypesException) {
-          return null;
-        } else {
-          throw error;
-        }
+      if (!((args[0] != null) && (args[1] != null))) {
+        return null;
       }
+      return args[0].greaterThan(args[1]);
     };
 
     return Greater;
@@ -28300,20 +28514,14 @@ function objectToString(o) {
     }
 
     GreaterOrEqual.prototype.exec = function(ctx) {
-      var args, error;
+      var args;
       args = this.execArgs(ctx).map(function(x) {
         return Uncertainty.from(x);
       });
-      try {
-        return args[0].greaterThanOrEquals(args[1]);
-      } catch (error1) {
-        error = error1;
-        if (error instanceof IncompatibleTypesException) {
-          return null;
-        } else {
-          throw error;
-        }
+      if (!((args[0] != null) && (args[1] != null))) {
+        return null;
       }
+      return args[0].greaterThanOrEquals(args[1]);
     };
 
     return GreaterOrEqual;
@@ -30350,17 +30558,12 @@ function objectToString(o) {
     }
 
     Equal.prototype.exec = function(ctx) {
-      var error;
-      try {
-        return equals.apply(null, this.execArgs(ctx));
-      } catch (error1) {
-        error = error1;
-        if (error instanceof IncompatibleTypesException) {
-          return null;
-        } else {
-          throw error;
-        }
+      var args;
+      args = this.execArgs(ctx);
+      if (!((args[0] != null) && (args[1] != null))) {
+        return null;
       }
+      return equals.apply(null, this.execArgs(ctx));
     };
 
     return Equal;
@@ -30398,17 +30601,12 @@ function objectToString(o) {
     }
 
     NotEqual.prototype.exec = function(ctx) {
-      var error;
-      try {
-        return ThreeValuedLogic.not(equals.apply(null, this.execArgs(ctx)));
-      } catch (error1) {
-        error = error1;
-        if (error instanceof IncompatibleTypesException) {
-          return null;
-        } else {
-          throw error;
-        }
+      var args;
+      args = this.execArgs(ctx);
+      if (!((args[0] != null) && (args[1] != null))) {
+        return null;
       }
+      return ThreeValuedLogic.not(equals.apply(null, this.execArgs(ctx)));
     };
 
     return NotEqual;
@@ -30849,7 +31047,7 @@ function objectToString(o) {
 },{"./builder":161,"./expression":167}],179:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
-  var Code, Exception, Expression, FunctionRef, IncompatibleTypesException, Quantity, ValueSet, build, clean_unit, convert_value, createQuantity, decimalAdjust, is_valid_ucum_unit, ref, ucum, ucum_multiply, ucum_time_units, ucum_to_cql_units, ucum_unit, unitValidityCache, units_to_string,
+  var Code, Exception, Expression, FunctionRef, IncompatibleTypesException, Quantity, ValueSet, build, clean_unit, convert_value, createQuantity, decimalAdjust, isValidDecimal, is_valid_ucum_unit, ref, ref1, ucum, ucum_multiply, ucum_time_units, ucum_to_cql_units, ucum_unit, unitValidityCache, units_to_string,
     extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
     hasProp = {}.hasOwnProperty;
 
@@ -30857,9 +31055,9 @@ function objectToString(o) {
 
   FunctionRef = require('./reusable').FunctionRef;
 
-  decimalAdjust = require('../util/math').decimalAdjust;
+  ref = require('../util/math'), decimalAdjust = ref.decimalAdjust, isValidDecimal = ref.isValidDecimal;
 
-  ref = require('../datatypes/datatypes'), ValueSet = ref.ValueSet, Code = ref.Code;
+  ref1 = require('../datatypes/datatypes'), ValueSet = ref1.ValueSet, Code = ref1.Code;
 
   Exception = require('../datatypes/exception').Exception;
 
@@ -30886,8 +31084,13 @@ function objectToString(o) {
     function Quantity(json) {
       Quantity.__super__.constructor.apply(this, arguments);
       this.unit = json.unit;
-      this.value = parseFloat(json.value);
-      if (!is_valid_ucum_unit(this.unit)) {
+      if (json.value == null) {
+        this.value = null;
+      } else {
+        this.value = parseFloat(json.value);
+        isValidDecimal(this.value);
+      }
+      if ((this.unit != null) && !is_valid_ucum_unit(this.unit)) {
         throw new Error("\'" + this.unit + "\' is not a valid UCUM unit.");
       }
     }
@@ -31105,15 +31308,15 @@ function objectToString(o) {
   module.exports.convert_value = convert_value;
 
   units_to_string = function(units) {
-    var denom, i, key, len, numer, pow, ref1, str, unit_string, v;
+    var denom, i, key, len, numer, pow, ref2, str, unit_string, v;
     if (units == null) {
       units = {};
     }
     numer = [];
     denom = [];
-    ref1 = Object.keys(units);
-    for (i = 0, len = ref1.length; i < len; i++) {
-      key = ref1[i];
+    ref2 = Object.keys(units);
+    for (i = 0, len = ref2.length; i < len; i++) {
+      key = ref2[i];
       v = units[key];
       pow = Math.abs(v);
       str = pow === 1 ? key : key + pow;
@@ -31136,7 +31339,7 @@ function objectToString(o) {
   };
 
   ucum_multiply = function(t, ms) {
-    var b, i, k, len, mterm, ref1, ret, sign, v;
+    var b, i, k, len, mterm, ref2, ret, sign, v;
     if (ms == null) {
       ms = [];
     }
@@ -31149,9 +31352,9 @@ function objectToString(o) {
       sign = mterm[0] === '.' ? 1 : -1;
       b = mterm[1];
       ret.value *= Math.pow(b.value, sign);
-      ref1 = b.units;
-      for (k in ref1) {
-        v = ref1[k];
+      ref2 = b.units;
+      for (k in ref2) {
+        v = ref2[k];
         ret.units[k] = ret.units[k] || 0;
         ret.units[k] = ret.units[k] + sign * v;
         if (ret.units[k] === 0) {
@@ -31171,16 +31374,23 @@ function objectToString(o) {
 
   module.exports.parseQuantity = function(str) {
     var components, unit, value;
-    components = /([+|-]?\d+\.?\d*)\s*'(.+)'/.exec(str);
-    if ((components != null) && (components[1] != null) && (components[2] != null)) {
+    components = /([+|-]?\d+\.?\d*)\s*('(.+)')?/.exec(str);
+    if ((components != null) && (components[1] != null)) {
       value = parseFloat(components[1]);
-      unit = components[2].trim();
+      if (!isValidDecimal(value)) {
+        return null;
+      }
+      if (components[3] != null) {
+        unit = components[3].trim();
+      } else {
+        unit = "";
+      }
       return new Quantity({
         value: value,
         unit: unit
       });
     } else {
-      return null;
+      throw new Error("Unable to parse Quantity");
     }
   };
 
@@ -32133,7 +32343,7 @@ function objectToString(o) {
 },{"./builder":161,"./expression":167}],184:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
-  var As, Concept, Convert, DateTime, Expression, FunctionRef, IntervalTypeSpecifier, Is, ListTypeSpecifier, NamedTypeSpecifier, ToBoolean, ToConcept, ToDateTime, ToDecimal, ToInteger, ToQuantity, ToString, ToTime, TupleTypeSpecifier, UnimplementedExpression, parseQuantity, ref,
+  var As, Concept, Convert, DateTime, Expression, FunctionRef, IntervalTypeSpecifier, Is, ListTypeSpecifier, NamedTypeSpecifier, ToBoolean, ToConcept, ToDateTime, ToDecimal, ToInteger, ToQuantity, ToString, ToTime, TupleTypeSpecifier, UnimplementedExpression, isValidDecimal, isValidInteger, limitDecimalPrecision, parseQuantity, ref, ref1,
     extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
     hasProp = {}.hasOwnProperty;
 
@@ -32147,15 +32357,17 @@ function objectToString(o) {
 
   parseQuantity = require('./quantity').parseQuantity;
 
+  ref1 = require('../util/math'), isValidDecimal = ref1.isValidDecimal, isValidInteger = ref1.isValidInteger, limitDecimalPrecision = ref1.limitDecimalPrecision;
+
   module.exports.As = As = (function(superClass) {
     extend(As, superClass);
 
     function As(json) {
-      var ref1;
+      var ref2;
       As.__super__.constructor.apply(this, arguments);
       this.asType = json.asType;
       this.asTypeSpecifier = json.asTypeSpecifier;
-      this.strict = (ref1 = json.strict) != null ? ref1 : false;
+      this.strict = (ref2 = json.strict) != null ? ref2 : false;
     }
 
     As.prototype.exec = function(ctx) {
@@ -32244,10 +32456,14 @@ function objectToString(o) {
     }
 
     ToDecimal.prototype.exec = function(ctx) {
-      var arg;
+      var arg, decimal;
       arg = this.execArgs(ctx);
       if ((arg != null) && typeof arg !== 'undefined') {
-        return parseFloat(arg.toString());
+        decimal = parseFloat(arg.toString());
+        decimal = limitDecimalPrecision(decimal);
+        if (isValidDecimal(decimal)) {
+          return decimal;
+        }
       } else {
         return null;
       }
@@ -32265,10 +32481,13 @@ function objectToString(o) {
     }
 
     ToInteger.prototype.exec = function(ctx) {
-      var arg;
+      var arg, integer;
       arg = this.execArgs(ctx);
       if ((arg != null) && typeof arg !== 'undefined') {
-        return parseInt(arg.toString());
+        integer = parseInt(arg.toString());
+        if (isValidInteger(integer)) {
+          return integer;
+        }
       } else {
         return null;
       }
@@ -32286,10 +32505,11 @@ function objectToString(o) {
     }
 
     ToQuantity.prototype.exec = function(ctx) {
-      var arg;
+      var arg, quantity;
       arg = this.execArgs(ctx);
       if ((arg != null) && typeof arg !== 'undefined') {
-        return parseQuantity(arg.toString());
+        quantity = parseQuantity(arg.toString());
+        return quantity;
       } else {
         return null;
       }
@@ -32465,7 +32685,7 @@ function objectToString(o) {
 
 
 
-},{"../datatypes/clinical":152,"../datatypes/datetime":154,"./expression":167,"./quantity":179,"./reusable":181}],185:[function(require,module,exports){
+},{"../datatypes/clinical":152,"../datatypes/datetime":154,"../util/math":280,"./expression":167,"./quantity":179,"./reusable":181}],185:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
   var Address, Alert, Attachment, BackboneElement, CORE, CodeableConcept, Coding, ContactPoint, DT, DomainResource, Element, ElementDefinition, Extension, HumanName, Identifier, Narrative, Parameters, Period, Quantity, Range, Ratio, Reference, Resource, SampledData, Timing,
@@ -68731,7 +68951,11 @@ function objectToString(o) {
 
     Context.prototype.supportLibraryLocalIds = function(lib, localIdResults) {
       var ref, results, supportLib, supportLibName;
-      localIdResults[lib.library.source.library.identifier.id] = lib.localId_context;
+      if (localIdResults[lib.library.source.library.identifier.id] != null) {
+        this.mergeLibraryLocalIdResults(localIdResults, lib.library.source.library.identifier.id, lib.localId_context);
+      } else {
+        localIdResults[lib.library.source.library.identifier.id] = lib.localId_context;
+      }
       ref = lib.library_context;
       results = [];
       for (supportLibName in ref) {
@@ -68741,6 +68965,21 @@ function objectToString(o) {
       return results;
     };
 
+    Context.prototype.mergeLibraryLocalIdResults = function(localIdResults, libraryId, libraryResults) {
+      var existingResult, localId, localIdResult, results;
+      results = [];
+      for (localId in libraryResults) {
+        localIdResult = libraryResults[localId];
+        existingResult = localIdResults[libraryId][localId];
+        if (existingResult === false || existingResult === null || existingResult === void 0 || existingResult.length === 0) {
+          results.push(localIdResults[libraryId][localId] = localIdResult);
+        } else {
+          results.push(void 0);
+        }
+      }
+      return results;
+    };
+
     Context.prototype.checkParameters = function(params) {
       var pDef, pName, pVal;
       for (pName in params) {
@@ -69115,7 +69354,7 @@ function objectToString(o) {
 },{}],279:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
-  var DateTime, Uncertainty, areDateTimesOrQuantities, areNumbers, classesEqual, codesAreEquivalent, compareEveryItemInArrays, compareObjects, deepCompareKeysAndValues, equals, equivalent, getClassOfObjects, getKeysFromObject, isCode, isUncertainty;
+  var DateTime, Uncertainty, areDateTimesOrQuantities, areNumbers, classesEqual, codesAreEquivalent, compareEveryItemInArrays, compareObjects, deepCompareKeysAndValues, equals, equivalent, getClassOfObjects, getKeysFromObject, isCode, isFunction, isUncertainty;
 
   DateTime = require('../datatypes/datetime').DateTime;
 
@@ -69266,19 +69505,30 @@ function objectToString(o) {
   };
 
   deepCompareKeysAndValues = function(a, b, comparisonFunction) {
-    var aKeys, bKeys;
+    var aKeys, bKeys, finalComparisonResult, shouldReturnNull;
     aKeys = getKeysFromObject(a);
     bKeys = getKeysFromObject(b);
-    return aKeys.length === bKeys.length && aKeys.every(function(key) {
-      return comparisonFunction(a[key], b[key]);
+    shouldReturnNull = false;
+    finalComparisonResult = aKeys.length === bKeys.length && aKeys.every(function(key) {
+      var comparisonResult;
+      comparisonResult = comparisonFunction(a[key], b[key]);
+      if (comparisonResult === null) {
+        shouldReturnNull = true;
+      }
+      return comparisonResult;
     });
+    if (shouldReturnNull) {
+      return null;
+    }
+    return finalComparisonResult;
   };
 
   getKeysFromObject = function(object) {
-    var key;
+    var key, objectClass;
+    objectClass = {}.toString.call(object);
     return ((function() {
       var results;
-      if (typeof key !== 'function') {
+      if (!isFunction(key)) {
         results = [];
         for (key in object) {
           results.push(key);
@@ -69288,6 +69538,10 @@ function objectToString(o) {
     })());
   };
 
+  isFunction = function(input) {
+    return input instanceof Function || {}.toString.call(input) === '[object Function]';
+  };
+
   module.exports.equals = equals = function(a, b) {
     var aClass, bClass, ref;
     if (!((a != null) && (b != null))) {
@@ -69304,8 +69558,8 @@ function objectToString(o) {
     if (typeof a.equals === 'function') {
       return a.equals(b);
     }
-    if (a === b) {
-      return true;
+    if (typeof a === typeof b && typeof a === 'string' || typeof a === 'number' || typeof a === 'boolean') {
+      return a === b;
     }
     ref = getClassOfObjects(a, b), aClass = ref[0], bClass = ref[1];
     if (aClass !== bClass) {
@@ -69319,12 +69573,14 @@ function objectToString(o) {
           return a[p] === b[p];
         });
       case '[object Array]':
-        if (a.includes(null) || a.includes(void 0) || b.includes(null) || b.includes(void 0)) {
+        if (a.indexOf(null) >= 0 || a.indexOf(void 0) >= 0 || b.indexOf(null) >= 0 || b.indexOf(void 0) >= 0) {
           return null;
         }
         return compareEveryItemInArrays(a, b, equals);
       case '[object Object]':
         return compareObjects(a, b, equals);
+      case '[object Function]':
+        return a === b;
     }
     return false;
   };
@@ -69336,7 +69592,7 @@ function objectToString(o) {
 },{"../datatypes/datetime":154,"../datatypes/uncertainty":158}],280:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
-  var DateTime, Exception, MAX_DATE_VALUE, MAX_FLOAT_VALUE, MAX_INT_VALUE, MAX_TIME_VALUE, MIN_DATE_VALUE, MIN_FLOAT_PRECISION_VALUE, MIN_FLOAT_VALUE, MIN_INT_VALUE, OverFlowException, Uncertainty, predecessor, successor,
+  var DateTime, Exception, MAX_DATE_VALUE, MAX_FLOAT_VALUE, MAX_INT_VALUE, MAX_TIME_VALUE, MIN_DATE_VALUE, MIN_FLOAT_PRECISION_VALUE, MIN_FLOAT_VALUE, MIN_INT_VALUE, MIN_TIME_VALUE, OverFlowException, Uncertainty, isValidDecimal, isValidInteger, predecessor, successor,
     extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
     hasProp = {}.hasOwnProperty;
 
@@ -69360,10 +69616,50 @@ function objectToString(o) {
 
   module.exports.MAX_DATE_VALUE = MAX_DATE_VALUE = DateTime.parse("9999-12-31T23:59:59.999");
 
-  module.exports.MIN_TIME_VALUE = MAX_TIME_VALUE = DateTime.parse("0000-01-01T00:00:00.000");
+  module.exports.MIN_TIME_VALUE = MIN_TIME_VALUE = DateTime.parse("0000-01-01T00:00:00.000");
 
   module.exports.MAX_TIME_VALUE = MAX_TIME_VALUE = DateTime.parse("0000-01-01T23:59:59.999");
 
+  module.exports.isValidInteger = isValidInteger = function(integer) {
+    if (isNaN(integer)) {
+      throw new Error("Unable to parse Integer");
+    }
+    if (integer > MAX_INT_VALUE) {
+      throw new Error("Maximum Integer value exceeded");
+    }
+    if (integer < MIN_INT_VALUE) {
+      throw new Error("Minimum Integer value exceeded");
+    }
+    return true;
+  };
+
+  module.exports.isValidDecimal = isValidDecimal = function(decimal) {
+    if (isNaN(decimal)) {
+      throw new Error("Unable to parse Decimal");
+    }
+    if (decimal > MAX_FLOAT_VALUE) {
+      throw new Error("Maximum Decimal value exceeded");
+    }
+    if (decimal < MIN_FLOAT_VALUE) {
+      throw new Error("Minimum Decimal value exceeded");
+    }
+    return true;
+  };
+
+  module.exports.limitDecimalPrecision = function(decimal) {
+    var decimalPoints, decimalString, splitDecimalString;
+    decimalString = decimal.toString();
+    if (decimalString.indexOf('e') !== -1) {
+      return decimal;
+    }
+    splitDecimalString = decimalString.split('.');
+    decimalPoints = splitDecimalString[1];
+    if ((decimalPoints != null) && decimalPoints.length > 8) {
+      decimalString = splitDecimalString[0] + '.' + splitDecimalString[1].substring(0, 8);
+    }
+    return parseFloat(decimalString);
+  };
+
   module.exports.OverFlowException = OverFlowException = OverFlowException = (function(superClass) {
     extend(OverFlowException, superClass);