From 825fef0edf22ca0f3ba9c6346a3f2ef6cc5f5476 Mon Sep 17 00:00:00 2001
From: richfirely <97735555+richfirely@users.noreply.github.com>
Date: Mon, 14 Oct 2024 17:11:40 -0400
Subject: [PATCH 01/18] Update Parameters.cs

Minor doc fix on Parameters Get operations.
---
 src/Hl7.Fhir.Base/Model/Parameters.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Hl7.Fhir.Base/Model/Parameters.cs b/src/Hl7.Fhir.Base/Model/Parameters.cs
index 9ced728c10..1f901fce2e 100644
--- a/src/Hl7.Fhir.Base/Model/Parameters.cs
+++ b/src/Hl7.Fhir.Base/Model/Parameters.cs
@@ -122,7 +122,7 @@ public void Remove(string name, bool matchPrefix = false)
         /// Searches for a parameter with the given name, and returns the matching parameter(s)
         /// </summary>
         /// <param name="name">The name of the parameter</param>
-        /// <param name="matchPrefix">If true, will remove all parameters which begin with the string given in the "name" parameter</param>
+        /// <param name="matchPrefix">If true, will retrieve all parameters which begin with the string given in the "name" parameter</param>
         public IEnumerable<ParameterComponent> Get(string name, bool matchPrefix = false)
         {
             if (name == null) throw new ArgumentNullException("name");
@@ -137,7 +137,7 @@ public IEnumerable<ParameterComponent> Get(string name, bool matchPrefix = false
         /// Searches for a parameter with the given name, and returns the matching parameter(s)
         /// </summary>
         /// <param name="name">The name of the parameter</param>
-        /// <param name="matchPrefix">If true, will remove all parameters which begin with the string given in the "name" parameter</param>
+        /// <param name="matchPrefix">If true, will retrieve all parameters which begin with the string given in the "name" parameter</param>
         public ParameterComponent GetSingle(string name, bool matchPrefix = false)
         {
             if (name == null) throw new ArgumentNullException("name");
@@ -176,4 +176,4 @@ private string DebuggerDisplay
             }
         }
     }
-}
\ No newline at end of file
+}

From c1737124319422563e8f29722dc513b5d73fae3d Mon Sep 17 00:00:00 2001
From: haowang <593301179@qq.com>
Date: Thu, 17 Oct 2024 10:20:46 +0800
Subject: [PATCH 02/18] Remove the Charset from the Accept Header and replace
 it with the Accept-Charset Header.

---
 src/Hl7.Fhir.Base/Rest/ContentType.cs             | 15 +++++++++------
 src/Hl7.Fhir.Base/Rest/HttpContentBuilders.cs     |  4 ++--
 .../Rest/ContentTypeTests.cs                      |  8 ++++++++
 3 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/src/Hl7.Fhir.Base/Rest/ContentType.cs b/src/Hl7.Fhir.Base/Rest/ContentType.cs
index 573e8a0ede..0cc1699114 100644
--- a/src/Hl7.Fhir.Base/Rest/ContentType.cs
+++ b/src/Hl7.Fhir.Base/Rest/ContentType.cs
@@ -102,8 +102,9 @@ public static ResourceFormat GetResourceFormatFromContentType(string? contentTyp
         /// </summary>
         /// <param name="format">Whether the body is xml or json.</param>
         /// <param name="fhirVersion">Optional. The version of FHIR to add to the header.</param>
-        public static string BuildContentType(ResourceFormat format, string? fhirVersion = default) =>
-            BuildMediaType(format, fhirVersion).ToString();
+        /// <param name="excludeCharset">Optional. Whether exclude charset.</param>
+        public static string BuildContentType(ResourceFormat format, string? fhirVersion = default, bool excludeCharset = false) =>
+            BuildMediaType(format, fhirVersion, excludeCharset).ToString();
 
         /// <summary>
         /// Creates a <see cref="MediaTypeHeaderValue"/> for use in a Content-Type header, 
@@ -111,8 +112,9 @@ public static string BuildContentType(ResourceFormat format, string? fhirVersion
         /// </summary>
         /// <param name="format">Whether the body is xml or json.</param>
         /// <param name="fhirVersion">Optional. The version of FHIR to add to the header.</param>
+        /// <param name="excludeCharset">Optional. Whether exclude charset.</param>
         /// <exception cref="ArgumentException">Unsupported serialization.</exception>
-        public static MediaTypeHeaderValue BuildMediaType(ResourceFormat format, string? fhirVersion = default)
+        public static MediaTypeHeaderValue BuildMediaType(ResourceFormat format, string? fhirVersion = default, bool excludeCharset = false)
         {
             var contentType = format switch
             {
@@ -121,10 +123,11 @@ public static MediaTypeHeaderValue BuildMediaType(ResourceFormat format, string?
                 _ => throw new ArgumentException("Cannot determine content type for data format " + format),
             };
 
-            var result = new MediaTypeHeaderValue(contentType)
+            var result = new MediaTypeHeaderValue(contentType);
+            if (!excludeCharset)
             {
-                CharSet = Encoding.UTF8.WebName
-            };
+                result.CharSet = Encoding.UTF8.WebName;
+            }
 
             if (fhirVersion is not null && SemVersion.TryParse(fhirVersion, out var version))
             {
diff --git a/src/Hl7.Fhir.Base/Rest/HttpContentBuilders.cs b/src/Hl7.Fhir.Base/Rest/HttpContentBuilders.cs
index d271891200..3978eee48c 100644
--- a/src/Hl7.Fhir.Base/Rest/HttpContentBuilders.cs
+++ b/src/Hl7.Fhir.Base/Rest/HttpContentBuilders.cs
@@ -134,8 +134,8 @@ public static HttpRequestMessage WithAccept(this HttpRequestMessage message,
             string? contentTypeFhirVersion,
             bool requestCompressedResponse)
         {
-            message.Headers.Accept.Add(MediaTypeWithQualityHeaderValue.Parse(
-                    ContentType.BuildContentType(serialization, contentTypeFhirVersion)));
+            message.Headers.Accept.Add(MediaTypeWithQualityHeaderValue.Parse(ContentType.BuildContentType(serialization, contentTypeFhirVersion, true)));
+            message.Headers.AcceptCharset.Add(new StringWithQualityHeaderValue(Encoding.UTF8.WebName));
 
             if (requestCompressedResponse)
             {
diff --git a/src/Hl7.Fhir.Support.Poco.Tests/Rest/ContentTypeTests.cs b/src/Hl7.Fhir.Support.Poco.Tests/Rest/ContentTypeTests.cs
index 44fcea04c1..4b07dd6cd5 100644
--- a/src/Hl7.Fhir.Support.Poco.Tests/Rest/ContentTypeTests.cs
+++ b/src/Hl7.Fhir.Support.Poco.Tests/Rest/ContentTypeTests.cs
@@ -45,6 +45,14 @@ public void TestBuildingContentType(ResourceFormat format, string fhirVersion, s
             ContentType.BuildContentType(format, fhirVersion).Should().Be(expected);
         }
 
+        [DataTestMethod]
+        [DataRow(ResourceFormat.Json, "", true, "application/fhir+json")]
+        [DataRow(ResourceFormat.Xml, "", true, "application/fhir+xml")]
+        public void TestBuildingContentTypeWithExcludeCharSet(ResourceFormat format, string fhirVersion, bool excludeCharset, string expected)
+        {
+            ContentType.BuildContentType(format, fhirVersion, excludeCharset).Should().Be(expected);
+        }
+
         [TestMethod]
         public void GetResourceFormatSupportsCharset()
         {

From b4b27c9017e0848f8a556d6c1fc1867926c0f586 Mon Sep 17 00:00:00 2001
From: haowang <593301179@qq.com>
Date: Thu, 17 Oct 2024 23:34:05 +0800
Subject: [PATCH 03/18] update compatibility suppressions file.

---
 .../CompatibilitySuppressions.xml             | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/src/Hl7.Fhir.Base/CompatibilitySuppressions.xml b/src/Hl7.Fhir.Base/CompatibilitySuppressions.xml
index 82dbcd9130..2143d9c154 100644
--- a/src/Hl7.Fhir.Base/CompatibilitySuppressions.xml
+++ b/src/Hl7.Fhir.Base/CompatibilitySuppressions.xml
@@ -7,4 +7,32 @@
     <Left>lib/netstandard2.0/Hl7.Fhir.Base.dll</Left>
     <Right>lib/net8.0/Hl7.Fhir.Base.dll</Right>
   </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:Hl7.Fhir.Rest.ContentType.BuildContentType(Hl7.Fhir.Rest.ResourceFormat,System.String)</Target>
+    <Left>lib/net8.0/Hl7.Fhir.Base.dll</Left>
+    <Right>lib/net8.0/Hl7.Fhir.Base.dll</Right>
+    <IsBaselineSuppression>true</IsBaselineSuppression>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:Hl7.Fhir.Rest.ContentType.BuildMediaType(Hl7.Fhir.Rest.ResourceFormat,System.String)</Target>
+    <Left>lib/net8.0/Hl7.Fhir.Base.dll</Left>
+    <Right>lib/net8.0/Hl7.Fhir.Base.dll</Right>
+    <IsBaselineSuppression>true</IsBaselineSuppression>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:Hl7.Fhir.Rest.ContentType.BuildContentType(Hl7.Fhir.Rest.ResourceFormat,System.String)</Target>
+    <Left>lib/netstandard2.0/Hl7.Fhir.Base.dll</Left>
+    <Right>lib/netstandard2.0/Hl7.Fhir.Base.dll</Right>
+    <IsBaselineSuppression>true</IsBaselineSuppression>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:Hl7.Fhir.Rest.ContentType.BuildMediaType(Hl7.Fhir.Rest.ResourceFormat,System.String)</Target>
+    <Left>lib/netstandard2.0/Hl7.Fhir.Base.dll</Left>
+    <Right>lib/netstandard2.0/Hl7.Fhir.Base.dll</Right>
+    <IsBaselineSuppression>true</IsBaselineSuppression>
+  </Suppression>
 </Suppressions>
\ No newline at end of file

From c75aab73a2860cfe570787eef215b547d4ce77c3 Mon Sep 17 00:00:00 2001
From: haowang <593301179@qq.com>
Date: Fri, 18 Oct 2024 00:27:59 +0800
Subject: [PATCH 04/18] fix:unittest.

---
 src/Hl7.Fhir.Support.Poco.Tests/Rest/RequestMessageTests.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Hl7.Fhir.Support.Poco.Tests/Rest/RequestMessageTests.cs b/src/Hl7.Fhir.Support.Poco.Tests/Rest/RequestMessageTests.cs
index 4320b580cc..729378dce6 100644
--- a/src/Hl7.Fhir.Support.Poco.Tests/Rest/RequestMessageTests.cs
+++ b/src/Hl7.Fhir.Support.Poco.Tests/Rest/RequestMessageTests.cs
@@ -204,12 +204,12 @@ public void SetAccept(ResourceFormat fmt)
         {
             var settings = new FhirClientSettings { PreferredFormat = fmt, BinaryReceivePreference = BinaryTransferBehaviour.UseResource };
             var request = makeMessage(settings: settings, method: Bundle.HTTPVerb.POST);
-            request.Headers.Accept.Single().ToString().Should().Be(ContentType.BuildContentType(fmt, TESTVERSION));
+            request.Headers.Accept.Single().ToString().Should().Be(ContentType.BuildContentType(fmt, TESTVERSION, true));
             request.Headers.AcceptEncoding.Should().BeEmpty();
 
             settings.PreferCompressedResponses = true;
             request = makeMessage(settings: settings, method: Bundle.HTTPVerb.POST);
-            request.Headers.Accept.Single().ToString().Should().Be(ContentType.BuildContentType(fmt, TESTVERSION));
+            request.Headers.Accept.Single().ToString().Should().Be(ContentType.BuildContentType(fmt, TESTVERSION, true));
             request.Headers.AcceptEncoding.Select(h => h.Value).Should().BeEquivalentTo("gzip", "deflate");
         }
 

From 193d73d47e41b6615efca0c95f22ce327e1e4a49 Mon Sep 17 00:00:00 2001
From: Ewout Kramer <ewout@fire.ly>
Date: Fri, 18 Oct 2024 17:05:08 +0200
Subject: [PATCH 05/18] Removed IsResource/IsNestedType.

Also fixed some obsolete warnings that no one seems to care about.
---
 .../Introspection/ClassMapping.cs             |    4 +-
 .../Introspection/FhirTypeAttribute.cs        |   16 +-
 src/Hl7.Fhir.Base/Model/Generated/Binary.cs   |    2 +-
 src/Hl7.Fhir.Base/Model/Generated/Bundle.cs   |   12 +-
 .../Model/Generated/DomainResource.cs         |    2 +-
 .../Model/Generated/OperationOutcome.cs       |    4 +-
 .../Model/Generated/Parameters.cs             |    4 +-
 src/Hl7.Fhir.Base/Model/Generated/Resource.cs |    2 +-
 .../Model/Generated/CapabilityStatement.cs    |   28 +-
 .../Model/Generated/CodeSystem.cs             |   12 +-
 .../Model/Generated/ElementDefinition.cs      |   18 +-
 .../Model/Generated/StructureDefinition.cs    |   10 +-
 .../Model/Generated/ValueSet.cs               |   26 +-
 src/Hl7.Fhir.R4/Model/Generated/Account.cs    |    6 +-
 .../Model/Generated/ActivityDefinition.cs     |    6 +-
 .../Model/Generated/AdverseEvent.cs           |    6 +-
 .../Model/Generated/AllergyIntolerance.cs     |    4 +-
 .../Model/Generated/Appointment.cs            |    4 +-
 .../Model/Generated/AppointmentResponse.cs    |    2 +-
 src/Hl7.Fhir.R4/Model/Generated/AuditEvent.cs |   12 +-
 src/Hl7.Fhir.R4/Model/Generated/Basic.cs      |    2 +-
 .../Generated/BiologicallyDerivedProduct.cs   |   10 +-
 .../Model/Generated/BodyStructure.cs          |    2 +-
 src/Hl7.Fhir.R4/Model/Generated/CarePlan.cs   |    6 +-
 src/Hl7.Fhir.R4/Model/Generated/CareTeam.cs   |    4 +-
 .../Model/Generated/CatalogEntry.cs           |    4 +-
 src/Hl7.Fhir.R4/Model/Generated/ChargeItem.cs |    4 +-
 .../Model/Generated/ChargeItemDefinition.cs   |    8 +-
 src/Hl7.Fhir.R4/Model/Generated/Claim.cs      |   24 +-
 .../Model/Generated/ClaimResponse.cs          |   26 +-
 .../Model/Generated/ClinicalImpression.cs     |    6 +-
 .../Model/Generated/Communication.cs          |    4 +-
 .../Model/Generated/CommunicationRequest.cs   |    4 +-
 .../Model/Generated/CompartmentDefinition.cs  |    4 +-
 .../Model/Generated/Composition.cs            |   10 +-
 src/Hl7.Fhir.R4/Model/Generated/ConceptMap.cs |   12 +-
 src/Hl7.Fhir.R4/Model/Generated/Condition.cs  |    6 +-
 src/Hl7.Fhir.R4/Model/Generated/Consent.cs    |   12 +-
 src/Hl7.Fhir.R4/Model/Generated/Contract.cs   |   32 +-
 src/Hl7.Fhir.R4/Model/Generated/Coverage.cs   |    8 +-
 .../Generated/CoverageEligibilityRequest.cs   |   10 +-
 .../Generated/CoverageEligibilityResponse.cs  |   10 +-
 .../Model/Generated/DataRequirement.cs        |    6 +-
 .../Model/Generated/DetectedIssue.cs          |    6 +-
 src/Hl7.Fhir.R4/Model/Generated/Device.cs     |   12 +-
 .../Model/Generated/DeviceDefinition.cs       |   14 +-
 .../Model/Generated/DeviceMetric.cs           |    4 +-
 .../Model/Generated/DeviceRequest.cs          |    4 +-
 .../Model/Generated/DeviceUseStatement.cs     |    2 +-
 .../Model/Generated/DiagnosticReport.cs       |    4 +-
 .../Model/Generated/DocumentManifest.cs       |    4 +-
 .../Model/Generated/DocumentReference.cs      |    8 +-
 src/Hl7.Fhir.R4/Model/Generated/Dosage.cs     |    2 +-
 .../Generated/EffectEvidenceSynthesis.cs      |   14 +-
 src/Hl7.Fhir.R4/Model/Generated/Encounter.cs  |   14 +-
 src/Hl7.Fhir.R4/Model/Generated/Endpoint.cs   |    2 +-
 .../Model/Generated/EnrollmentRequest.cs      |    2 +-
 .../Model/Generated/EnrollmentResponse.cs     |    2 +-
 .../Model/Generated/EpisodeOfCare.cs          |    6 +-
 .../Model/Generated/EventDefinition.cs        |    2 +-
 src/Hl7.Fhir.R4/Model/Generated/Evidence.cs   |    2 +-
 .../Model/Generated/EvidenceVariable.cs       |    4 +-
 .../Model/Generated/ExampleScenario.cs        |   18 +-
 .../Model/Generated/ExplanationOfBenefit.cs   |   42 +-
 .../Model/Generated/FamilyMemberHistory.cs    |    4 +-
 src/Hl7.Fhir.R4/Model/Generated/Flag.cs       |    2 +-
 src/Hl7.Fhir.R4/Model/Generated/Goal.cs       |    4 +-
 .../Model/Generated/GraphDefinition.cs        |    8 +-
 src/Hl7.Fhir.R4/Model/Generated/Group.cs      |    6 +-
 .../Model/Generated/GuidanceResponse.cs       |    2 +-
 .../Model/Generated/HealthcareService.cs      |    8 +-
 .../Model/Generated/ImagingStudy.cs           |    8 +-
 .../Model/Generated/Immunization.cs           |   10 +-
 .../Model/Generated/ImmunizationEvaluation.cs |    2 +-
 .../Generated/ImmunizationRecommendation.cs   |    6 +-
 .../Model/Generated/ImplementationGuide.cs    |   24 +-
 .../Model/Generated/InsurancePlan.cs          |   20 +-
 src/Hl7.Fhir.R4/Model/Generated/Invoice.cs    |    8 +-
 src/Hl7.Fhir.R4/Model/Generated/Library.cs    |    2 +-
 src/Hl7.Fhir.R4/Model/Generated/Linkage.cs    |    4 +-
 src/Hl7.Fhir.R4/Model/Generated/List.cs       |    4 +-
 src/Hl7.Fhir.R4/Model/Generated/Location.cs   |    6 +-
 src/Hl7.Fhir.R4/Model/Generated/Measure.cs    |   12 +-
 .../Model/Generated/MeasureReport.cs          |   14 +-
 src/Hl7.Fhir.R4/Model/Generated/Media.cs      |    2 +-
 src/Hl7.Fhir.R4/Model/Generated/Medication.cs |    6 +-
 .../Generated/MedicationAdministration.cs     |    6 +-
 .../Model/Generated/MedicationDispense.cs     |    6 +-
 .../Model/Generated/MedicationKnowledge.cs    |   34 +-
 .../Model/Generated/MedicationRequest.cs      |    8 +-
 .../Model/Generated/MedicationStatement.cs    |    2 +-
 .../Model/Generated/MedicinalProduct.cs       |   12 +-
 .../MedicinalProductAuthorization.cs          |    6 +-
 .../MedicinalProductContraindication.cs       |    4 +-
 .../Generated/MedicinalProductIndication.cs   |    4 +-
 .../Generated/MedicinalProductIngredient.cs   |   10 +-
 .../Generated/MedicinalProductInteraction.cs  |    4 +-
 .../Generated/MedicinalProductManufactured.cs |    2 +-
 .../Generated/MedicinalProductPackaged.cs     |    6 +-
 .../MedicinalProductPharmaceutical.cs         |   10 +-
 .../MedicinalProductUndesirableEffect.cs      |    2 +-
 .../Model/Generated/MessageDefinition.cs      |    6 +-
 .../Model/Generated/MessageHeader.cs          |    8 +-
 .../Model/Generated/MolecularSequence.cs      |   18 +-
 .../Model/Generated/NamingSystem.cs           |    4 +-
 .../Model/Generated/NutritionOrder.cs         |   14 +-
 .../Model/Generated/Observation.cs            |    6 +-
 .../Model/Generated/ObservationDefinition.cs  |    6 +-
 .../Model/Generated/OperationDefinition.cs    |   10 +-
 .../Model/Generated/Organization.cs           |    4 +-
 .../Generated/OrganizationAffiliation.cs      |    2 +-
 src/Hl7.Fhir.R4/Model/Generated/Patient.cs    |    8 +-
 .../Model/Generated/PaymentNotice.cs          |    2 +-
 .../Model/Generated/PaymentReconciliation.cs  |    6 +-
 src/Hl7.Fhir.R4/Model/Generated/Person.cs     |    4 +-
 .../Model/Generated/PlanDefinition.cs         |   16 +-
 .../Model/Generated/Practitioner.cs           |    4 +-
 .../Model/Generated/PractitionerRole.cs       |    6 +-
 src/Hl7.Fhir.R4/Model/Generated/Procedure.cs  |    6 +-
 src/Hl7.Fhir.R4/Model/Generated/Provenance.cs |    6 +-
 .../Model/Generated/Questionnaire.cs          |   10 +-
 .../Model/Generated/QuestionnaireResponse.cs  |    6 +-
 .../Model/Generated/RelatedPerson.cs          |    4 +-
 .../Model/Generated/RequestGroup.cs           |    8 +-
 .../Model/Generated/ResearchDefinition.cs     |    2 +-
 .../Generated/ResearchElementDefinition.cs    |    4 +-
 .../Model/Generated/ResearchStudy.cs          |    6 +-
 .../Model/Generated/ResearchSubject.cs        |    2 +-
 .../Model/Generated/RiskAssessment.cs         |    4 +-
 .../Model/Generated/RiskEvidenceSynthesis.cs  |   12 +-
 src/Hl7.Fhir.R4/Model/Generated/Schedule.cs   |    2 +-
 .../Model/Generated/SearchParameter.cs        |    4 +-
 .../Model/Generated/ServiceRequest.cs         |    2 +-
 src/Hl7.Fhir.R4/Model/Generated/Slot.cs       |    2 +-
 src/Hl7.Fhir.R4/Model/Generated/Specimen.cs   |    8 +-
 .../Model/Generated/SpecimenDefinition.cs     |   10 +-
 .../Model/Generated/StructureMap.cs           |   18 +-
 .../Model/Generated/Subscription.cs           |    4 +-
 src/Hl7.Fhir.R4/Model/Generated/Substance.cs  |    6 +-
 .../Model/Generated/SubstanceAmount.cs        |    2 +-
 .../Model/Generated/SubstanceNucleicAcid.cs   |    8 +-
 .../Model/Generated/SubstancePolymer.cs       |   14 +-
 .../Model/Generated/SubstanceProtein.cs       |    4 +-
 .../SubstanceReferenceInformation.cs          |   10 +-
 .../Generated/SubstanceSourceMaterial.cs      |   14 +-
 .../Model/Generated/SubstanceSpecification.cs |   22 +-
 .../Model/Generated/SupplyDelivery.cs         |    4 +-
 .../Model/Generated/SupplyRequest.cs          |    4 +-
 src/Hl7.Fhir.R4/Model/Generated/Task.cs       |    8 +-
 .../Generated/TerminologyCapabilities.cs      |   22 +-
 src/Hl7.Fhir.R4/Model/Generated/TestReport.cs |   20 +-
 src/Hl7.Fhir.R4/Model/Generated/TestScript.cs |   34 +-
 src/Hl7.Fhir.R4/Model/Generated/Timing.cs     |    2 +-
 .../Model/Generated/VerificationResult.cs     |    8 +-
 .../Model/Generated/VisionPrescription.cs     |    6 +-
 src/Hl7.Fhir.R4B/Model/Generated/Account.cs   |    6 +-
 .../Model/Generated/ActivityDefinition.cs     |    6 +-
 .../AdministrableProductDefinition.cs         |   10 +-
 .../Model/Generated/AdverseEvent.cs           |    6 +-
 .../Model/Generated/AllergyIntolerance.cs     |    4 +-
 .../Model/Generated/Appointment.cs            |    4 +-
 .../Model/Generated/AppointmentResponse.cs    |    2 +-
 .../Model/Generated/AuditEvent.cs             |   12 +-
 src/Hl7.Fhir.R4B/Model/Generated/Basic.cs     |    2 +-
 .../Generated/BiologicallyDerivedProduct.cs   |   10 +-
 .../Model/Generated/BodyStructure.cs          |    2 +-
 src/Hl7.Fhir.R4B/Model/Generated/CarePlan.cs  |    6 +-
 src/Hl7.Fhir.R4B/Model/Generated/CareTeam.cs  |    4 +-
 .../Model/Generated/CatalogEntry.cs           |    4 +-
 .../Model/Generated/ChargeItem.cs             |    4 +-
 .../Model/Generated/ChargeItemDefinition.cs   |    8 +-
 src/Hl7.Fhir.R4B/Model/Generated/Citation.cs  |   48 +-
 src/Hl7.Fhir.R4B/Model/Generated/Claim.cs     |   24 +-
 .../Model/Generated/ClaimResponse.cs          |   26 +-
 .../Model/Generated/ClinicalImpression.cs     |    6 +-
 .../Model/Generated/ClinicalUseDefinition.cs  |   16 +-
 .../Model/Generated/Communication.cs          |    4 +-
 .../Model/Generated/CommunicationRequest.cs   |    4 +-
 .../Model/Generated/CompartmentDefinition.cs  |    4 +-
 .../Model/Generated/Composition.cs            |   10 +-
 .../Model/Generated/ConceptMap.cs             |   12 +-
 src/Hl7.Fhir.R4B/Model/Generated/Condition.cs |    6 +-
 src/Hl7.Fhir.R4B/Model/Generated/Consent.cs   |   12 +-
 src/Hl7.Fhir.R4B/Model/Generated/Contract.cs  |   32 +-
 src/Hl7.Fhir.R4B/Model/Generated/Coverage.cs  |    8 +-
 .../Generated/CoverageEligibilityRequest.cs   |   10 +-
 .../Generated/CoverageEligibilityResponse.cs  |   10 +-
 .../Model/Generated/DataRequirement.cs        |    6 +-
 .../Model/Generated/DetectedIssue.cs          |    6 +-
 src/Hl7.Fhir.R4B/Model/Generated/Device.cs    |   12 +-
 .../Model/Generated/DeviceDefinition.cs       |   14 +-
 .../Model/Generated/DeviceMetric.cs           |    4 +-
 .../Model/Generated/DeviceRequest.cs          |    4 +-
 .../Model/Generated/DeviceUseStatement.cs     |    2 +-
 .../Model/Generated/DiagnosticReport.cs       |    4 +-
 .../Model/Generated/DocumentManifest.cs       |    4 +-
 .../Model/Generated/DocumentReference.cs      |    8 +-
 src/Hl7.Fhir.R4B/Model/Generated/Dosage.cs    |    2 +-
 src/Hl7.Fhir.R4B/Model/Generated/Encounter.cs |   14 +-
 src/Hl7.Fhir.R4B/Model/Generated/Endpoint.cs  |    2 +-
 .../Model/Generated/EnrollmentRequest.cs      |    2 +-
 .../Model/Generated/EnrollmentResponse.cs     |    2 +-
 .../Model/Generated/EpisodeOfCare.cs          |    6 +-
 .../Model/Generated/EventDefinition.cs        |    2 +-
 src/Hl7.Fhir.R4B/Model/Generated/Evidence.cs  |   16 +-
 .../Model/Generated/EvidenceReport.cs         |   10 +-
 .../Model/Generated/EvidenceVariable.cs       |    8 +-
 .../Model/Generated/ExampleScenario.cs        |   18 +-
 .../Model/Generated/ExplanationOfBenefit.cs   |   42 +-
 .../Model/Generated/FamilyMemberHistory.cs    |    4 +-
 src/Hl7.Fhir.R4B/Model/Generated/Flag.cs      |    2 +-
 src/Hl7.Fhir.R4B/Model/Generated/Goal.cs      |    4 +-
 .../Model/Generated/GraphDefinition.cs        |    8 +-
 src/Hl7.Fhir.R4B/Model/Generated/Group.cs     |    6 +-
 .../Model/Generated/GuidanceResponse.cs       |    2 +-
 .../Model/Generated/HealthcareService.cs      |    8 +-
 .../Model/Generated/ImagingStudy.cs           |    8 +-
 .../Model/Generated/Immunization.cs           |   10 +-
 .../Model/Generated/ImmunizationEvaluation.cs |    2 +-
 .../Generated/ImmunizationRecommendation.cs   |    6 +-
 .../Model/Generated/ImplementationGuide.cs    |   24 +-
 .../Model/Generated/Ingredient.cs             |   10 +-
 .../Model/Generated/InsurancePlan.cs          |   20 +-
 src/Hl7.Fhir.R4B/Model/Generated/Invoice.cs   |    8 +-
 src/Hl7.Fhir.R4B/Model/Generated/Library.cs   |    2 +-
 src/Hl7.Fhir.R4B/Model/Generated/Linkage.cs   |    4 +-
 src/Hl7.Fhir.R4B/Model/Generated/List.cs      |    4 +-
 src/Hl7.Fhir.R4B/Model/Generated/Location.cs  |    6 +-
 .../Generated/ManufacturedItemDefinition.cs   |    4 +-
 src/Hl7.Fhir.R4B/Model/Generated/Measure.cs   |   12 +-
 .../Model/Generated/MeasureReport.cs          |   14 +-
 src/Hl7.Fhir.R4B/Model/Generated/Media.cs     |    2 +-
 .../Model/Generated/Medication.cs             |    6 +-
 .../Generated/MedicationAdministration.cs     |    6 +-
 .../Model/Generated/MedicationDispense.cs     |    6 +-
 .../Model/Generated/MedicationKnowledge.cs    |   34 +-
 .../Model/Generated/MedicationRequest.cs      |    8 +-
 .../Model/Generated/MedicationStatement.cs    |    2 +-
 .../Generated/MedicinalProductDefinition.cs   |   16 +-
 .../Model/Generated/MessageDefinition.cs      |    6 +-
 .../Model/Generated/MessageHeader.cs          |    8 +-
 .../Model/Generated/MolecularSequence.cs      |   18 +-
 .../Model/Generated/NamingSystem.cs           |    4 +-
 .../Model/Generated/NutritionOrder.cs         |   14 +-
 .../Model/Generated/NutritionProduct.cs       |   10 +-
 .../Model/Generated/Observation.cs            |    6 +-
 .../Model/Generated/ObservationDefinition.cs  |    6 +-
 .../Model/Generated/OperationDefinition.cs    |   10 +-
 .../Model/Generated/Organization.cs           |    4 +-
 .../Generated/OrganizationAffiliation.cs      |    2 +-
 .../Generated/PackagedProductDefinition.cs    |   12 +-
 src/Hl7.Fhir.R4B/Model/Generated/Patient.cs   |    8 +-
 .../Model/Generated/PaymentNotice.cs          |    2 +-
 .../Model/Generated/PaymentReconciliation.cs  |    6 +-
 src/Hl7.Fhir.R4B/Model/Generated/Person.cs    |    4 +-
 .../Model/Generated/PlanDefinition.cs         |   16 +-
 .../Model/Generated/Practitioner.cs           |    4 +-
 .../Model/Generated/PractitionerRole.cs       |    6 +-
 src/Hl7.Fhir.R4B/Model/Generated/Procedure.cs |    6 +-
 .../Model/Generated/Provenance.cs             |    6 +-
 .../Model/Generated/Questionnaire.cs          |   10 +-
 .../Model/Generated/QuestionnaireResponse.cs  |    6 +-
 .../Model/Generated/RegulatedAuthorization.cs |    4 +-
 .../Model/Generated/RelatedPerson.cs          |    4 +-
 .../Model/Generated/RequestGroup.cs           |    8 +-
 .../Model/Generated/ResearchDefinition.cs     |    2 +-
 .../Generated/ResearchElementDefinition.cs    |    4 +-
 .../Model/Generated/ResearchStudy.cs          |    6 +-
 .../Model/Generated/ResearchSubject.cs        |    2 +-
 .../Model/Generated/RiskAssessment.cs         |    4 +-
 src/Hl7.Fhir.R4B/Model/Generated/Schedule.cs  |    2 +-
 .../Model/Generated/SearchParameter.cs        |    4 +-
 .../Model/Generated/ServiceRequest.cs         |    2 +-
 src/Hl7.Fhir.R4B/Model/Generated/Slot.cs      |    2 +-
 src/Hl7.Fhir.R4B/Model/Generated/Specimen.cs  |    8 +-
 .../Model/Generated/SpecimenDefinition.cs     |   10 +-
 .../Model/Generated/StructureMap.cs           |   18 +-
 .../Model/Generated/Subscription.cs           |    4 +-
 .../Model/Generated/SubscriptionStatus.cs     |    4 +-
 .../Model/Generated/SubscriptionTopic.cs      |   12 +-
 src/Hl7.Fhir.R4B/Model/Generated/Substance.cs |    6 +-
 .../Model/Generated/SubstanceDefinition.cs    |   22 +-
 .../Model/Generated/SupplyDelivery.cs         |    4 +-
 .../Model/Generated/SupplyRequest.cs          |    4 +-
 src/Hl7.Fhir.R4B/Model/Generated/Task.cs      |    8 +-
 .../Generated/TerminologyCapabilities.cs      |   22 +-
 .../Model/Generated/TestReport.cs             |   20 +-
 .../Model/Generated/TestScript.cs             |   34 +-
 src/Hl7.Fhir.R4B/Model/Generated/Timing.cs    |    2 +-
 .../Model/Generated/VerificationResult.cs     |    8 +-
 .../Model/Generated/VisionPrescription.cs     |    6 +-
 src/Hl7.Fhir.R5/Model/Generated/Account.cs    |  206 +++-
 .../Model/Generated/ActivityDefinition.cs     |  206 +++-
 .../Model/Generated/ActorDefinition.cs        |   80 +-
 src/Hl7.Fhir.R5/Model/Generated/Address.cs    |   42 +-
 .../AdministrableProductDefinition.cs         |  140 ++-
 .../Model/Generated/AdverseEvent.cs           |  203 +++-
 src/Hl7.Fhir.R5/Model/Generated/Age.cs        |    2 +-
 .../Model/Generated/AllergyIntolerance.cs     |  110 +-
 src/Hl7.Fhir.R5/Model/Generated/Annotation.cs |   21 +-
 .../Model/Generated/Appointment.cs            |  254 ++++-
 .../Model/Generated/AppointmentResponse.cs    |   50 +-
 .../Model/Generated/ArtifactAssessment.cs     |   89 +-
 src/Hl7.Fhir.R5/Model/Generated/AuditEvent.cs |  179 ++-
 .../Model/Generated/Availability.cs           |   60 +-
 src/Hl7.Fhir.R5/Model/Generated/Basic.cs      |   29 +-
 .../Generated/BiologicallyDerivedProduct.cs   |   92 +-
 .../BiologicallyDerivedProductDispense.cs     |   80 +-
 .../Model/Generated/BodyStructure.cs          |  107 +-
 src/Hl7.Fhir.R5/Model/Generated/CarePlan.cs   |  104 +-
 src/Hl7.Fhir.R5/Model/Generated/CareTeam.cs   |   71 +-
 src/Hl7.Fhir.R5/Model/Generated/ChargeItem.cs |  110 +-
 .../Model/Generated/ChargeItemDefinition.cs   |  131 ++-
 src/Hl7.Fhir.R5/Model/Generated/Citation.cs   |  584 +++++++++-
 src/Hl7.Fhir.R5/Model/Generated/Claim.cs      |  551 ++++++++-
 .../Model/Generated/ClaimResponse.cs          |  593 +++++++++-
 .../Model/Generated/ClinicalImpression.cs     |   89 +-
 .../Model/Generated/ClinicalUseDefinition.cs  |  215 +++-
 .../Model/Generated/Communication.cs          |   95 +-
 .../Model/Generated/CommunicationRequest.cs   |   95 +-
 .../Model/Generated/CompartmentDefinition.cs  |   89 +-
 .../Model/Generated/Composition.cs            |  149 ++-
 src/Hl7.Fhir.R5/Model/Generated/ConceptMap.cs |  314 ++++-
 src/Hl7.Fhir.R5/Model/Generated/Condition.cs  |  101 +-
 .../Model/Generated/ConditionDefinition.cs    |  194 +++-
 src/Hl7.Fhir.R5/Model/Generated/Consent.cs    |  197 +++-
 src/Hl7.Fhir.R5/Model/Generated/Contract.cs   |  575 +++++++++-
 .../Model/Generated/Contributor.cs            |   21 +-
 src/Hl7.Fhir.R5/Model/Generated/Count.cs      |    2 +-
 src/Hl7.Fhir.R5/Model/Generated/Coverage.cs   |  164 ++-
 .../Generated/CoverageEligibilityRequest.cs   |  176 ++-
 .../Generated/CoverageEligibilityResponse.cs  |  197 +++-
 .../Model/Generated/DataRequirement.cs        |  126 ++-
 .../Model/Generated/DetectedIssue.cs          |   98 +-
 src/Hl7.Fhir.R5/Model/Generated/Device.cs     |  224 +++-
 .../Model/Generated/DeviceAssociation.cs      |   62 +-
 .../Model/Generated/DeviceDefinition.cs       |  440 ++++++-
 .../Model/Generated/DeviceDispense.cs         |   95 +-
 .../Model/Generated/DeviceMetric.cs           |   62 +-
 .../Model/Generated/DeviceRequest.cs          |  110 +-
 .../Model/Generated/DeviceUsage.cs            |   83 +-
 .../Model/Generated/DiagnosticReport.cs       |  113 +-
 src/Hl7.Fhir.R5/Model/Generated/Distance.cs   |    2 +-
 .../Model/Generated/DocumentReference.cs      |  155 ++-
 src/Hl7.Fhir.R5/Model/Generated/Dosage.cs     |   75 +-
 src/Hl7.Fhir.R5/Model/Generated/Duration.cs   |    2 +-
 src/Hl7.Fhir.R5/Model/Generated/Encounter.cs  |  209 +++-
 .../Model/Generated/EncounterHistory.cs       |   71 +-
 src/Hl7.Fhir.R5/Model/Generated/Endpoint.cs   |   68 +-
 .../Model/Generated/EnrollmentRequest.cs      |   35 +-
 .../Model/Generated/EnrollmentResponse.cs     |   38 +-
 .../Model/Generated/EpisodeOfCare.cs          |  107 +-
 .../Model/Generated/EventDefinition.cs        |  104 +-
 src/Hl7.Fhir.R5/Model/Generated/Evidence.cs   |  320 +++++-
 .../Model/Generated/EvidenceReport.cs         |  200 +++-
 .../Model/Generated/EvidenceVariable.cs       |  251 +++-
 .../Model/Generated/ExampleScenario.cs        |  296 ++++-
 .../Model/Generated/ExplanationOfBenefit.cs   | 1007 ++++++++++++++++-
 src/Hl7.Fhir.R5/Model/Generated/Expression.cs |   27 +-
 .../Model/Generated/ExtendedContactDetail.cs  |   30 +-
 .../Model/Generated/FamilyMemberHistory.cs    |  143 ++-
 src/Hl7.Fhir.R5/Model/Generated/Flag.cs       |   38 +-
 .../Model/Generated/FormularyItem.cs          |   23 +-
 .../Model/Generated/GenomicStudy.cs           |  200 +++-
 src/Hl7.Fhir.R5/Model/Generated/Goal.cs       |   83 +-
 .../Model/Generated/GraphDefinition.cs        |  164 ++-
 src/Hl7.Fhir.R5/Model/Generated/Group.cs      |   92 +-
 .../Model/Generated/GuidanceResponse.cs       |   56 +-
 .../Model/Generated/HealthcareService.cs      |  101 +-
 src/Hl7.Fhir.R5/Model/Generated/HumanName.cs  |   33 +-
 .../Model/Generated/ICanonicalResource.cs     |    2 +-
 .../Model/Generated/IMetadataResource.cs      |    2 +-
 .../Model/Generated/ImagingSelection.cs       |  149 ++-
 .../Model/Generated/ImagingStudy.cs           |  158 ++-
 .../Model/Generated/Immunization.cs           |  182 ++-
 .../Model/Generated/ImmunizationEvaluation.cs |   53 +-
 .../Generated/ImmunizationRecommendation.cs   |   95 +-
 .../Model/Generated/ImplementationGuide.cs    |  344 +++++-
 src/Hl7.Fhir.R5/Model/Generated/Ingredient.cs |  140 ++-
 .../Model/Generated/InsurancePlan.cs          |  230 +++-
 .../Model/Generated/InventoryItem.cs          |  179 ++-
 .../Model/Generated/InventoryReport.cs        |   89 +-
 src/Hl7.Fhir.R5/Model/Generated/Invoice.cs    |  110 +-
 src/Hl7.Fhir.R5/Model/Generated/Library.cs    |  113 +-
 src/Hl7.Fhir.R5/Model/Generated/Linkage.cs    |   41 +-
 src/Hl7.Fhir.R5/Model/Generated/List.cs       |   77 +-
 src/Hl7.Fhir.R5/Model/Generated/Location.cs   |   89 +-
 .../Generated/ManufacturedItemDefinition.cs   |  116 +-
 .../Model/Generated/MarketingStatus.cs        |   27 +-
 src/Hl7.Fhir.R5/Model/Generated/Measure.cs    |  335 +++++-
 .../Model/Generated/MeasureReport.cs          |  221 +++-
 src/Hl7.Fhir.R5/Model/Generated/Medication.cs |   80 +-
 .../Generated/MedicationAdministration.cs     |  125 +-
 .../Model/Generated/MedicationDispense.cs     |  137 ++-
 .../Model/Generated/MedicationKnowledge.cs    |  437 ++++++-
 .../Model/Generated/MedicationRequest.cs      |  188 ++-
 .../Model/Generated/MedicationStatement.cs    |   83 +-
 .../Generated/MedicinalProductDefinition.cs   |  242 +++-
 .../Model/Generated/MessageDefinition.cs      |  134 ++-
 .../Model/Generated/MessageHeader.cs          |  116 +-
 .../Model/Generated/MolecularSequence.cs      |  128 ++-
 .../Model/Generated/MonetaryComponent.cs      |   24 +-
 src/Hl7.Fhir.R5/Model/Generated/Money.cs      |   18 +-
 .../Model/Generated/NamingSystem.cs           |  137 ++-
 .../Model/Generated/NutritionIntake.cs        |  143 ++-
 .../Model/Generated/NutritionOrder.cs         |  320 +++++-
 .../Model/Generated/NutritionProduct.cs       |  131 ++-
 .../Model/Generated/Observation.cs            |  176 ++-
 .../Model/Generated/ObservationDefinition.cs  |  197 +++-
 .../Model/Generated/OperationDefinition.cs    |  209 +++-
 .../Model/Generated/Organization.cs           |   68 +-
 .../Generated/OrganizationAffiliation.cs      |   50 +-
 .../Generated/PackagedProductDefinition.cs    |  158 ++-
 .../Model/Generated/ParameterDefinition.cs    |   33 +-
 src/Hl7.Fhir.R5/Model/Generated/Patient.cs    |  131 ++-
 .../Model/Generated/PaymentNotice.cs          |   50 +-
 .../Model/Generated/PaymentReconciliation.cs  |  170 ++-
 src/Hl7.Fhir.R5/Model/Generated/Permission.cs |  140 ++-
 src/Hl7.Fhir.R5/Model/Generated/Person.cs     |   89 +-
 .../Model/Generated/PlanDefinition.cs         |  449 +++++++-
 .../Model/Generated/Practitioner.cs           |   89 +-
 .../Model/Generated/PractitionerRole.cs       |   56 +-
 src/Hl7.Fhir.R5/Model/Generated/Procedure.cs  |  140 ++-
 .../Model/Generated/ProductShelfLife.cs       |   21 +-
 src/Hl7.Fhir.R5/Model/Generated/Provenance.cs |   98 +-
 .../Model/Generated/Questionnaire.cs          |  206 +++-
 .../Model/Generated/QuestionnaireResponse.cs  |   92 +-
 src/Hl7.Fhir.R5/Model/Generated/Ratio.cs      |   18 +-
 src/Hl7.Fhir.R5/Model/Generated/RatioRange.cs |   21 +-
 .../Model/Generated/RegulatedAuthorization.cs |   86 +-
 .../Model/Generated/RelatedPerson.cs          |   68 +-
 .../Model/Generated/RequestOrchestration.cs   |  293 ++++-
 .../Model/Generated/Requirements.cs           |  119 +-
 .../Model/Generated/ResearchStudy.cs          |  275 ++++-
 .../Model/Generated/ResearchSubject.cs        |   71 +-
 .../Model/Generated/RiskAssessment.cs         |   92 +-
 .../Model/Generated/SampledData.cs            |   42 +-
 src/Hl7.Fhir.R5/Model/Generated/Schedule.cs   |   41 +-
 .../Model/Generated/SearchParameter.cs        |  125 +-
 .../Model/Generated/ServiceRequest.cs         |  164 ++-
 src/Hl7.Fhir.R5/Model/Generated/Slot.cs       |   47 +-
 src/Hl7.Fhir.R5/Model/Generated/Specimen.cs   |  164 ++-
 .../Model/Generated/SpecimenDefinition.cs     |  215 +++-
 .../Model/Generated/StructureMap.cs           |  314 ++++-
 .../Model/Generated/Subscription.cs           |  110 +-
 .../Model/Generated/SubscriptionStatus.cs     |   59 +-
 .../Model/Generated/SubscriptionTopic.cs      |  215 +++-
 src/Hl7.Fhir.R5/Model/Generated/Substance.cs  |   59 +-
 .../Model/Generated/SubstanceDefinition.cs    |  398 ++++++-
 .../Model/Generated/SubstanceNucleicAcid.cs   |  110 +-
 .../Model/Generated/SubstancePolymer.cs       |  173 ++-
 .../Model/Generated/SubstanceProtein.cs       |   62 +-
 .../SubstanceReferenceInformation.cs          |  104 +-
 .../Generated/SubstanceSourceMaterial.cs      |  194 +++-
 .../Model/Generated/SupplyDelivery.cs         |   65 +-
 .../Model/Generated/SupplyRequest.cs          |   80 +-
 src/Hl7.Fhir.R5/Model/Generated/Task.cs       |  188 ++-
 .../Model/Generated/Template-Bindings.cs      |    2 +-
 .../Model/Generated/Template-ModelInfo.cs     |    2 +-
 .../Generated/TerminologyCapabilities.cs      |  293 ++++-
 src/Hl7.Fhir.R5/Model/Generated/TestPlan.cs   |  227 +++-
 src/Hl7.Fhir.R5/Model/Generated/TestReport.cs |  233 +++-
 src/Hl7.Fhir.R5/Model/Generated/TestScript.cs |  569 +++++++++-
 src/Hl7.Fhir.R5/Model/Generated/Timing.cs     |   78 +-
 src/Hl7.Fhir.R5/Model/Generated/Transport.cs  |  167 ++-
 .../Model/Generated/TriggerDefinition.cs      |   33 +-
 .../Model/Generated/VerificationResult.cs     |  146 ++-
 .../Model/Generated/VirtualServiceDetail.cs   |   27 +-
 .../Model/Generated/VisionPrescription.cs     |  110 +-
 .../Model/Generated/_GeneratorLog.cs          |    2 +-
 src/Hl7.Fhir.STU3/Model/Generated/Account.cs  |    6 +-
 .../Model/Generated/ActivityDefinition.cs     |    6 +-
 .../Model/Generated/AdverseEvent.cs           |    4 +-
 .../Model/Generated/AllergyIntolerance.cs     |    4 +-
 .../Model/Generated/Appointment.cs            |    4 +-
 .../Model/Generated/AppointmentResponse.cs    |    2 +-
 .../Model/Generated/AuditEvent.cs             |   12 +-
 src/Hl7.Fhir.STU3/Model/Generated/Basic.cs    |    2 +-
 src/Hl7.Fhir.STU3/Model/Generated/BodySite.cs |    2 +-
 .../Model/Generated/CapabilityStatement.cs    |   32 +-
 src/Hl7.Fhir.STU3/Model/Generated/CarePlan.cs |    6 +-
 src/Hl7.Fhir.STU3/Model/Generated/CareTeam.cs |    4 +-
 .../Model/Generated/ChargeItem.cs             |    4 +-
 src/Hl7.Fhir.STU3/Model/Generated/Claim.cs    |   24 +-
 .../Model/Generated/ClaimResponse.cs          |   22 +-
 .../Model/Generated/ClinicalImpression.cs     |    6 +-
 .../Model/Generated/CodeSystem.cs             |   12 +-
 .../Model/Generated/Communication.cs          |    4 +-
 .../Model/Generated/CommunicationRequest.cs   |    6 +-
 .../Model/Generated/CompartmentDefinition.cs  |    4 +-
 .../Model/Generated/Composition.cs            |   10 +-
 .../Model/Generated/ConceptMap.cs             |   12 +-
 .../Model/Generated/Condition.cs              |    6 +-
 src/Hl7.Fhir.STU3/Model/Generated/Consent.cs  |   14 +-
 src/Hl7.Fhir.STU3/Model/Generated/Contract.cs |   20 +-
 src/Hl7.Fhir.STU3/Model/Generated/Coverage.cs |    4 +-
 .../Model/Generated/DataElement.cs            |    4 +-
 .../Model/Generated/DataRequirement.cs        |    4 +-
 .../Model/Generated/DetectedIssue.cs          |    4 +-
 src/Hl7.Fhir.STU3/Model/Generated/Device.cs   |    4 +-
 .../Model/Generated/DeviceComponent.cs        |    4 +-
 .../Model/Generated/DeviceMetric.cs           |    4 +-
 .../Model/Generated/DeviceRequest.cs          |    4 +-
 .../Model/Generated/DeviceUseStatement.cs     |    2 +-
 .../Model/Generated/DiagnosticReport.cs       |    6 +-
 .../Model/Generated/DocumentManifest.cs       |    6 +-
 .../Model/Generated/DocumentReference.cs      |   10 +-
 .../Model/Generated/ElementDefinition.cs      |   16 +-
 .../Model/Generated/EligibilityRequest.cs     |    2 +-
 .../Model/Generated/EligibilityResponse.cs    |   10 +-
 .../Model/Generated/Encounter.cs              |   14 +-
 src/Hl7.Fhir.STU3/Model/Generated/Endpoint.cs |    2 +-
 .../Model/Generated/EnrollmentRequest.cs      |    2 +-
 .../Model/Generated/EnrollmentResponse.cs     |    2 +-
 .../Model/Generated/EpisodeOfCare.cs          |    6 +-
 .../Model/Generated/ExpansionProfile.cs       |   16 +-
 .../Model/Generated/ExplanationOfBenefit.cs   |   38 +-
 .../Model/Generated/FamilyMemberHistory.cs    |    4 +-
 src/Hl7.Fhir.STU3/Model/Generated/Flag.cs     |    2 +-
 src/Hl7.Fhir.STU3/Model/Generated/Goal.cs     |    4 +-
 .../Model/Generated/GraphDefinition.cs        |    8 +-
 src/Hl7.Fhir.STU3/Model/Generated/Group.cs    |    6 +-
 .../Model/Generated/GuidanceResponse.cs       |    2 +-
 .../Model/Generated/HealthcareService.cs      |    6 +-
 .../Model/Generated/ImagingManifest.cs        |    8 +-
 .../Model/Generated/ImagingStudy.cs           |    6 +-
 .../Model/Generated/Immunization.cs           |   10 +-
 .../Generated/ImmunizationRecommendation.cs   |    8 +-
 .../Model/Generated/ImplementationGuide.cs    |   12 +-
 src/Hl7.Fhir.STU3/Model/Generated/Library.cs  |    2 +-
 src/Hl7.Fhir.STU3/Model/Generated/Linkage.cs  |    4 +-
 src/Hl7.Fhir.STU3/Model/Generated/List.cs     |    4 +-
 src/Hl7.Fhir.STU3/Model/Generated/Location.cs |    4 +-
 src/Hl7.Fhir.STU3/Model/Generated/Measure.cs  |   10 +-
 .../Model/Generated/MeasureReport.cs          |   12 +-
 src/Hl7.Fhir.STU3/Model/Generated/Media.cs    |    2 +-
 .../Model/Generated/Medication.cs             |   10 +-
 .../Generated/MedicationAdministration.cs     |    6 +-
 .../Model/Generated/MedicationDispense.cs     |    6 +-
 .../Model/Generated/MedicationRequest.cs      |    8 +-
 .../Model/Generated/MedicationStatement.cs    |    2 +-
 .../Model/Generated/MessageDefinition.cs      |    6 +-
 .../Model/Generated/MessageHeader.cs          |    8 +-
 .../Model/Generated/NamingSystem.cs           |    4 +-
 .../Model/Generated/NutritionOrder.cs         |   14 +-
 .../Model/Generated/Observation.cs            |    8 +-
 .../Model/Generated/OperationDefinition.cs    |    8 +-
 .../Model/Generated/Organization.cs           |    4 +-
 src/Hl7.Fhir.STU3/Model/Generated/Patient.cs  |   10 +-
 .../Model/Generated/PaymentNotice.cs          |    2 +-
 .../Model/Generated/PaymentReconciliation.cs  |    6 +-
 src/Hl7.Fhir.STU3/Model/Generated/Person.cs   |    4 +-
 .../Model/Generated/PlanDefinition.cs         |   16 +-
 .../Model/Generated/Practitioner.cs           |    4 +-
 .../Model/Generated/PractitionerRole.cs       |    6 +-
 .../Model/Generated/Procedure.cs              |    6 +-
 .../Model/Generated/ProcedureRequest.cs       |    4 +-
 .../Model/Generated/ProcessRequest.cs         |    4 +-
 .../Model/Generated/ProcessResponse.cs        |    4 +-
 .../Model/Generated/Provenance.cs             |    6 +-
 .../Model/Generated/Questionnaire.cs          |    8 +-
 .../Model/Generated/QuestionnaireResponse.cs  |    6 +-
 .../Model/Generated/ReferralRequest.cs        |    4 +-
 .../Model/Generated/RelatedPerson.cs          |    2 +-
 .../Model/Generated/RequestGroup.cs           |    8 +-
 .../Model/Generated/ResearchStudy.cs          |    4 +-
 .../Model/Generated/ResearchSubject.cs        |    2 +-
 .../Model/Generated/RiskAssessment.cs         |    4 +-
 src/Hl7.Fhir.STU3/Model/Generated/Schedule.cs |    2 +-
 .../Model/Generated/SearchParameter.cs        |    4 +-
 src/Hl7.Fhir.STU3/Model/Generated/Sequence.cs |   10 +-
 .../Model/Generated/ServiceDefinition.cs      |    2 +-
 src/Hl7.Fhir.STU3/Model/Generated/Slot.cs     |    2 +-
 src/Hl7.Fhir.STU3/Model/Generated/Specimen.cs |    8 +-
 .../Model/Generated/StructureDefinition.cs    |    8 +-
 .../Model/Generated/StructureMap.cs           |   18 +-
 .../Model/Generated/Subscription.cs           |    4 +-
 .../Model/Generated/Substance.cs              |    6 +-
 .../Model/Generated/SupplyDelivery.cs         |    4 +-
 .../Model/Generated/SupplyRequest.cs          |    6 +-
 src/Hl7.Fhir.STU3/Model/Generated/Task.cs     |   10 +-
 .../Model/Generated/TestReport.cs             |   20 +-
 .../Model/Generated/TestScript.cs             |   54 +-
 src/Hl7.Fhir.STU3/Model/Generated/Timing.cs   |    2 +-
 src/Hl7.Fhir.STU3/Model/Generated/ValueSet.cs |   18 +-
 .../Model/Generated/VisionPrescription.cs     |    4 +-
 .../Validation/SearchDataExtraction.cs        |    4 +-
 .../SnapshotGeneratorManifestTests.cs         |    6 +-
 .../Snapshot/SnapshotGeneratorTest.cs         |    2 +-
 589 files changed, 26541 insertions(+), 2581 deletions(-)

diff --git a/src/Hl7.Fhir.Base/Introspection/ClassMapping.cs b/src/Hl7.Fhir.Base/Introspection/ClassMapping.cs
index ef314bd070..9de5ecf76f 100644
--- a/src/Hl7.Fhir.Base/Introspection/ClassMapping.cs
+++ b/src/Hl7.Fhir.Base/Introspection/ClassMapping.cs
@@ -92,11 +92,11 @@ public static bool TryCreate(Type type, [NotNullWhen(true)]out ClassMapping? res
 
             result = new ClassMapping(collectTypeName(typeAttribute, type), type, release)
             {
-                IsResource = typeAttribute.IsResource || type.CanBeTreatedAsType(typeof(Resource)),
+                IsResource = type.CanBeTreatedAsType(typeof(Resource)),
                 IsCodeOfT = ReflectionHelper.IsClosedGenericType(type) &&
                                 ReflectionHelper.IsConstructedFromGenericTypeDefinition(type, typeof(Code<>)),
                 IsFhirPrimitive = typeof(PrimitiveType).IsAssignableFrom(type),
-                IsBackboneType = typeAttribute.IsNestedType || backboneAttribute is not null,
+                IsBackboneType = backboneAttribute is not null,
                 DefinitionPath = backboneAttribute?.DefinitionPath,
                 IsBindable = GetAttribute<BindableAttribute>(type.GetTypeInfo(), release)?.IsBindable ?? false,
                 Canonical = typeAttribute.Canonical,
diff --git a/src/Hl7.Fhir.Base/Introspection/FhirTypeAttribute.cs b/src/Hl7.Fhir.Base/Introspection/FhirTypeAttribute.cs
index 24be913e18..5ab5e3611f 100644
--- a/src/Hl7.Fhir.Base/Introspection/FhirTypeAttribute.cs
+++ b/src/Hl7.Fhir.Base/Introspection/FhirTypeAttribute.cs
@@ -37,7 +37,7 @@ namespace Hl7.Fhir.Introspection
     /// <summary>
     /// This attribute is applied to classes that represent FHIR datatypes and resources.
     /// </summary>
-    [AttributeUsage(AttributeTargets.Class, Inherited = false, AllowMultiple = false)]
+    [AttributeUsage(AttributeTargets.Class, Inherited = false)]
     public sealed class FhirTypeAttribute : VersionedAttribute
     {
         public FhirTypeAttribute(string name)
@@ -56,21 +56,9 @@ public FhirTypeAttribute(string name, string canonical)
         /// </summary>
         public string Name { get; private set; }
 
-        /// <summary>
-        /// Indicates whether this class represents the nested complex type for a (backbone) element.
-        /// </summary>
-        public bool IsNestedType { get; set; }
-
-        /// <summary>
-        /// Indicates whether this class represents a Resource
-        /// </summary>
-        public bool IsResource { get; set; }
-
         /// <summary>
         /// The canonical of the StructureDefinition defining this type.
         /// </summary>
         public string? Canonical { get; set; }
     }
-}
-
-#nullable restore
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/src/Hl7.Fhir.Base/Model/Generated/Binary.cs b/src/Hl7.Fhir.Base/Model/Generated/Binary.cs
index 6a1859a1a6..911bd9d092 100644
--- a/src/Hl7.Fhir.Base/Model/Generated/Binary.cs
+++ b/src/Hl7.Fhir.Base/Model/Generated/Binary.cs
@@ -55,7 +55,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Binary","http://hl7.org/fhir/StructureDefinition/Binary", IsResource=true)]
+  [FhirType("Binary","http://hl7.org/fhir/StructureDefinition/Binary")]
   public partial class Binary : Hl7.Fhir.Model.Resource
   {
     /// <summary>
diff --git a/src/Hl7.Fhir.Base/Model/Generated/Bundle.cs b/src/Hl7.Fhir.Base/Model/Generated/Bundle.cs
index 3eecfed903..af9e42c614 100644
--- a/src/Hl7.Fhir.Base/Model/Generated/Bundle.cs
+++ b/src/Hl7.Fhir.Base/Model/Generated/Bundle.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Bundle","http://hl7.org/fhir/StructureDefinition/Bundle", IsResource=true)]
+  [FhirType("Bundle","http://hl7.org/fhir/StructureDefinition/Bundle")]
   public partial class Bundle : Hl7.Fhir.Model.Resource, IIdentifiable<Identifier>
   {
     /// <summary>
@@ -945,7 +945,7 @@ public enum HTTPVerb
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Bundle#Link", IsNestedType=true)]
+    [FhirType("Bundle#Link")]
     [BackboneType("Bundle.link")]
     public partial class LinkComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1135,7 +1135,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Bundle#Entry", IsNestedType=true)]
+    [FhirType("Bundle#Entry")]
     [BackboneType("Bundle.entry")]
     public partial class EntryComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1407,7 +1407,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Bundle#Search", IsNestedType=true)]
+    [FhirType("Bundle#Search")]
     [BackboneType("Bundle.entry.search")]
     public partial class SearchComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1596,7 +1596,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Bundle#Request", IsNestedType=true)]
+    [FhirType("Bundle#Request")]
     [BackboneType("Bundle.entry.request")]
     public partial class RequestComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1959,7 +1959,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Bundle#Response", IsNestedType=true)]
+    [FhirType("Bundle#Response")]
     [BackboneType("Bundle.entry.response")]
     public partial class ResponseComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.Base/Model/Generated/DomainResource.cs b/src/Hl7.Fhir.Base/Model/Generated/DomainResource.cs
index cab8ebf3d5..576631b9eb 100644
--- a/src/Hl7.Fhir.Base/Model/Generated/DomainResource.cs
+++ b/src/Hl7.Fhir.Base/Model/Generated/DomainResource.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("DomainResource","http://hl7.org/fhir/StructureDefinition/DomainResource", IsResource=true)]
+  [FhirType("DomainResource","http://hl7.org/fhir/StructureDefinition/DomainResource")]
   public abstract partial class DomainResource : Hl7.Fhir.Model.Resource, Hl7.Fhir.Model.IModifierExtendable
   {
     /// <summary>
diff --git a/src/Hl7.Fhir.Base/Model/Generated/OperationOutcome.cs b/src/Hl7.Fhir.Base/Model/Generated/OperationOutcome.cs
index 0f773dcbad..692f9afc3d 100644
--- a/src/Hl7.Fhir.Base/Model/Generated/OperationOutcome.cs
+++ b/src/Hl7.Fhir.Base/Model/Generated/OperationOutcome.cs
@@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("OperationOutcome","http://hl7.org/fhir/StructureDefinition/OperationOutcome", IsResource=true)]
+  [FhirType("OperationOutcome","http://hl7.org/fhir/StructureDefinition/OperationOutcome")]
   public partial class OperationOutcome : Hl7.Fhir.Model.DomainResource
   {
     /// <summary>
@@ -316,7 +316,7 @@ public enum IssueType
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("OperationOutcome#Issue", IsNestedType=true)]
+    [FhirType("OperationOutcome#Issue")]
     [BackboneType("OperationOutcome.issue")]
     public partial class IssueComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.Base/Model/Generated/Parameters.cs b/src/Hl7.Fhir.Base/Model/Generated/Parameters.cs
index bc9f010e53..a921774fe0 100644
--- a/src/Hl7.Fhir.Base/Model/Generated/Parameters.cs
+++ b/src/Hl7.Fhir.Base/Model/Generated/Parameters.cs
@@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Parameters","http://hl7.org/fhir/StructureDefinition/Parameters", IsResource=true)]
+  [FhirType("Parameters","http://hl7.org/fhir/StructureDefinition/Parameters")]
   public partial class Parameters : Hl7.Fhir.Model.Resource
   {
     /// <summary>
@@ -68,7 +68,7 @@ public partial class Parameters : Hl7.Fhir.Model.Resource
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Parameters#Parameter", IsNestedType=true)]
+    [FhirType("Parameters#Parameter")]
     [BackboneType("Parameters.parameter")]
     public partial class ParameterComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.Base/Model/Generated/Resource.cs b/src/Hl7.Fhir.Base/Model/Generated/Resource.cs
index 72769aab16..216336e366 100644
--- a/src/Hl7.Fhir.Base/Model/Generated/Resource.cs
+++ b/src/Hl7.Fhir.Base/Model/Generated/Resource.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Resource","http://hl7.org/fhir/StructureDefinition/Resource", IsResource=true)]
+  [FhirType("Resource","http://hl7.org/fhir/StructureDefinition/Resource")]
   public abstract partial class Resource : Hl7.Fhir.Model.Base
   {
     /// <summary>
diff --git a/src/Hl7.Fhir.Conformance/Model/Generated/CapabilityStatement.cs b/src/Hl7.Fhir.Conformance/Model/Generated/CapabilityStatement.cs
index 8f172e4b8f..4def5dd30c 100644
--- a/src/Hl7.Fhir.Conformance/Model/Generated/CapabilityStatement.cs
+++ b/src/Hl7.Fhir.Conformance/Model/Generated/CapabilityStatement.cs
@@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("CapabilityStatement","http://hl7.org/fhir/StructureDefinition/CapabilityStatement", IsResource=true)]
+  [FhirType("CapabilityStatement","http://hl7.org/fhir/StructureDefinition/CapabilityStatement")]
   public partial class CapabilityStatement : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -362,7 +362,7 @@ public enum DocumentMode
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CapabilityStatement#Software", IsNestedType=true)]
+    [FhirType("CapabilityStatement#Software")]
     [BackboneType("CapabilityStatement.software")]
     public partial class SoftwareComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -593,7 +593,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CapabilityStatement#Implementation", IsNestedType=true)]
+    [FhirType("CapabilityStatement#Implementation")]
     [BackboneType("CapabilityStatement.implementation")]
     public partial class ImplementationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -811,7 +811,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CapabilityStatement#Rest", IsNestedType=true)]
+    [FhirType("CapabilityStatement#Rest")]
     [BackboneType("CapabilityStatement.rest")]
     public partial class RestComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1174,7 +1174,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CapabilityStatement#Security", IsNestedType=true)]
+    [FhirType("CapabilityStatement#Security")]
     [BackboneType("CapabilityStatement.rest.security")]
     public partial class SecurityComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1389,7 +1389,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CapabilityStatement#Resource", IsNestedType=true)]
+    [FhirType("CapabilityStatement#Resource")]
     [BackboneType("CapabilityStatement.rest.resource")]
     public partial class ResourceComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2228,7 +2228,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CapabilityStatement#ResourceInteraction", IsNestedType=true)]
+    [FhirType("CapabilityStatement#ResourceInteraction")]
     [BackboneType("CapabilityStatement.rest.resource.interaction")]
     public partial class ResourceInteractionComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2419,7 +2419,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CapabilityStatement#SearchParam", IsNestedType=true)]
+    [FhirType("CapabilityStatement#SearchParam")]
     [BackboneType("CapabilityStatement.rest.resource.searchParam")]
     public partial class SearchParamComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2698,7 +2698,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CapabilityStatement#Operation", IsNestedType=true)]
+    [FhirType("CapabilityStatement#Operation")]
     [BackboneType("CapabilityStatement.rest.resource.operation")]
     public partial class OperationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2930,7 +2930,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CapabilityStatement#SystemInteraction", IsNestedType=true)]
+    [FhirType("CapabilityStatement#SystemInteraction")]
     [BackboneType("CapabilityStatement.rest.interaction")]
     public partial class SystemInteractionComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -3121,7 +3121,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CapabilityStatement#Messaging", IsNestedType=true)]
+    [FhirType("CapabilityStatement#Messaging")]
     [BackboneType("CapabilityStatement.messaging")]
     public partial class MessagingComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -3360,7 +3360,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CapabilityStatement#Endpoint", IsNestedType=true)]
+    [FhirType("CapabilityStatement#Endpoint")]
     [BackboneType("CapabilityStatement.messaging.endpoint")]
     public partial class EndpointComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -3533,7 +3533,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CapabilityStatement#SupportedMessage", IsNestedType=true)]
+    [FhirType("CapabilityStatement#SupportedMessage")]
     [BackboneType("CapabilityStatement.messaging.supportedMessage")]
     public partial class SupportedMessageComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -3724,7 +3724,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CapabilityStatement#Document", IsNestedType=true)]
+    [FhirType("CapabilityStatement#Document")]
     [BackboneType("CapabilityStatement.document")]
     public partial class DocumentComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.Conformance/Model/Generated/CodeSystem.cs b/src/Hl7.Fhir.Conformance/Model/Generated/CodeSystem.cs
index c2a8bc8c84..1459dfd501 100644
--- a/src/Hl7.Fhir.Conformance/Model/Generated/CodeSystem.cs
+++ b/src/Hl7.Fhir.Conformance/Model/Generated/CodeSystem.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("CodeSystem","http://hl7.org/fhir/StructureDefinition/CodeSystem", IsResource=true)]
+  [FhirType("CodeSystem","http://hl7.org/fhir/StructureDefinition/CodeSystem")]
   public partial class CodeSystem : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -154,7 +154,7 @@ public enum PropertyType
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CodeSystem#Filter", IsNestedType=true)]
+    [FhirType("CodeSystem#Filter")]
     [BackboneType("CodeSystem.filter")]
     public partial class FilterComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -433,7 +433,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CodeSystem#Property", IsNestedType=true)]
+    [FhirType("CodeSystem#Property")]
     [BackboneType("CodeSystem.property")]
     public partial class PropertyComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -711,7 +711,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CodeSystem#ConceptDefinition", IsNestedType=true)]
+    [FhirType("CodeSystem#ConceptDefinition")]
     [BackboneType("CodeSystem.concept")]
     public partial class ConceptDefinitionComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1021,7 +1021,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CodeSystem#Designation", IsNestedType=true)]
+    [FhirType("CodeSystem#Designation")]
     [BackboneType("CodeSystem.concept.designation")]
     public partial class DesignationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1263,7 +1263,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CodeSystem#ConceptProperty", IsNestedType=true)]
+    [FhirType("CodeSystem#ConceptProperty")]
     [BackboneType("CodeSystem.concept.property")]
     public partial class ConceptPropertyComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.Conformance/Model/Generated/ElementDefinition.cs b/src/Hl7.Fhir.Conformance/Model/Generated/ElementDefinition.cs
index 95a4575d1b..51ffa7f172 100644
--- a/src/Hl7.Fhir.Conformance/Model/Generated/ElementDefinition.cs
+++ b/src/Hl7.Fhir.Conformance/Model/Generated/ElementDefinition.cs
@@ -309,7 +309,7 @@ public enum AdditionalBindingPurposeVS
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ElementDefinition#Slicing", IsNestedType=true)]
+    [FhirType("ElementDefinition#Slicing")]
     [BackboneType("ElementDefinition.slicing")]
     public partial class SlicingComponent : Hl7.Fhir.Model.Element
     {
@@ -569,7 +569,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ElementDefinition#Discriminator", IsNestedType=true)]
+    [FhirType("ElementDefinition#Discriminator")]
     [BackboneType("ElementDefinition.slicing.discriminator")]
     public partial class DiscriminatorComponent : Hl7.Fhir.Model.Element
     {
@@ -761,7 +761,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ElementDefinition#Base", IsNestedType=true)]
+    [FhirType("ElementDefinition#Base")]
     [BackboneType("ElementDefinition.base")]
     public partial class BaseComponent : Hl7.Fhir.Model.Element
     {
@@ -995,7 +995,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ElementDefinition#TypeRef", IsNestedType=true)]
+    [FhirType("ElementDefinition#TypeRef")]
     [BackboneType("ElementDefinition.type")]
     public partial class TypeRefComponent : Hl7.Fhir.Model.Element
     {
@@ -1321,7 +1321,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ElementDefinition#Example", IsNestedType=true)]
+    [FhirType("ElementDefinition#Example")]
     [BackboneType("ElementDefinition.example")]
     public partial class ExampleComponent : Hl7.Fhir.Model.Element
     {
@@ -1493,7 +1493,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ElementDefinition#Constraint", IsNestedType=true)]
+    [FhirType("ElementDefinition#Constraint")]
     [BackboneType("ElementDefinition.constraint")]
     public partial class ConstraintComponent : Hl7.Fhir.Model.Element
     {
@@ -1947,7 +1947,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ElementDefinition#ElementDefinitionBinding", IsNestedType=true)]
+    [FhirType("ElementDefinition#ElementDefinitionBinding")]
     [BackboneType("ElementDefinition.binding")]
     public partial class ElementDefinitionBindingComponent : Hl7.Fhir.Model.Element
     {
@@ -2208,7 +2208,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ElementDefinition#Additional", IsNestedType=true)]
+    [FhirType("ElementDefinition#Additional")]
     [BackboneType("ElementDefinition.binding.additional")]
     public partial class AdditionalComponent : Hl7.Fhir.Model.Element
     {
@@ -2555,7 +2555,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ElementDefinition#Mapping", IsNestedType=true)]
+    [FhirType("ElementDefinition#Mapping")]
     [BackboneType("ElementDefinition.mapping")]
     public partial class MappingComponent : Hl7.Fhir.Model.Element
     {
diff --git a/src/Hl7.Fhir.Conformance/Model/Generated/StructureDefinition.cs b/src/Hl7.Fhir.Conformance/Model/Generated/StructureDefinition.cs
index 6ea94c7722..e14ea68be0 100644
--- a/src/Hl7.Fhir.Conformance/Model/Generated/StructureDefinition.cs
+++ b/src/Hl7.Fhir.Conformance/Model/Generated/StructureDefinition.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("StructureDefinition","http://hl7.org/fhir/StructureDefinition/StructureDefinition", IsResource=true)]
+  [FhirType("StructureDefinition","http://hl7.org/fhir/StructureDefinition/StructureDefinition")]
   public partial class StructureDefinition : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -151,7 +151,7 @@ public enum ExtensionContextType
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("StructureDefinition#Mapping", IsNestedType=true)]
+    [FhirType("StructureDefinition#Mapping")]
     [BackboneType("StructureDefinition.mapping")]
     public partial class MappingComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -425,7 +425,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("StructureDefinition#Context", IsNestedType=true)]
+    [FhirType("StructureDefinition#Context")]
     [BackboneType("StructureDefinition.context")]
     public partial class ContextComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -616,7 +616,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("StructureDefinition#Snapshot", IsNestedType=true)]
+    [FhirType("StructureDefinition#Snapshot")]
     [BackboneType("StructureDefinition.snapshot")]
     public partial class SnapshotComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -743,7 +743,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("StructureDefinition#Differential", IsNestedType=true)]
+    [FhirType("StructureDefinition#Differential")]
     [BackboneType("StructureDefinition.differential")]
     public partial class DifferentialComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.Conformance/Model/Generated/ValueSet.cs b/src/Hl7.Fhir.Conformance/Model/Generated/ValueSet.cs
index feafaf4758..795abde72a 100644
--- a/src/Hl7.Fhir.Conformance/Model/Generated/ValueSet.cs
+++ b/src/Hl7.Fhir.Conformance/Model/Generated/ValueSet.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("ValueSet","http://hl7.org/fhir/StructureDefinition/ValueSet", IsResource=true)]
+  [FhirType("ValueSet","http://hl7.org/fhir/StructureDefinition/ValueSet")]
   public partial class ValueSet : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -67,7 +67,7 @@ public partial class ValueSet : Hl7.Fhir.Model.DomainResource, IIdentifiable<Lis
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ValueSet#Compose", IsNestedType=true)]
+    [FhirType("ValueSet#Compose")]
     [BackboneType("ValueSet.compose")]
     public partial class ComposeComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -350,7 +350,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ValueSet#ConceptSet", IsNestedType=true)]
+    [FhirType("ValueSet#ConceptSet")]
     [BackboneType("ValueSet.compose.include")]
     public partial class ConceptSetComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -677,7 +677,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ValueSet#ConceptReference", IsNestedType=true)]
+    [FhirType("ValueSet#ConceptReference")]
     [BackboneType("ValueSet.compose.include.concept")]
     public partial class ConceptReferenceComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -892,7 +892,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ValueSet#Designation", IsNestedType=true)]
+    [FhirType("ValueSet#Designation")]
     [BackboneType("ValueSet.compose.include.concept.designation")]
     public partial class DesignationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1135,7 +1135,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ValueSet#Filter", IsNestedType=true)]
+    [FhirType("ValueSet#Filter")]
     [BackboneType("ValueSet.compose.include.filter")]
     public partial class FilterComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1372,7 +1372,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ValueSet#Expansion", IsNestedType=true)]
+    [FhirType("ValueSet#Expansion")]
     [BackboneType("ValueSet.expansion")]
     public partial class ExpansionComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1768,7 +1768,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ValueSet#Parameter", IsNestedType=true)]
+    [FhirType("ValueSet#Parameter")]
     [BackboneType("ValueSet.expansion.parameter")]
     public partial class ParameterComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1940,7 +1940,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ValueSet#Property", IsNestedType=true)]
+    [FhirType("ValueSet#Property")]
     [BackboneType("ValueSet.expansion.property")]
     public partial class PropertyComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2128,7 +2128,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ValueSet#Contains", IsNestedType=true)]
+    [FhirType("ValueSet#Contains")]
     [BackboneType("ValueSet.expansion.contains")]
     public partial class ContainsComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2565,7 +2565,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ValueSet#ConceptProperty", IsNestedType=true)]
+    [FhirType("ValueSet#ConceptProperty")]
     [BackboneType("ValueSet.expansion.contains.property")]
     public partial class ConceptPropertyComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2764,7 +2764,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ValueSet#ConceptSubProperty", IsNestedType=true)]
+    [FhirType("ValueSet#ConceptSubProperty")]
     [BackboneType("ValueSet.expansion.contains.property.subProperty")]
     public partial class ConceptSubPropertyComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2934,7 +2934,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("ValueSet#Scope", IsNestedType=true)]
+    [FhirType("ValueSet#Scope")]
     [BackboneType("ValueSet.scope")]
     public partial class ScopeComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4/Model/Generated/Account.cs b/src/Hl7.Fhir.R4/Model/Generated/Account.cs
index c9e263f1a3..1c31eb6190 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/Account.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/Account.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Account","http://hl7.org/fhir/StructureDefinition/Account", IsResource=true)]
+  [FhirType("Account","http://hl7.org/fhir/StructureDefinition/Account")]
   public partial class Account : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>, ICoded<Hl7.Fhir.Model.CodeableConcept>
   {
     /// <summary>
@@ -109,7 +109,7 @@ public enum AccountStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Account#Coverage", IsNestedType=true)]
+    [FhirType("Account#Coverage")]
     [BackboneType("Account.coverage")]
     public partial class CoverageComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -281,7 +281,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Account#Guarantor", IsNestedType=true)]
+    [FhirType("Account#Guarantor")]
     [BackboneType("Account.guarantor")]
     public partial class GuarantorComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4/Model/Generated/ActivityDefinition.cs b/src/Hl7.Fhir.R4/Model/Generated/ActivityDefinition.cs
index 3b54c5954c..3557852d14 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/ActivityDefinition.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/ActivityDefinition.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("ActivityDefinition","http://hl7.org/fhir/StructureDefinition/ActivityDefinition", IsResource=true)]
+  [FhirType("ActivityDefinition","http://hl7.org/fhir/StructureDefinition/ActivityDefinition")]
   public partial class ActivityDefinition : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>, ICoded<List<Hl7.Fhir.Model.CodeableConcept>>
   {
     /// <summary>
@@ -167,7 +167,7 @@ public enum RequestResourceType
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ActivityDefinition#Participant", IsNestedType=true)]
+    [FhirType("ActivityDefinition#Participant")]
     [BackboneType("ActivityDefinition.participant")]
     public partial class ParticipantComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -341,7 +341,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ActivityDefinition#DynamicValue", IsNestedType=true)]
+    [FhirType("ActivityDefinition#DynamicValue")]
     [BackboneType("ActivityDefinition.dynamicValue")]
     public partial class DynamicValueComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4/Model/Generated/AdverseEvent.cs b/src/Hl7.Fhir.R4/Model/Generated/AdverseEvent.cs
index 6ad04087fb..7ca183a3c5 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/AdverseEvent.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/AdverseEvent.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("AdverseEvent","http://hl7.org/fhir/StructureDefinition/AdverseEvent", IsResource=true)]
+  [FhirType("AdverseEvent","http://hl7.org/fhir/StructureDefinition/AdverseEvent")]
   public partial class AdverseEvent : Hl7.Fhir.Model.DomainResource, IIdentifiable<Identifier>, ICoded<Hl7.Fhir.Model.CodeableConcept>
   {
     /// <summary>
@@ -163,7 +163,7 @@ public enum AdverseEventOutcome
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("AdverseEvent#SuspectEntity", IsNestedType=true)]
+    [FhirType("AdverseEvent#SuspectEntity")]
     [BackboneType("AdverseEvent.suspectEntity")]
     public partial class SuspectEntityComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -315,7 +315,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("AdverseEvent#Causality", IsNestedType=true)]
+    [FhirType("AdverseEvent#Causality")]
     [BackboneType("AdverseEvent.suspectEntity.causality")]
     public partial class CausalityComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4/Model/Generated/AllergyIntolerance.cs b/src/Hl7.Fhir.R4/Model/Generated/AllergyIntolerance.cs
index 3a4f6756bc..d1c0385d20 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/AllergyIntolerance.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/AllergyIntolerance.cs
@@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("AllergyIntolerance","http://hl7.org/fhir/StructureDefinition/AllergyIntolerance", IsResource=true)]
+  [FhirType("AllergyIntolerance","http://hl7.org/fhir/StructureDefinition/AllergyIntolerance")]
   public partial class AllergyIntolerance : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>, ICoded<Hl7.Fhir.Model.CodeableConcept>
   {
     /// <summary>
@@ -242,7 +242,7 @@ public enum AllergyIntoleranceSeverity
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("AllergyIntolerance#Reaction", IsNestedType=true)]
+    [FhirType("AllergyIntolerance#Reaction")]
     [BackboneType("AllergyIntolerance.reaction")]
     public partial class ReactionComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4/Model/Generated/Appointment.cs b/src/Hl7.Fhir.R4/Model/Generated/Appointment.cs
index 8a5fd0a958..08a82801f4 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/Appointment.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/Appointment.cs
@@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model
   /// </summary>
   [Serializable]
   [DataContract]
-  [FhirType("Appointment","http://hl7.org/fhir/StructureDefinition/Appointment", IsResource=true)]
+  [FhirType("Appointment","http://hl7.org/fhir/StructureDefinition/Appointment")]
   public partial class Appointment : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>, ICoded<List<Hl7.Fhir.Model.CodeableConcept>>
   {
     /// <summary>
@@ -162,7 +162,7 @@ public enum ParticipantRequired
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Appointment#Participant", IsNestedType=true)]
+    [FhirType("Appointment#Participant")]
     [BackboneType("Appointment.participant")]
     public partial class ParticipantComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4/Model/Generated/AppointmentResponse.cs b/src/Hl7.Fhir.R4/Model/Generated/AppointmentResponse.cs
index 2ffd4f55d1..8fd4699c83 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/AppointmentResponse.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/AppointmentResponse.cs
@@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model
   /// </summary>
   [Serializable]
   [DataContract]
-  [FhirType("AppointmentResponse","http://hl7.org/fhir/StructureDefinition/AppointmentResponse", IsResource=true)]
+  [FhirType("AppointmentResponse","http://hl7.org/fhir/StructureDefinition/AppointmentResponse")]
   public partial class AppointmentResponse : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
diff --git a/src/Hl7.Fhir.R4/Model/Generated/AuditEvent.cs b/src/Hl7.Fhir.R4/Model/Generated/AuditEvent.cs
index 2cfd658945..f725c2647b 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/AuditEvent.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/AuditEvent.cs
@@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("AuditEvent","http://hl7.org/fhir/StructureDefinition/AuditEvent", IsResource=true)]
+  [FhirType("AuditEvent","http://hl7.org/fhir/StructureDefinition/AuditEvent")]
   public partial class AuditEvent : Hl7.Fhir.Model.DomainResource
   {
     /// <summary>
@@ -184,7 +184,7 @@ public enum AuditEventAgentNetworkType
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("AuditEvent#Agent", IsNestedType=true)]
+    [FhirType("AuditEvent#Agent")]
     [BackboneType("AuditEvent.agent")]
     public partial class AgentComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -644,7 +644,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("AuditEvent#Network", IsNestedType=true)]
+    [FhirType("AuditEvent#Network")]
     [BackboneType("AuditEvent.agent.network")]
     public partial class NetworkComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -834,7 +834,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("AuditEvent#Source", IsNestedType=true)]
+    [FhirType("AuditEvent#Source")]
     [BackboneType("AuditEvent.source")]
     public partial class SourceComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1034,7 +1034,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("AuditEvent#Entity", IsNestedType=true)]
+    [FhirType("AuditEvent#Entity")]
     [BackboneType("AuditEvent.entity")]
     public partial class EntityComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1422,7 +1422,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("AuditEvent#Detail", IsNestedType=true)]
+    [FhirType("AuditEvent#Detail")]
     [BackboneType("AuditEvent.entity.detail")]
     public partial class DetailComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4/Model/Generated/Basic.cs b/src/Hl7.Fhir.R4/Model/Generated/Basic.cs
index fb660b36b0..ee64f48ba4 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/Basic.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/Basic.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Basic","http://hl7.org/fhir/StructureDefinition/Basic", IsResource=true)]
+  [FhirType("Basic","http://hl7.org/fhir/StructureDefinition/Basic")]
   public partial class Basic : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>, ICoded<Hl7.Fhir.Model.CodeableConcept>
   {
     /// <summary>
diff --git a/src/Hl7.Fhir.R4/Model/Generated/BiologicallyDerivedProduct.cs b/src/Hl7.Fhir.R4/Model/Generated/BiologicallyDerivedProduct.cs
index ca96fee32f..a377a89fcd 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/BiologicallyDerivedProduct.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/BiologicallyDerivedProduct.cs
@@ -53,7 +53,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("BiologicallyDerivedProduct","http://hl7.org/fhir/StructureDefinition/BiologicallyDerivedProduct", IsResource=true)]
+  [FhirType("BiologicallyDerivedProduct","http://hl7.org/fhir/StructureDefinition/BiologicallyDerivedProduct")]
   public partial class BiologicallyDerivedProduct : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -156,7 +156,7 @@ public enum BiologicallyDerivedProductStorageScale
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("BiologicallyDerivedProduct#Collection", IsNestedType=true)]
+    [FhirType("BiologicallyDerivedProduct#Collection")]
     [BackboneType("BiologicallyDerivedProduct.collection")]
     public partial class CollectionComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -338,7 +338,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("BiologicallyDerivedProduct#Processing", IsNestedType=true)]
+    [FhirType("BiologicallyDerivedProduct#Processing")]
     [BackboneType("BiologicallyDerivedProduct.processing")]
     public partial class ProcessingComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -562,7 +562,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("BiologicallyDerivedProduct#Manipulation", IsNestedType=true)]
+    [FhirType("BiologicallyDerivedProduct#Manipulation")]
     [BackboneType("BiologicallyDerivedProduct.manipulation")]
     public partial class ManipulationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -730,7 +730,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("BiologicallyDerivedProduct#Storage", IsNestedType=true)]
+    [FhirType("BiologicallyDerivedProduct#Storage")]
     [BackboneType("BiologicallyDerivedProduct.storage")]
     public partial class StorageComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4/Model/Generated/BodyStructure.cs b/src/Hl7.Fhir.R4/Model/Generated/BodyStructure.cs
index 98f3e1bd78..4f5e3efc1c 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/BodyStructure.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/BodyStructure.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("BodyStructure","http://hl7.org/fhir/StructureDefinition/BodyStructure", IsResource=true)]
+  [FhirType("BodyStructure","http://hl7.org/fhir/StructureDefinition/BodyStructure")]
   public partial class BodyStructure : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>, ICoded<Hl7.Fhir.Model.CodeableConcept>
   {
     /// <summary>
diff --git a/src/Hl7.Fhir.R4/Model/Generated/CarePlan.cs b/src/Hl7.Fhir.R4/Model/Generated/CarePlan.cs
index 44a9722b16..3c5ac680c4 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/CarePlan.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/CarePlan.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("CarePlan","http://hl7.org/fhir/StructureDefinition/CarePlan", IsResource=true)]
+  [FhirType("CarePlan","http://hl7.org/fhir/StructureDefinition/CarePlan")]
   public partial class CarePlan : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>, ICoded<List<Hl7.Fhir.Model.CodeableConcept>>
   {
     /// <summary>
@@ -223,7 +223,7 @@ public enum CarePlanActivityStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CarePlan#Activity", IsNestedType=true)]
+    [FhirType("CarePlan#Activity")]
     [BackboneType("CarePlan.activity")]
     public partial class ActivityComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -457,7 +457,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CarePlan#Detail", IsNestedType=true)]
+    [FhirType("CarePlan#Detail")]
     [BackboneType("CarePlan.activity.detail")]
     public partial class DetailComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4/Model/Generated/CareTeam.cs b/src/Hl7.Fhir.R4/Model/Generated/CareTeam.cs
index d8a2b3fb1c..956742dd12 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/CareTeam.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/CareTeam.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("CareTeam","http://hl7.org/fhir/StructureDefinition/CareTeam", IsResource=true)]
+  [FhirType("CareTeam","http://hl7.org/fhir/StructureDefinition/CareTeam")]
   public partial class CareTeam : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>, ICoded<List<Hl7.Fhir.Model.CodeableConcept>>
   {
     /// <summary>
@@ -107,7 +107,7 @@ public enum CareTeamStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CareTeam#Participant", IsNestedType=true)]
+    [FhirType("CareTeam#Participant")]
     [BackboneType("CareTeam.participant")]
     public partial class ParticipantComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4/Model/Generated/CatalogEntry.cs b/src/Hl7.Fhir.R4/Model/Generated/CatalogEntry.cs
index 0cca9bf004..8c9596dc87 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/CatalogEntry.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/CatalogEntry.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("CatalogEntry","http://hl7.org/fhir/StructureDefinition/CatalogEntry", IsResource=true)]
+  [FhirType("CatalogEntry","http://hl7.org/fhir/StructureDefinition/CatalogEntry")]
   public partial class CatalogEntry : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -89,7 +89,7 @@ public enum CatalogEntryRelationType
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CatalogEntry#RelatedEntry", IsNestedType=true)]
+    [FhirType("CatalogEntry#RelatedEntry")]
     [BackboneType("CatalogEntry.relatedEntry")]
     public partial class RelatedEntryComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4/Model/Generated/ChargeItem.cs b/src/Hl7.Fhir.R4/Model/Generated/ChargeItem.cs
index 2227630db3..dc2f868c1c 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/ChargeItem.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/ChargeItem.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("ChargeItem","http://hl7.org/fhir/StructureDefinition/ChargeItem", IsResource=true)]
+  [FhirType("ChargeItem","http://hl7.org/fhir/StructureDefinition/ChargeItem")]
   public partial class ChargeItem : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>, ICoded<Hl7.Fhir.Model.CodeableConcept>
   {
     /// <summary>
@@ -119,7 +119,7 @@ public enum ChargeItemStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ChargeItem#Performer", IsNestedType=true)]
+    [FhirType("ChargeItem#Performer")]
     [BackboneType("ChargeItem.performer")]
     public partial class PerformerComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4/Model/Generated/ChargeItemDefinition.cs b/src/Hl7.Fhir.R4/Model/Generated/ChargeItemDefinition.cs
index 71bdf6e028..d13a37e2e0 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/ChargeItemDefinition.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/ChargeItemDefinition.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("ChargeItemDefinition","http://hl7.org/fhir/StructureDefinition/ChargeItemDefinition", IsResource=true)]
+  [FhirType("ChargeItemDefinition","http://hl7.org/fhir/StructureDefinition/ChargeItemDefinition")]
   public partial class ChargeItemDefinition : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>, ICoded<Hl7.Fhir.Model.CodeableConcept>
   {
     /// <summary>
@@ -68,7 +68,7 @@ public partial class ChargeItemDefinition : Hl7.Fhir.Model.DomainResource, IIden
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ChargeItemDefinition#Applicability", IsNestedType=true)]
+    [FhirType("ChargeItemDefinition#Applicability")]
     [BackboneType("ChargeItemDefinition.applicability")]
     public partial class ApplicabilityComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -298,7 +298,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ChargeItemDefinition#PropertyGroup", IsNestedType=true)]
+    [FhirType("ChargeItemDefinition#PropertyGroup")]
     [BackboneType("ChargeItemDefinition.propertyGroup")]
     public partial class PropertyGroupComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -451,7 +451,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ChargeItemDefinition#PriceComponent", IsNestedType=true)]
+    [FhirType("ChargeItemDefinition#PriceComponent")]
     [BackboneType("ChargeItemDefinition.propertyGroup.priceComponent")]
     public partial class PriceComponentComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4/Model/Generated/Claim.cs b/src/Hl7.Fhir.R4/Model/Generated/Claim.cs
index 48375bb89b..d67e587a7d 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/Claim.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/Claim.cs
@@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Claim","http://hl7.org/fhir/StructureDefinition/Claim", IsResource=true)]
+  [FhirType("Claim","http://hl7.org/fhir/StructureDefinition/Claim")]
   public partial class Claim : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>, ICoded<Hl7.Fhir.Model.CodeableConcept>
   {
     /// <summary>
@@ -69,7 +69,7 @@ public partial class Claim : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<I
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Claim#RelatedClaim", IsNestedType=true)]
+    [FhirType("Claim#RelatedClaim")]
     [BackboneType("Claim.related")]
     public partial class RelatedClaimComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -249,7 +249,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Claim#Payee", IsNestedType=true)]
+    [FhirType("Claim#Payee")]
     [BackboneType("Claim.payee")]
     public partial class PayeeComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -404,7 +404,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Claim#CareTeam", IsNestedType=true)]
+    [FhirType("Claim#CareTeam")]
     [BackboneType("Claim.careTeam")]
     public partial class CareTeamComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -673,7 +673,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Claim#SupportingInformation", IsNestedType=true)]
+    [FhirType("Claim#SupportingInformation")]
     [BackboneType("Claim.supportingInfo")]
     public partial class SupportingInformationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -952,7 +952,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Claim#Diagnosis", IsNestedType=true)]
+    [FhirType("Claim#Diagnosis")]
     [BackboneType("Claim.diagnosis")]
     public partial class DiagnosisComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1206,7 +1206,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Claim#Procedure", IsNestedType=true)]
+    [FhirType("Claim#Procedure")]
     [BackboneType("Claim.procedure")]
     public partial class ProcedureComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1480,7 +1480,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Claim#Insurance", IsNestedType=true)]
+    [FhirType("Claim#Insurance")]
     [BackboneType("Claim.insurance")]
     public partial class InsuranceComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1836,7 +1836,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Claim#Accident", IsNestedType=true)]
+    [FhirType("Claim#Accident")]
     [BackboneType("Claim.accident")]
     public partial class AccidentComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2035,7 +2035,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Claim#Item", IsNestedType=true)]
+    [FhirType("Claim#Item")]
     [BackboneType("Claim.item")]
     public partial class ItemComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2798,7 +2798,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Claim#Detail", IsNestedType=true)]
+    [FhirType("Claim#Detail")]
     [BackboneType("Claim.item.detail")]
     public partial class DetailComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -3248,7 +3248,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Claim#SubDetail", IsNestedType=true)]
+    [FhirType("Claim#SubDetail")]
     [BackboneType("Claim.item.detail.subDetail")]
     public partial class SubDetailComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4/Model/Generated/ClaimResponse.cs b/src/Hl7.Fhir.R4/Model/Generated/ClaimResponse.cs
index 2c2fc30b1a..7227e1e6e5 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/ClaimResponse.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/ClaimResponse.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("ClaimResponse","http://hl7.org/fhir/StructureDefinition/ClaimResponse", IsResource=true)]
+  [FhirType("ClaimResponse","http://hl7.org/fhir/StructureDefinition/ClaimResponse")]
   public partial class ClaimResponse : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -67,7 +67,7 @@ public partial class ClaimResponse : Hl7.Fhir.Model.DomainResource, IIdentifiabl
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ClaimResponse#Item", IsNestedType=true)]
+    [FhirType("ClaimResponse#Item")]
     [BackboneType("ClaimResponse.item")]
     public partial class ItemComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -308,7 +308,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ClaimResponse#Adjudication", IsNestedType=true)]
+    [FhirType("ClaimResponse#Adjudication")]
     [BackboneType("ClaimResponse.item.adjudication")]
     public partial class AdjudicationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -530,7 +530,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ClaimResponse#ItemDetail", IsNestedType=true)]
+    [FhirType("ClaimResponse#ItemDetail")]
     [BackboneType("ClaimResponse.item.detail")]
     public partial class ItemDetailComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -771,7 +771,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ClaimResponse#SubDetail", IsNestedType=true)]
+    [FhirType("ClaimResponse#SubDetail")]
     [BackboneType("ClaimResponse.item.detail.subDetail")]
     public partial class SubDetailComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -986,7 +986,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ClaimResponse#AddedItem", IsNestedType=true)]
+    [FhirType("ClaimResponse#AddedItem")]
     [BackboneType("ClaimResponse.addItem")]
     public partial class AddedItemComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1651,7 +1651,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ClaimResponse#AddedItemDetail", IsNestedType=true)]
+    [FhirType("ClaimResponse#AddedItemDetail")]
     [BackboneType("ClaimResponse.addItem.detail")]
     public partial class AddedItemDetailComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2020,7 +2020,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ClaimResponse#AddedItemSubDetail", IsNestedType=true)]
+    [FhirType("ClaimResponse#AddedItemSubDetail")]
     [BackboneType("ClaimResponse.addItem.detail.subDetail")]
     public partial class AddedItemSubDetailComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2364,7 +2364,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ClaimResponse#Total", IsNestedType=true)]
+    [FhirType("ClaimResponse#Total")]
     [BackboneType("ClaimResponse.total")]
     public partial class TotalComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2518,7 +2518,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ClaimResponse#Payment", IsNestedType=true)]
+    [FhirType("ClaimResponse#Payment")]
     [BackboneType("ClaimResponse.payment")]
     public partial class PaymentComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2791,7 +2791,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ClaimResponse#Note", IsNestedType=true)]
+    [FhirType("ClaimResponse#Note")]
     [BackboneType("ClaimResponse.processNote")]
     public partial class NoteComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -3051,7 +3051,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ClaimResponse#Insurance", IsNestedType=true)]
+    [FhirType("ClaimResponse#Insurance")]
     [BackboneType("ClaimResponse.insurance")]
     public partial class InsuranceComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -3339,7 +3339,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ClaimResponse#Error", IsNestedType=true)]
+    [FhirType("ClaimResponse#Error")]
     [BackboneType("ClaimResponse.error")]
     public partial class ErrorComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4/Model/Generated/ClinicalImpression.cs b/src/Hl7.Fhir.R4/Model/Generated/ClinicalImpression.cs
index 2417136cc0..b5debbfe14 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/ClinicalImpression.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/ClinicalImpression.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("ClinicalImpression","http://hl7.org/fhir/StructureDefinition/ClinicalImpression", IsResource=true)]
+  [FhirType("ClinicalImpression","http://hl7.org/fhir/StructureDefinition/ClinicalImpression")]
   public partial class ClinicalImpression : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>, ICoded<Hl7.Fhir.Model.CodeableConcept>
   {
     /// <summary>
@@ -95,7 +95,7 @@ public enum ClinicalImpressionStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ClinicalImpression#Investigation", IsNestedType=true)]
+    [FhirType("ClinicalImpression#Investigation")]
     [BackboneType("ClinicalImpression.investigation")]
     public partial class InvestigationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -251,7 +251,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ClinicalImpression#Finding", IsNestedType=true)]
+    [FhirType("ClinicalImpression#Finding")]
     [BackboneType("ClinicalImpression.finding")]
     public partial class FindingComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4/Model/Generated/Communication.cs b/src/Hl7.Fhir.R4/Model/Generated/Communication.cs
index 211464f456..5384c72942 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/Communication.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/Communication.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Communication","http://hl7.org/fhir/StructureDefinition/Communication", IsResource=true)]
+  [FhirType("Communication","http://hl7.org/fhir/StructureDefinition/Communication")]
   public partial class Communication : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>, ICoded<List<Hl7.Fhir.Model.CodeableConcept>>
   {
     /// <summary>
@@ -67,7 +67,7 @@ public partial class Communication : Hl7.Fhir.Model.DomainResource, IIdentifiabl
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Communication#Payload", IsNestedType=true)]
+    [FhirType("Communication#Payload")]
     [BackboneType("Communication.payload")]
     public partial class PayloadComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4/Model/Generated/CommunicationRequest.cs b/src/Hl7.Fhir.R4/Model/Generated/CommunicationRequest.cs
index 9638087d7a..65e0a9aa0a 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/CommunicationRequest.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/CommunicationRequest.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("CommunicationRequest","http://hl7.org/fhir/StructureDefinition/CommunicationRequest", IsResource=true)]
+  [FhirType("CommunicationRequest","http://hl7.org/fhir/StructureDefinition/CommunicationRequest")]
   public partial class CommunicationRequest : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>, ICoded<List<Hl7.Fhir.Model.CodeableConcept>>
   {
     /// <summary>
@@ -67,7 +67,7 @@ public partial class CommunicationRequest : Hl7.Fhir.Model.DomainResource, IIden
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CommunicationRequest#Payload", IsNestedType=true)]
+    [FhirType("CommunicationRequest#Payload")]
     [BackboneType("CommunicationRequest.payload")]
     public partial class PayloadComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4/Model/Generated/CompartmentDefinition.cs b/src/Hl7.Fhir.R4/Model/Generated/CompartmentDefinition.cs
index 5d395ea3f3..cbf166ee02 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/CompartmentDefinition.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/CompartmentDefinition.cs
@@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("CompartmentDefinition","http://hl7.org/fhir/StructureDefinition/CompartmentDefinition", IsResource=true)]
+  [FhirType("CompartmentDefinition","http://hl7.org/fhir/StructureDefinition/CompartmentDefinition")]
   public partial class CompartmentDefinition : Hl7.Fhir.Model.DomainResource
   {
     /// <summary>
@@ -68,7 +68,7 @@ public partial class CompartmentDefinition : Hl7.Fhir.Model.DomainResource
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CompartmentDefinition#Resource", IsNestedType=true)]
+    [FhirType("CompartmentDefinition#Resource")]
     [BackboneType("CompartmentDefinition.resource")]
     public partial class ResourceComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4/Model/Generated/Composition.cs b/src/Hl7.Fhir.R4/Model/Generated/Composition.cs
index 5d661c22e4..2f1433d3e2 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/Composition.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/Composition.cs
@@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Composition","http://hl7.org/fhir/StructureDefinition/Composition", IsResource=true)]
+  [FhirType("Composition","http://hl7.org/fhir/StructureDefinition/Composition")]
   public partial class Composition : Hl7.Fhir.Model.DomainResource, IIdentifiable<Identifier>, ICoded<Hl7.Fhir.Model.CodeableConcept>
   {
     /// <summary>
@@ -166,7 +166,7 @@ public enum CompositionAttestationMode
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Composition#Attester", IsNestedType=true)]
+    [FhirType("Composition#Attester")]
     [BackboneType("Composition.attester")]
     public partial class AttesterComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -384,7 +384,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Composition#RelatesTo", IsNestedType=true)]
+    [FhirType("Composition#RelatesTo")]
     [BackboneType("Composition.relatesTo")]
     public partial class RelatesToComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -561,7 +561,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Composition#Event", IsNestedType=true)]
+    [FhirType("Composition#Event")]
     [BackboneType("Composition.event")]
     public partial class EventComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -742,7 +742,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Composition#Section", IsNestedType=true)]
+    [FhirType("Composition#Section")]
     [BackboneType("Composition.section")]
     public partial class SectionComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4/Model/Generated/ConceptMap.cs b/src/Hl7.Fhir.R4/Model/Generated/ConceptMap.cs
index 7e888d92e4..9043c2fc65 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/ConceptMap.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/ConceptMap.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("ConceptMap","http://hl7.org/fhir/StructureDefinition/ConceptMap", IsResource=true)]
+  [FhirType("ConceptMap","http://hl7.org/fhir/StructureDefinition/ConceptMap")]
   public partial class ConceptMap : Hl7.Fhir.Model.DomainResource, IIdentifiable<Identifier>
   {
     /// <summary>
@@ -95,7 +95,7 @@ public enum ConceptMapGroupUnmappedMode
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ConceptMap#Group", IsNestedType=true)]
+    [FhirType("ConceptMap#Group")]
     [BackboneType("ConceptMap.group")]
     public partial class GroupComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -420,7 +420,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ConceptMap#SourceElement", IsNestedType=true)]
+    [FhirType("ConceptMap#SourceElement")]
     [BackboneType("ConceptMap.group.element")]
     public partial class SourceElementComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -634,7 +634,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ConceptMap#TargetElement", IsNestedType=true)]
+    [FhirType("ConceptMap#TargetElement")]
     [BackboneType("ConceptMap.group.element.target")]
     public partial class TargetElementComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -962,7 +962,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ConceptMap#OtherElement", IsNestedType=true)]
+    [FhirType("ConceptMap#OtherElement")]
     [BackboneType("ConceptMap.group.element.target.dependsOn")]
     public partial class OtherElementComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1238,7 +1238,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ConceptMap#Unmapped", IsNestedType=true)]
+    [FhirType("ConceptMap#Unmapped")]
     [BackboneType("ConceptMap.group.unmapped")]
     public partial class UnmappedComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4/Model/Generated/Condition.cs b/src/Hl7.Fhir.R4/Model/Generated/Condition.cs
index 0de4d87b4c..551c40f1d0 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/Condition.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/Condition.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Condition","http://hl7.org/fhir/StructureDefinition/Condition", IsResource=true)]
+  [FhirType("Condition","http://hl7.org/fhir/StructureDefinition/Condition")]
   public partial class Condition : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>, ICoded<Hl7.Fhir.Model.CodeableConcept>
   {
     /// <summary>
@@ -159,7 +159,7 @@ public enum ConditionVerificationStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Condition#Stage", IsNestedType=true)]
+    [FhirType("Condition#Stage")]
     [BackboneType("Condition.stage")]
     public partial class StageComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -341,7 +341,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Condition#Evidence", IsNestedType=true)]
+    [FhirType("Condition#Evidence")]
     [BackboneType("Condition.evidence")]
     public partial class EvidenceComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4/Model/Generated/Consent.cs b/src/Hl7.Fhir.R4/Model/Generated/Consent.cs
index 2228366d7f..5dc92b8616 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/Consent.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/Consent.cs
@@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Consent","http://hl7.org/fhir/StructureDefinition/Consent", IsResource=true)]
+  [FhirType("Consent","http://hl7.org/fhir/StructureDefinition/Consent")]
   public partial class Consent : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>, ICoded<List<Hl7.Fhir.Model.CodeableConcept>>
   {
     /// <summary>
@@ -170,7 +170,7 @@ public enum ConsentDataMeaning
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Consent#Policy", IsNestedType=true)]
+    [FhirType("Consent#Policy")]
     [BackboneType("Consent.policy")]
     public partial class PolicyComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -357,7 +357,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Consent#Verification", IsNestedType=true)]
+    [FhirType("Consent#Verification")]
     [BackboneType("Consent.verification")]
     public partial class VerificationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -572,7 +572,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Consent#provision", IsNestedType=true)]
+    [FhirType("Consent#provision")]
     [BackboneType("Consent.provision")]
     public partial class provisionComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -981,7 +981,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Consent#provisionActor", IsNestedType=true)]
+    [FhirType("Consent#provisionActor")]
     [BackboneType("Consent.provision.actor")]
     public partial class provisionActorComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1137,7 +1137,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Consent#provisionData", IsNestedType=true)]
+    [FhirType("Consent#provisionData")]
     [BackboneType("Consent.provision.data")]
     public partial class provisionDataComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4/Model/Generated/Contract.cs b/src/Hl7.Fhir.R4/Model/Generated/Contract.cs
index e72d82178d..8b2b67cb32 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/Contract.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/Contract.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Contract","http://hl7.org/fhir/StructureDefinition/Contract", IsResource=true)]
+  [FhirType("Contract","http://hl7.org/fhir/StructureDefinition/Contract")]
   public partial class Contract : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -267,7 +267,7 @@ public enum ContractResourcePublicationStatusCodes
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Contract#ContentDefinition", IsNestedType=true)]
+    [FhirType("Contract#ContentDefinition")]
     [BackboneType("Contract.contentDefinition")]
     public partial class ContentDefinitionComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -580,7 +580,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Contract#Term", IsNestedType=true)]
+    [FhirType("Contract#Term")]
     [BackboneType("Contract.term")]
     public partial class TermComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1027,7 +1027,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Contract#SecurityLabel", IsNestedType=true)]
+    [FhirType("Contract#SecurityLabel")]
     [BackboneType("Contract.term.securityLabel")]
     public partial class SecurityLabelComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1253,7 +1253,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Contract#ContractOffer", IsNestedType=true)]
+    [FhirType("Contract#ContractOffer")]
     [BackboneType("Contract.term.offer")]
     public partial class ContractOfferComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1666,7 +1666,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Contract#ContractParty", IsNestedType=true)]
+    [FhirType("Contract#ContractParty")]
     [BackboneType("Contract.term.offer.party")]
     public partial class ContractPartyComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1819,7 +1819,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Contract#Answer", IsNestedType=true)]
+    [FhirType("Contract#Answer")]
     [BackboneType("Contract.term.offer.answer")]
     public partial class AnswerComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1946,7 +1946,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Contract#ContractAsset", IsNestedType=true)]
+    [FhirType("Contract#ContractAsset")]
     [BackboneType("Contract.term.asset")]
     public partial class ContractAssetComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2509,7 +2509,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Contract#AssetContext", IsNestedType=true)]
+    [FhirType("Contract#AssetContext")]
     [BackboneType("Contract.term.asset.context")]
     public partial class AssetContextComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2704,7 +2704,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Contract#ValuedItem", IsNestedType=true)]
+    [FhirType("Contract#ValuedItem")]
     [BackboneType("Contract.term.asset.valuedItem")]
     public partial class ValuedItemComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -3292,7 +3292,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Contract#Action", IsNestedType=true)]
+    [FhirType("Contract#Action")]
     [BackboneType("Contract.term.action")]
     public partial class ActionComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -4091,7 +4091,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Contract#ActionSubject", IsNestedType=true)]
+    [FhirType("Contract#ActionSubject")]
     [BackboneType("Contract.term.action.subject")]
     public partial class ActionSubjectComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -4248,7 +4248,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Contract#Signatory", IsNestedType=true)]
+    [FhirType("Contract#Signatory")]
     [BackboneType("Contract.signer")]
     public partial class SignatoryComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -4430,7 +4430,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Contract#FriendlyLanguage", IsNestedType=true)]
+    [FhirType("Contract#FriendlyLanguage")]
     [BackboneType("Contract.friendly")]
     public partial class FriendlyLanguageComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -4560,7 +4560,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Contract#LegalLanguage", IsNestedType=true)]
+    [FhirType("Contract#LegalLanguage")]
     [BackboneType("Contract.legal")]
     public partial class LegalLanguageComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -4690,7 +4690,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Contract#ComputableLanguage", IsNestedType=true)]
+    [FhirType("Contract#ComputableLanguage")]
     [BackboneType("Contract.rule")]
     public partial class ComputableLanguageComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4/Model/Generated/Coverage.cs b/src/Hl7.Fhir.R4/Model/Generated/Coverage.cs
index c8575684bd..82d1fcbd02 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/Coverage.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/Coverage.cs
@@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Coverage","http://hl7.org/fhir/StructureDefinition/Coverage", IsResource=true)]
+  [FhirType("Coverage","http://hl7.org/fhir/StructureDefinition/Coverage")]
   public partial class Coverage : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>, ICoded<Hl7.Fhir.Model.CodeableConcept>
   {
     /// <summary>
@@ -69,7 +69,7 @@ public partial class Coverage : Hl7.Fhir.Model.DomainResource, IIdentifiable<Lis
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Coverage#Class", IsNestedType=true)]
+    [FhirType("Coverage#Class")]
     [BackboneType("Coverage.class")]
     public partial class ClassComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -285,7 +285,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Coverage#CostToBeneficiary", IsNestedType=true)]
+    [FhirType("Coverage#CostToBeneficiary")]
     [BackboneType("Coverage.costToBeneficiary")]
     public partial class CostToBeneficiaryComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -466,7 +466,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Coverage#Exemption", IsNestedType=true)]
+    [FhirType("Coverage#Exemption")]
     [BackboneType("Coverage.costToBeneficiary.exception")]
     public partial class ExemptionComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4/Model/Generated/CoverageEligibilityRequest.cs b/src/Hl7.Fhir.R4/Model/Generated/CoverageEligibilityRequest.cs
index c837077edc..83191a0c9a 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/CoverageEligibilityRequest.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/CoverageEligibilityRequest.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("CoverageEligibilityRequest","http://hl7.org/fhir/StructureDefinition/CoverageEligibilityRequest", IsResource=true)]
+  [FhirType("CoverageEligibilityRequest","http://hl7.org/fhir/StructureDefinition/CoverageEligibilityRequest")]
   public partial class CoverageEligibilityRequest : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -102,7 +102,7 @@ public enum EligibilityRequestPurpose
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CoverageEligibilityRequest#SupportingInformation", IsNestedType=true)]
+    [FhirType("CoverageEligibilityRequest#SupportingInformation")]
     [BackboneType("CoverageEligibilityRequest.supportingInfo")]
     public partial class SupportingInformationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -319,7 +319,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CoverageEligibilityRequest#Insurance", IsNestedType=true)]
+    [FhirType("CoverageEligibilityRequest#Insurance")]
     [BackboneType("CoverageEligibilityRequest.insurance")]
     public partial class InsuranceComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -534,7 +534,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CoverageEligibilityRequest#Details", IsNestedType=true)]
+    [FhirType("CoverageEligibilityRequest#Details")]
     [BackboneType("CoverageEligibilityRequest.item")]
     public partial class DetailsComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -916,7 +916,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CoverageEligibilityRequest#Diagnosis", IsNestedType=true)]
+    [FhirType("CoverageEligibilityRequest#Diagnosis")]
     [BackboneType("CoverageEligibilityRequest.item.diagnosis")]
     public partial class DiagnosisComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4/Model/Generated/CoverageEligibilityResponse.cs b/src/Hl7.Fhir.R4/Model/Generated/CoverageEligibilityResponse.cs
index 4103d993a2..d035b8b468 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/CoverageEligibilityResponse.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/CoverageEligibilityResponse.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("CoverageEligibilityResponse","http://hl7.org/fhir/StructureDefinition/CoverageEligibilityResponse", IsResource=true)]
+  [FhirType("CoverageEligibilityResponse","http://hl7.org/fhir/StructureDefinition/CoverageEligibilityResponse")]
   public partial class CoverageEligibilityResponse : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -102,7 +102,7 @@ public enum EligibilityResponsePurpose
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CoverageEligibilityResponse#Insurance", IsNestedType=true)]
+    [FhirType("CoverageEligibilityResponse#Insurance")]
     [BackboneType("CoverageEligibilityResponse.insurance")]
     public partial class InsuranceComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -325,7 +325,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CoverageEligibilityResponse#Items", IsNestedType=true)]
+    [FhirType("CoverageEligibilityResponse#Items")]
     [BackboneType("CoverageEligibilityResponse.insurance.item")]
     public partial class ItemsComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -878,7 +878,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CoverageEligibilityResponse#Benefit", IsNestedType=true)]
+    [FhirType("CoverageEligibilityResponse#Benefit")]
     [BackboneType("CoverageEligibilityResponse.insurance.item.benefit")]
     public partial class BenefitComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1060,7 +1060,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CoverageEligibilityResponse#Errors", IsNestedType=true)]
+    [FhirType("CoverageEligibilityResponse#Errors")]
     [BackboneType("CoverageEligibilityResponse.error")]
     public partial class ErrorsComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4/Model/Generated/DataRequirement.cs b/src/Hl7.Fhir.R4/Model/Generated/DataRequirement.cs
index 1faa7c7437..e6bb13a650 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/DataRequirement.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/DataRequirement.cs
@@ -89,7 +89,7 @@ public enum SortDirection
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("DataRequirement#CodeFilter", IsNestedType=true)]
+    [FhirType("DataRequirement#CodeFilter")]
     [BackboneType("DataRequirement.codeFilter")]
     public partial class CodeFilterComponent : Hl7.Fhir.Model.Element
     {
@@ -345,7 +345,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("DataRequirement#DateFilter", IsNestedType=true)]
+    [FhirType("DataRequirement#DateFilter")]
     [BackboneType("DataRequirement.dateFilter")]
     public partial class DateFilterComponent : Hl7.Fhir.Model.Element
     {
@@ -560,7 +560,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("DataRequirement#Sort", IsNestedType=true)]
+    [FhirType("DataRequirement#Sort")]
     [BackboneType("DataRequirement.sort")]
     public partial class SortComponent : Hl7.Fhir.Model.Element
     {
diff --git a/src/Hl7.Fhir.R4/Model/Generated/DetectedIssue.cs b/src/Hl7.Fhir.R4/Model/Generated/DetectedIssue.cs
index 8ac2879c43..6fd516b2f2 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/DetectedIssue.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/DetectedIssue.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("DetectedIssue","http://hl7.org/fhir/StructureDefinition/DetectedIssue", IsResource=true)]
+  [FhirType("DetectedIssue","http://hl7.org/fhir/StructureDefinition/DetectedIssue")]
   public partial class DetectedIssue : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>, ICoded<Hl7.Fhir.Model.CodeableConcept>
   {
     /// <summary>
@@ -95,7 +95,7 @@ public enum DetectedIssueSeverity
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("DetectedIssue#Evidence", IsNestedType=true)]
+    [FhirType("DetectedIssue#Evidence")]
     [BackboneType("DetectedIssue.evidence")]
     public partial class EvidenceComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -251,7 +251,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("DetectedIssue#Mitigation", IsNestedType=true)]
+    [FhirType("DetectedIssue#Mitigation")]
     [BackboneType("DetectedIssue.mitigation")]
     public partial class MitigationComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4/Model/Generated/Device.cs b/src/Hl7.Fhir.R4/Model/Generated/Device.cs
index a782d5f06c..4abe9db83d 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/Device.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/Device.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Device","http://hl7.org/fhir/StructureDefinition/Device", IsResource=true)]
+  [FhirType("Device","http://hl7.org/fhir/StructureDefinition/Device")]
   public partial class Device : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>, ICoded<Hl7.Fhir.Model.CodeableConcept>
   {
     /// <summary>
@@ -148,7 +148,7 @@ public enum UDIEntryType
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Device#UdiCarrier", IsNestedType=true)]
+    [FhirType("Device#UdiCarrier")]
     [BackboneType("Device.udiCarrier")]
     public partial class UdiCarrierComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -509,7 +509,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Device#DeviceName", IsNestedType=true)]
+    [FhirType("Device#DeviceName")]
     [BackboneType("Device.deviceName")]
     public partial class DeviceNameComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -697,7 +697,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Device#Specialization", IsNestedType=true)]
+    [FhirType("Device#Specialization")]
     [BackboneType("Device.specialization")]
     public partial class SpecializationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -864,7 +864,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Device#Version", IsNestedType=true)]
+    [FhirType("Device#Version")]
     [BackboneType("Device.version")]
     public partial class VersionComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1056,7 +1056,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Device#Property", IsNestedType=true)]
+    [FhirType("Device#Property")]
     [BackboneType("Device.property")]
     public partial class PropertyComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4/Model/Generated/DeviceDefinition.cs b/src/Hl7.Fhir.R4/Model/Generated/DeviceDefinition.cs
index f52ec98878..2892044efd 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/DeviceDefinition.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/DeviceDefinition.cs
@@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("DeviceDefinition","http://hl7.org/fhir/StructureDefinition/DeviceDefinition", IsResource=true)]
+  [FhirType("DeviceDefinition","http://hl7.org/fhir/StructureDefinition/DeviceDefinition")]
   public partial class DeviceDefinition : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -68,7 +68,7 @@ public partial class DeviceDefinition : Hl7.Fhir.Model.DomainResource, IIdentifi
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("DeviceDefinition#UdiDeviceIdentifier", IsNestedType=true)]
+    [FhirType("DeviceDefinition#UdiDeviceIdentifier")]
     [BackboneType("DeviceDefinition.udiDeviceIdentifier")]
     public partial class UdiDeviceIdentifierComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -298,7 +298,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("DeviceDefinition#DeviceName", IsNestedType=true)]
+    [FhirType("DeviceDefinition#DeviceName")]
     [BackboneType("DeviceDefinition.deviceName")]
     public partial class DeviceNameComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -486,7 +486,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("DeviceDefinition#Specialization", IsNestedType=true)]
+    [FhirType("DeviceDefinition#Specialization")]
     [BackboneType("DeviceDefinition.specialization")]
     public partial class SpecializationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -671,7 +671,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("DeviceDefinition#Capability", IsNestedType=true)]
+    [FhirType("DeviceDefinition#Capability")]
     [BackboneType("DeviceDefinition.capability")]
     public partial class CapabilityComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -821,7 +821,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("DeviceDefinition#Property", IsNestedType=true)]
+    [FhirType("DeviceDefinition#Property")]
     [BackboneType("DeviceDefinition.property")]
     public partial class PropertyComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -997,7 +997,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("DeviceDefinition#Material", IsNestedType=true)]
+    [FhirType("DeviceDefinition#Material")]
     [BackboneType("DeviceDefinition.material")]
     public partial class MaterialComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4/Model/Generated/DeviceMetric.cs b/src/Hl7.Fhir.R4/Model/Generated/DeviceMetric.cs
index 20d9ce4d2e..ed077a4de8 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/DeviceMetric.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/DeviceMetric.cs
@@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("DeviceMetric","http://hl7.org/fhir/StructureDefinition/DeviceMetric", IsResource=true)]
+  [FhirType("DeviceMetric","http://hl7.org/fhir/StructureDefinition/DeviceMetric")]
   public partial class DeviceMetric : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>, ICoded<Hl7.Fhir.Model.CodeableConcept>
   {
     /// <summary>
@@ -259,7 +259,7 @@ public enum DeviceMetricCalibrationState
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("DeviceMetric#Calibration", IsNestedType=true)]
+    [FhirType("DeviceMetric#Calibration")]
     [BackboneType("DeviceMetric.calibration")]
     public partial class CalibrationComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4/Model/Generated/DeviceRequest.cs b/src/Hl7.Fhir.R4/Model/Generated/DeviceRequest.cs
index bcc3f377fc..564a312535 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/DeviceRequest.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/DeviceRequest.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("DeviceRequest","http://hl7.org/fhir/StructureDefinition/DeviceRequest", IsResource=true)]
+  [FhirType("DeviceRequest","http://hl7.org/fhir/StructureDefinition/DeviceRequest")]
   public partial class DeviceRequest : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>, ICoded<Hl7.Fhir.Model.DataType>
   {
     /// <summary>
@@ -67,7 +67,7 @@ public partial class DeviceRequest : Hl7.Fhir.Model.DomainResource, IIdentifiabl
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("DeviceRequest#Parameter", IsNestedType=true)]
+    [FhirType("DeviceRequest#Parameter")]
     [BackboneType("DeviceRequest.parameter")]
     public partial class ParameterComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4/Model/Generated/DeviceUseStatement.cs b/src/Hl7.Fhir.R4/Model/Generated/DeviceUseStatement.cs
index eaf7e44cf9..d933546488 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/DeviceUseStatement.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/DeviceUseStatement.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("DeviceUseStatement","http://hl7.org/fhir/StructureDefinition/DeviceUseStatement", IsResource=true)]
+  [FhirType("DeviceUseStatement","http://hl7.org/fhir/StructureDefinition/DeviceUseStatement")]
   public partial class DeviceUseStatement : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
diff --git a/src/Hl7.Fhir.R4/Model/Generated/DiagnosticReport.cs b/src/Hl7.Fhir.R4/Model/Generated/DiagnosticReport.cs
index 53197d1ff0..a5bd3749b3 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/DiagnosticReport.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/DiagnosticReport.cs
@@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("DiagnosticReport","http://hl7.org/fhir/StructureDefinition/DiagnosticReport", IsResource=true)]
+  [FhirType("DiagnosticReport","http://hl7.org/fhir/StructureDefinition/DiagnosticReport")]
   public partial class DiagnosticReport : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>, ICoded<Hl7.Fhir.Model.CodeableConcept>
   {
     /// <summary>
@@ -138,7 +138,7 @@ public enum DiagnosticReportStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("DiagnosticReport#Media", IsNestedType=true)]
+    [FhirType("DiagnosticReport#Media")]
     [BackboneType("DiagnosticReport.media")]
     public partial class MediaComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4/Model/Generated/DocumentManifest.cs b/src/Hl7.Fhir.R4/Model/Generated/DocumentManifest.cs
index fdd04208ff..6f8fbe9ec6 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/DocumentManifest.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/DocumentManifest.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("DocumentManifest","http://hl7.org/fhir/StructureDefinition/DocumentManifest", IsResource=true)]
+  [FhirType("DocumentManifest","http://hl7.org/fhir/StructureDefinition/DocumentManifest")]
   public partial class DocumentManifest : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -68,7 +68,7 @@ public partial class DocumentManifest : Hl7.Fhir.Model.DomainResource, IIdentifi
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("DocumentManifest#Related", IsNestedType=true)]
+    [FhirType("DocumentManifest#Related")]
     [BackboneType("DocumentManifest.related")]
     public partial class RelatedComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4/Model/Generated/DocumentReference.cs b/src/Hl7.Fhir.R4/Model/Generated/DocumentReference.cs
index 13714b34b6..b2e9752f9c 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/DocumentReference.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/DocumentReference.cs
@@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("DocumentReference","http://hl7.org/fhir/StructureDefinition/DocumentReference", IsResource=true)]
+  [FhirType("DocumentReference","http://hl7.org/fhir/StructureDefinition/DocumentReference")]
   public partial class DocumentReference : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -69,7 +69,7 @@ public partial class DocumentReference : Hl7.Fhir.Model.DomainResource, IIdentif
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("DocumentReference#RelatesTo", IsNestedType=true)]
+    [FhirType("DocumentReference#RelatesTo")]
     [BackboneType("DocumentReference.relatesTo")]
     public partial class RelatesToComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -244,7 +244,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("DocumentReference#Content", IsNestedType=true)]
+    [FhirType("DocumentReference#Content")]
     [BackboneType("DocumentReference.content")]
     public partial class ContentComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -398,7 +398,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("DocumentReference#Context", IsNestedType=true)]
+    [FhirType("DocumentReference#Context")]
     [BackboneType("DocumentReference.context")]
     public partial class ContextComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4/Model/Generated/Dosage.cs b/src/Hl7.Fhir.R4/Model/Generated/Dosage.cs
index 8768962e84..29045dd164 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/Dosage.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/Dosage.cs
@@ -67,7 +67,7 @@ public partial class Dosage : Hl7.Fhir.Model.BackboneType
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Dosage#DoseAndRate", IsNestedType=true)]
+    [FhirType("Dosage#DoseAndRate")]
     [BackboneType("Dosage.doseAndRate")]
     public partial class DoseAndRateComponent : Hl7.Fhir.Model.Element
     {
diff --git a/src/Hl7.Fhir.R4/Model/Generated/EffectEvidenceSynthesis.cs b/src/Hl7.Fhir.R4/Model/Generated/EffectEvidenceSynthesis.cs
index de32351dce..701a7f42ad 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/EffectEvidenceSynthesis.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/EffectEvidenceSynthesis.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("EffectEvidenceSynthesis","http://hl7.org/fhir/StructureDefinition/EffectEvidenceSynthesis", IsResource=true)]
+  [FhirType("EffectEvidenceSynthesis","http://hl7.org/fhir/StructureDefinition/EffectEvidenceSynthesis")]
   public partial class EffectEvidenceSynthesis : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -89,7 +89,7 @@ public enum ExposureStateCode
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("EffectEvidenceSynthesis#SampleSize", IsNestedType=true)]
+    [FhirType("EffectEvidenceSynthesis#SampleSize")]
     [BackboneType("EffectEvidenceSynthesis.sampleSize")]
     public partial class SampleSizeComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -319,7 +319,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("EffectEvidenceSynthesis#ResultsByExposure", IsNestedType=true)]
+    [FhirType("EffectEvidenceSynthesis#ResultsByExposure")]
     [BackboneType("EffectEvidenceSynthesis.resultsByExposure")]
     public partial class ResultsByExposureComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -562,7 +562,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("EffectEvidenceSynthesis#EffectEstimate", IsNestedType=true)]
+    [FhirType("EffectEvidenceSynthesis#EffectEstimate")]
     [BackboneType("EffectEvidenceSynthesis.effectEstimate")]
     public partial class EffectEstimateComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -853,7 +853,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("EffectEvidenceSynthesis#PrecisionEstimate", IsNestedType=true)]
+    [FhirType("EffectEvidenceSynthesis#PrecisionEstimate")]
     [BackboneType("EffectEvidenceSynthesis.effectEstimate.precisionEstimate")]
     public partial class PrecisionEstimateComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1109,7 +1109,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("EffectEvidenceSynthesis#Certainty", IsNestedType=true)]
+    [FhirType("EffectEvidenceSynthesis#Certainty")]
     [BackboneType("EffectEvidenceSynthesis.certainty")]
     public partial class CertaintyComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1289,7 +1289,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("EffectEvidenceSynthesis#CertaintySubcomponent", IsNestedType=true)]
+    [FhirType("EffectEvidenceSynthesis#CertaintySubcomponent")]
     [BackboneType("EffectEvidenceSynthesis.certainty.certaintySubcomponent")]
     public partial class CertaintySubcomponentComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4/Model/Generated/Encounter.cs b/src/Hl7.Fhir.R4/Model/Generated/Encounter.cs
index 6fdc9dbbbc..14bc74da82 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/Encounter.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/Encounter.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Encounter","http://hl7.org/fhir/StructureDefinition/Encounter", IsResource=true)]
+  [FhirType("Encounter","http://hl7.org/fhir/StructureDefinition/Encounter")]
   public partial class Encounter : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>, ICoded<List<Hl7.Fhir.Model.CodeableConcept>>
   {
     /// <summary>
@@ -168,7 +168,7 @@ public enum EncounterLocationStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Encounter#StatusHistory", IsNestedType=true)]
+    [FhirType("Encounter#StatusHistory")]
     [BackboneType("Encounter.statusHistory")]
     public partial class StatusHistoryComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -341,7 +341,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Encounter#ClassHistory", IsNestedType=true)]
+    [FhirType("Encounter#ClassHistory")]
     [BackboneType("Encounter.classHistory")]
     public partial class ClassHistoryComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -495,7 +495,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Encounter#Participant", IsNestedType=true)]
+    [FhirType("Encounter#Participant")]
     [BackboneType("Encounter.participant")]
     public partial class ParticipantComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -672,7 +672,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Encounter#Diagnosis", IsNestedType=true)]
+    [FhirType("Encounter#Diagnosis")]
     [BackboneType("Encounter.diagnosis")]
     public partial class DiagnosisComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -871,7 +871,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Encounter#Hospitalization", IsNestedType=true)]
+    [FhirType("Encounter#Hospitalization")]
     [BackboneType("Encounter.hospitalization")]
     public partial class HospitalizationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1211,7 +1211,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Encounter#Location", IsNestedType=true)]
+    [FhirType("Encounter#Location")]
     [BackboneType("Encounter.location")]
     public partial class LocationComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4/Model/Generated/Endpoint.cs b/src/Hl7.Fhir.R4/Model/Generated/Endpoint.cs
index caa5813a83..d005f9fcba 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/Endpoint.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/Endpoint.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Endpoint","http://hl7.org/fhir/StructureDefinition/Endpoint", IsResource=true)]
+  [FhirType("Endpoint","http://hl7.org/fhir/StructureDefinition/Endpoint")]
   public partial class Endpoint : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
diff --git a/src/Hl7.Fhir.R4/Model/Generated/EnrollmentRequest.cs b/src/Hl7.Fhir.R4/Model/Generated/EnrollmentRequest.cs
index bd95b76a73..8f0ed7c2c7 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/EnrollmentRequest.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/EnrollmentRequest.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("EnrollmentRequest","http://hl7.org/fhir/StructureDefinition/EnrollmentRequest", IsResource=true)]
+  [FhirType("EnrollmentRequest","http://hl7.org/fhir/StructureDefinition/EnrollmentRequest")]
   public partial class EnrollmentRequest : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
diff --git a/src/Hl7.Fhir.R4/Model/Generated/EnrollmentResponse.cs b/src/Hl7.Fhir.R4/Model/Generated/EnrollmentResponse.cs
index 2e19ba6220..6f3b5e969d 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/EnrollmentResponse.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/EnrollmentResponse.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("EnrollmentResponse","http://hl7.org/fhir/StructureDefinition/EnrollmentResponse", IsResource=true)]
+  [FhirType("EnrollmentResponse","http://hl7.org/fhir/StructureDefinition/EnrollmentResponse")]
   public partial class EnrollmentResponse : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
diff --git a/src/Hl7.Fhir.R4/Model/Generated/EpisodeOfCare.cs b/src/Hl7.Fhir.R4/Model/Generated/EpisodeOfCare.cs
index ae0e326d4c..81bcfbaa98 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/EpisodeOfCare.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/EpisodeOfCare.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("EpisodeOfCare","http://hl7.org/fhir/StructureDefinition/EpisodeOfCare", IsResource=true)]
+  [FhirType("EpisodeOfCare","http://hl7.org/fhir/StructureDefinition/EpisodeOfCare")]
   public partial class EpisodeOfCare : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>, ICoded<List<Hl7.Fhir.Model.CodeableConcept>>
   {
     /// <summary>
@@ -119,7 +119,7 @@ public enum EpisodeOfCareStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("EpisodeOfCare#StatusHistory", IsNestedType=true)]
+    [FhirType("EpisodeOfCare#StatusHistory")]
     [BackboneType("EpisodeOfCare.statusHistory")]
     public partial class StatusHistoryComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -289,7 +289,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("EpisodeOfCare#Diagnosis", IsNestedType=true)]
+    [FhirType("EpisodeOfCare#Diagnosis")]
     [BackboneType("EpisodeOfCare.diagnosis")]
     public partial class DiagnosisComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4/Model/Generated/EventDefinition.cs b/src/Hl7.Fhir.R4/Model/Generated/EventDefinition.cs
index aafe53f88e..8186e3e05a 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/EventDefinition.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/EventDefinition.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("EventDefinition","http://hl7.org/fhir/StructureDefinition/EventDefinition", IsResource=true)]
+  [FhirType("EventDefinition","http://hl7.org/fhir/StructureDefinition/EventDefinition")]
   public partial class EventDefinition : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
diff --git a/src/Hl7.Fhir.R4/Model/Generated/Evidence.cs b/src/Hl7.Fhir.R4/Model/Generated/Evidence.cs
index 999cd0bb5c..0c95952a13 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/Evidence.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/Evidence.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Evidence","http://hl7.org/fhir/StructureDefinition/Evidence", IsResource=true)]
+  [FhirType("Evidence","http://hl7.org/fhir/StructureDefinition/Evidence")]
   public partial class Evidence : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
diff --git a/src/Hl7.Fhir.R4/Model/Generated/EvidenceVariable.cs b/src/Hl7.Fhir.R4/Model/Generated/EvidenceVariable.cs
index 6aa759db18..e441b7bd9f 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/EvidenceVariable.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/EvidenceVariable.cs
@@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("EvidenceVariable","http://hl7.org/fhir/StructureDefinition/EvidenceVariable", IsResource=true)]
+  [FhirType("EvidenceVariable","http://hl7.org/fhir/StructureDefinition/EvidenceVariable")]
   public partial class EvidenceVariable : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -69,7 +69,7 @@ public partial class EvidenceVariable : Hl7.Fhir.Model.DomainResource, IIdentifi
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("EvidenceVariable#Characteristic", IsNestedType=true)]
+    [FhirType("EvidenceVariable#Characteristic")]
     [BackboneType("EvidenceVariable.characteristic")]
     public partial class CharacteristicComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4/Model/Generated/ExampleScenario.cs b/src/Hl7.Fhir.R4/Model/Generated/ExampleScenario.cs
index 1e30b81548..275e097149 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/ExampleScenario.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/ExampleScenario.cs
@@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model
   /// </summary>
   [Serializable]
   [DataContract]
-  [FhirType("ExampleScenario","http://hl7.org/fhir/StructureDefinition/ExampleScenario", IsResource=true)]
+  [FhirType("ExampleScenario","http://hl7.org/fhir/StructureDefinition/ExampleScenario")]
   public partial class ExampleScenario : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -83,7 +83,7 @@ public enum ExampleScenarioActorType
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("ExampleScenario#Actor", IsNestedType=true)]
+    [FhirType("ExampleScenario#Actor")]
     [BackboneType("ExampleScenario.actor")]
     public partial class ActorComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -357,7 +357,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("ExampleScenario#Instance", IsNestedType=true)]
+    [FhirType("ExampleScenario#Instance")]
     [BackboneType("ExampleScenario.instance")]
     public partial class InstanceComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -683,7 +683,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("ExampleScenario#Version", IsNestedType=true)]
+    [FhirType("ExampleScenario#Version")]
     [BackboneType("ExampleScenario.instance.version")]
     public partial class VersionComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -872,7 +872,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExampleScenario#ContainedInstance", IsNestedType=true)]
+    [FhirType("ExampleScenario#ContainedInstance")]
     [BackboneType("ExampleScenario.instance.containedInstance")]
     public partial class ContainedInstanceComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1057,7 +1057,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("ExampleScenario#Process", IsNestedType=true)]
+    [FhirType("ExampleScenario#Process")]
     [BackboneType("ExampleScenario.process")]
     public partial class ProcessComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1354,7 +1354,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("ExampleScenario#Step", IsNestedType=true)]
+    [FhirType("ExampleScenario#Step")]
     [BackboneType("ExampleScenario.process.step")]
     public partial class StepComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1572,7 +1572,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("ExampleScenario#Operation", IsNestedType=true)]
+    [FhirType("ExampleScenario#Operation")]
     [BackboneType("ExampleScenario.process.step.operation")]
     public partial class OperationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2068,7 +2068,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExampleScenario#Alternative", IsNestedType=true)]
+    [FhirType("ExampleScenario#Alternative")]
     [BackboneType("ExampleScenario.process.step.alternative")]
     public partial class AlternativeComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4/Model/Generated/ExplanationOfBenefit.cs b/src/Hl7.Fhir.R4/Model/Generated/ExplanationOfBenefit.cs
index f92c41fdd7..2c6a124eb6 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/ExplanationOfBenefit.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/ExplanationOfBenefit.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("ExplanationOfBenefit","http://hl7.org/fhir/StructureDefinition/ExplanationOfBenefit", IsResource=true)]
+  [FhirType("ExplanationOfBenefit","http://hl7.org/fhir/StructureDefinition/ExplanationOfBenefit")]
   public partial class ExplanationOfBenefit : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>, ICoded<Hl7.Fhir.Model.CodeableConcept>
   {
     /// <summary>
@@ -102,7 +102,7 @@ public enum ExplanationOfBenefitStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#RelatedClaim", IsNestedType=true)]
+    [FhirType("ExplanationOfBenefit#RelatedClaim")]
     [BackboneType("ExplanationOfBenefit.related")]
     public partial class RelatedClaimComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -282,7 +282,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#Payee", IsNestedType=true)]
+    [FhirType("ExplanationOfBenefit#Payee")]
     [BackboneType("ExplanationOfBenefit.payee")]
     public partial class PayeeComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -436,7 +436,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#CareTeam", IsNestedType=true)]
+    [FhirType("ExplanationOfBenefit#CareTeam")]
     [BackboneType("ExplanationOfBenefit.careTeam")]
     public partial class CareTeamComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -705,7 +705,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#SupportingInformation", IsNestedType=true)]
+    [FhirType("ExplanationOfBenefit#SupportingInformation")]
     [BackboneType("ExplanationOfBenefit.supportingInfo")]
     public partial class SupportingInformationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -984,7 +984,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#Diagnosis", IsNestedType=true)]
+    [FhirType("ExplanationOfBenefit#Diagnosis")]
     [BackboneType("ExplanationOfBenefit.diagnosis")]
     public partial class DiagnosisComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1238,7 +1238,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#Procedure", IsNestedType=true)]
+    [FhirType("ExplanationOfBenefit#Procedure")]
     [BackboneType("ExplanationOfBenefit.procedure")]
     public partial class ProcedureComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1512,7 +1512,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#Insurance", IsNestedType=true)]
+    [FhirType("ExplanationOfBenefit#Insurance")]
     [BackboneType("ExplanationOfBenefit.insurance")]
     public partial class InsuranceComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1729,7 +1729,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#Accident", IsNestedType=true)]
+    [FhirType("ExplanationOfBenefit#Accident")]
     [BackboneType("ExplanationOfBenefit.accident")]
     public partial class AccidentComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1927,7 +1927,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#Item", IsNestedType=true)]
+    [FhirType("ExplanationOfBenefit#Item")]
     [BackboneType("ExplanationOfBenefit.item")]
     public partial class ItemComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2760,7 +2760,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#Adjudication", IsNestedType=true)]
+    [FhirType("ExplanationOfBenefit#Adjudication")]
     [BackboneType("ExplanationOfBenefit.item.adjudication")]
     public partial class AdjudicationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2982,7 +2982,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#Detail", IsNestedType=true)]
+    [FhirType("ExplanationOfBenefit#Detail")]
     [BackboneType("ExplanationOfBenefit.item.detail")]
     public partial class DetailComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -3502,7 +3502,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#SubDetail", IsNestedType=true)]
+    [FhirType("ExplanationOfBenefit#SubDetail")]
     [BackboneType("ExplanationOfBenefit.item.detail.subDetail")]
     public partial class SubDetailComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -3996,7 +3996,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#AddedItem", IsNestedType=true)]
+    [FhirType("ExplanationOfBenefit#AddedItem")]
     [BackboneType("ExplanationOfBenefit.addItem")]
     public partial class AddedItemComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -4661,7 +4661,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#AddedItemDetail", IsNestedType=true)]
+    [FhirType("ExplanationOfBenefit#AddedItemDetail")]
     [BackboneType("ExplanationOfBenefit.addItem.detail")]
     public partial class AddedItemDetailComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -5030,7 +5030,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#AddedItemDetailSubDetail", IsNestedType=true)]
+    [FhirType("ExplanationOfBenefit#AddedItemDetailSubDetail")]
     [BackboneType("ExplanationOfBenefit.addItem.detail.subDetail")]
     public partial class AddedItemDetailSubDetailComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -5374,7 +5374,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#Total", IsNestedType=true)]
+    [FhirType("ExplanationOfBenefit#Total")]
     [BackboneType("ExplanationOfBenefit.total")]
     public partial class TotalComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -5528,7 +5528,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#Payment", IsNestedType=true)]
+    [FhirType("ExplanationOfBenefit#Payment")]
     [BackboneType("ExplanationOfBenefit.payment")]
     public partial class PaymentComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -5799,7 +5799,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#Note", IsNestedType=true)]
+    [FhirType("ExplanationOfBenefit#Note")]
     [BackboneType("ExplanationOfBenefit.processNote")]
     public partial class NoteComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -6054,7 +6054,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#BenefitBalance", IsNestedType=true)]
+    [FhirType("ExplanationOfBenefit#BenefitBalance")]
     [BackboneType("ExplanationOfBenefit.benefitBalance")]
     public partial class BenefitBalanceComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -6415,7 +6415,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#Benefit", IsNestedType=true)]
+    [FhirType("ExplanationOfBenefit#Benefit")]
     [BackboneType("ExplanationOfBenefit.benefitBalance.financial")]
     public partial class BenefitComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4/Model/Generated/FamilyMemberHistory.cs b/src/Hl7.Fhir.R4/Model/Generated/FamilyMemberHistory.cs
index 6dbd7eab60..befbf3ba8b 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/FamilyMemberHistory.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/FamilyMemberHistory.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("FamilyMemberHistory","http://hl7.org/fhir/StructureDefinition/FamilyMemberHistory", IsResource=true)]
+  [FhirType("FamilyMemberHistory","http://hl7.org/fhir/StructureDefinition/FamilyMemberHistory")]
   public partial class FamilyMemberHistory : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -101,7 +101,7 @@ public enum FamilyHistoryStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("FamilyMemberHistory#Condition", IsNestedType=true)]
+    [FhirType("FamilyMemberHistory#Condition")]
     [BackboneType("FamilyMemberHistory.condition")]
     public partial class ConditionComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4/Model/Generated/Flag.cs b/src/Hl7.Fhir.R4/Model/Generated/Flag.cs
index 874d05b7e6..7d7fa6b7c3 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/Flag.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/Flag.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Flag","http://hl7.org/fhir/StructureDefinition/Flag", IsResource=true)]
+  [FhirType("Flag","http://hl7.org/fhir/StructureDefinition/Flag")]
   public partial class Flag : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>, ICoded<Hl7.Fhir.Model.CodeableConcept>
   {
     /// <summary>
diff --git a/src/Hl7.Fhir.R4/Model/Generated/Goal.cs b/src/Hl7.Fhir.R4/Model/Generated/Goal.cs
index 68d2c0ff87..e0e133d69e 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/Goal.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/Goal.cs
@@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Goal","http://hl7.org/fhir/StructureDefinition/Goal", IsResource=true)]
+  [FhirType("Goal","http://hl7.org/fhir/StructureDefinition/Goal")]
   public partial class Goal : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>, ICoded<List<Hl7.Fhir.Model.CodeableConcept>>
   {
     /// <summary>
@@ -133,7 +133,7 @@ public enum GoalLifecycleStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Goal#Target", IsNestedType=true)]
+    [FhirType("Goal#Target")]
     [BackboneType("Goal.target")]
     public partial class TargetComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4/Model/Generated/GraphDefinition.cs b/src/Hl7.Fhir.R4/Model/Generated/GraphDefinition.cs
index 7aab062b3a..e788b05daf 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/GraphDefinition.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/GraphDefinition.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("GraphDefinition","http://hl7.org/fhir/StructureDefinition/GraphDefinition", IsResource=true)]
+  [FhirType("GraphDefinition","http://hl7.org/fhir/StructureDefinition/GraphDefinition")]
   public partial class GraphDefinition : Hl7.Fhir.Model.DomainResource
   {
     /// <summary>
@@ -120,7 +120,7 @@ public enum GraphCompartmentRule
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("GraphDefinition#Link", IsNestedType=true)]
+    [FhirType("GraphDefinition#Link")]
     [BackboneType("GraphDefinition.link")]
     public partial class LinkComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -459,7 +459,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("GraphDefinition#Target", IsNestedType=true)]
+    [FhirType("GraphDefinition#Target")]
     [BackboneType("GraphDefinition.link.target")]
     public partial class TargetComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -741,7 +741,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("GraphDefinition#Compartment", IsNestedType=true)]
+    [FhirType("GraphDefinition#Compartment")]
     [BackboneType("GraphDefinition.link.target.compartment")]
     public partial class CompartmentComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4/Model/Generated/Group.cs b/src/Hl7.Fhir.R4/Model/Generated/Group.cs
index cda11a4647..90a61ddc0f 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/Group.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/Group.cs
@@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Group","http://hl7.org/fhir/StructureDefinition/Group", IsResource=true)]
+  [FhirType("Group","http://hl7.org/fhir/StructureDefinition/Group")]
   public partial class Group : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>, ICoded<Hl7.Fhir.Model.CodeableConcept>
   {
     /// <summary>
@@ -115,7 +115,7 @@ public enum GroupType
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Group#Characteristic", IsNestedType=true)]
+    [FhirType("Group#Characteristic")]
     [BackboneType("Group.characteristic")]
     public partial class CharacteristicComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -341,7 +341,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Group#Member", IsNestedType=true)]
+    [FhirType("Group#Member")]
     [BackboneType("Group.member")]
     public partial class MemberComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4/Model/Generated/GuidanceResponse.cs b/src/Hl7.Fhir.R4/Model/Generated/GuidanceResponse.cs
index c255909672..0809e16cfa 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/GuidanceResponse.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/GuidanceResponse.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("GuidanceResponse","http://hl7.org/fhir/StructureDefinition/GuidanceResponse", IsResource=true)]
+  [FhirType("GuidanceResponse","http://hl7.org/fhir/StructureDefinition/GuidanceResponse")]
   public partial class GuidanceResponse : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>, ICoded<Hl7.Fhir.Model.DataType>
   {
     /// <summary>
diff --git a/src/Hl7.Fhir.R4/Model/Generated/HealthcareService.cs b/src/Hl7.Fhir.R4/Model/Generated/HealthcareService.cs
index 1c6715f9ec..cbc7c1fec5 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/HealthcareService.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/HealthcareService.cs
@@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model
   /// </summary>
   [Serializable]
   [DataContract]
-  [FhirType("HealthcareService","http://hl7.org/fhir/StructureDefinition/HealthcareService", IsResource=true)]
+  [FhirType("HealthcareService","http://hl7.org/fhir/StructureDefinition/HealthcareService")]
   public partial class HealthcareService : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>, ICoded<List<Hl7.Fhir.Model.CodeableConcept>>
   {
     /// <summary>
@@ -64,7 +64,7 @@ public partial class HealthcareService : Hl7.Fhir.Model.DomainResource, IIdentif
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("HealthcareService#Eligibility", IsNestedType=true)]
+    [FhirType("HealthcareService#Eligibility")]
     [BackboneType("HealthcareService.eligibility")]
     public partial class EligibilityComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -235,7 +235,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("HealthcareService#AvailableTime", IsNestedType=true)]
+    [FhirType("HealthcareService#AvailableTime")]
     [BackboneType("HealthcareService.availableTime")]
     public partial class AvailableTimeComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -511,7 +511,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("HealthcareService#NotAvailable", IsNestedType=true)]
+    [FhirType("HealthcareService#NotAvailable")]
     [BackboneType("HealthcareService.notAvailable")]
     public partial class NotAvailableComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4/Model/Generated/ImagingStudy.cs b/src/Hl7.Fhir.R4/Model/Generated/ImagingStudy.cs
index 64223e9f7b..33677be99a 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/ImagingStudy.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/ImagingStudy.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("ImagingStudy","http://hl7.org/fhir/StructureDefinition/ImagingStudy", IsResource=true)]
+  [FhirType("ImagingStudy","http://hl7.org/fhir/StructureDefinition/ImagingStudy")]
   public partial class ImagingStudy : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -107,7 +107,7 @@ public enum ImagingStudyStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ImagingStudy#Series", IsNestedType=true)]
+    [FhirType("ImagingStudy#Series")]
     [BackboneType("ImagingStudy.series")]
     public partial class SeriesComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -612,7 +612,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ImagingStudy#Performer", IsNestedType=true)]
+    [FhirType("ImagingStudy#Performer")]
     [BackboneType("ImagingStudy.series.performer")]
     public partial class PerformerComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -767,7 +767,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ImagingStudy#Instance", IsNestedType=true)]
+    [FhirType("ImagingStudy#Instance")]
     [BackboneType("ImagingStudy.series.instance")]
     public partial class InstanceComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4/Model/Generated/Immunization.cs b/src/Hl7.Fhir.R4/Model/Generated/Immunization.cs
index a196c20834..b6328572e8 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/Immunization.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/Immunization.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Immunization","http://hl7.org/fhir/StructureDefinition/Immunization", IsResource=true)]
+  [FhirType("Immunization","http://hl7.org/fhir/StructureDefinition/Immunization")]
   public partial class Immunization : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>, ICoded<Hl7.Fhir.Model.CodeableConcept>
   {
     /// <summary>
@@ -95,7 +95,7 @@ public enum ImmunizationStatusCodes
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Immunization#Performer", IsNestedType=true)]
+    [FhirType("Immunization#Performer")]
     [BackboneType("Immunization.performer")]
     public partial class PerformerComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -250,7 +250,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Immunization#Education", IsNestedType=true)]
+    [FhirType("Immunization#Education")]
     [BackboneType("Immunization.education")]
     public partial class EducationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -524,7 +524,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Immunization#Reaction", IsNestedType=true)]
+    [FhirType("Immunization#Reaction")]
     [BackboneType("Immunization.reaction")]
     public partial class ReactionComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -738,7 +738,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Immunization#ProtocolApplied", IsNestedType=true)]
+    [FhirType("Immunization#ProtocolApplied")]
     [BackboneType("Immunization.protocolApplied")]
     public partial class ProtocolAppliedComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4/Model/Generated/ImmunizationEvaluation.cs b/src/Hl7.Fhir.R4/Model/Generated/ImmunizationEvaluation.cs
index 7d787ee7ee..0348804f6a 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/ImmunizationEvaluation.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/ImmunizationEvaluation.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("ImmunizationEvaluation","http://hl7.org/fhir/StructureDefinition/ImmunizationEvaluation", IsResource=true)]
+  [FhirType("ImmunizationEvaluation","http://hl7.org/fhir/StructureDefinition/ImmunizationEvaluation")]
   public partial class ImmunizationEvaluation : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
diff --git a/src/Hl7.Fhir.R4/Model/Generated/ImmunizationRecommendation.cs b/src/Hl7.Fhir.R4/Model/Generated/ImmunizationRecommendation.cs
index fcb4ad7acc..8dd4c2f7f4 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/ImmunizationRecommendation.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/ImmunizationRecommendation.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("ImmunizationRecommendation","http://hl7.org/fhir/StructureDefinition/ImmunizationRecommendation", IsResource=true)]
+  [FhirType("ImmunizationRecommendation","http://hl7.org/fhir/StructureDefinition/ImmunizationRecommendation")]
   public partial class ImmunizationRecommendation : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -64,7 +64,7 @@ public partial class ImmunizationRecommendation : Hl7.Fhir.Model.DomainResource,
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("ImmunizationRecommendation#Recommendation", IsNestedType=true)]
+    [FhirType("ImmunizationRecommendation#Recommendation")]
     [BackboneType("ImmunizationRecommendation.recommendation")]
     public partial class RecommendationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -521,7 +521,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ImmunizationRecommendation#DateCriterion", IsNestedType=true)]
+    [FhirType("ImmunizationRecommendation#DateCriterion")]
     [BackboneType("ImmunizationRecommendation.recommendation.dateCriterion")]
     public partial class DateCriterionComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4/Model/Generated/ImplementationGuide.cs b/src/Hl7.Fhir.R4/Model/Generated/ImplementationGuide.cs
index 1e86c06d53..4cbac583f7 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/ImplementationGuide.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/ImplementationGuide.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("ImplementationGuide","http://hl7.org/fhir/StructureDefinition/ImplementationGuide", IsResource=true)]
+  [FhirType("ImplementationGuide","http://hl7.org/fhir/StructureDefinition/ImplementationGuide")]
   public partial class ImplementationGuide : Hl7.Fhir.Model.DomainResource
   {
     /// <summary>
@@ -2257,7 +2257,7 @@ public enum GuideParameterCode
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ImplementationGuide#DependsOn", IsNestedType=true)]
+    [FhirType("ImplementationGuide#DependsOn")]
     [BackboneType("ImplementationGuide.dependsOn")]
     public partial class DependsOnComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2489,7 +2489,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ImplementationGuide#Global", IsNestedType=true)]
+    [FhirType("ImplementationGuide#Global")]
     [BackboneType("ImplementationGuide.global")]
     public partial class GlobalComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2681,7 +2681,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ImplementationGuide#Definition", IsNestedType=true)]
+    [FhirType("ImplementationGuide#Definition")]
     [BackboneType("ImplementationGuide.definition")]
     public partial class DefinitionComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2912,7 +2912,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ImplementationGuide#Grouping", IsNestedType=true)]
+    [FhirType("ImplementationGuide#Grouping")]
     [BackboneType("ImplementationGuide.definition.grouping")]
     public partial class GroupingComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -3100,7 +3100,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ImplementationGuide#Resource", IsNestedType=true)]
+    [FhirType("ImplementationGuide#Resource")]
     [BackboneType("ImplementationGuide.definition.resource")]
     public partial class ResourceComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -3432,7 +3432,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ImplementationGuide#Page", IsNestedType=true)]
+    [FhirType("ImplementationGuide#Page")]
     [BackboneType("ImplementationGuide.definition.page")]
     public partial class PageComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -3675,7 +3675,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("ImplementationGuide#Parameter", IsNestedType=true)]
+    [FhirType("ImplementationGuide#Parameter")]
     [BackboneType("ImplementationGuide.definition.parameter")]
     public partial class ParameterComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -3863,7 +3863,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("ImplementationGuide#Template", IsNestedType=true)]
+    [FhirType("ImplementationGuide#Template")]
     [BackboneType("ImplementationGuide.definition.template")]
     public partial class TemplateComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -4095,7 +4095,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ImplementationGuide#Manifest", IsNestedType=true)]
+    [FhirType("ImplementationGuide#Manifest")]
     [BackboneType("ImplementationGuide.manifest")]
     public partial class ManifestComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -4379,7 +4379,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ImplementationGuide#ManifestResource", IsNestedType=true)]
+    [FhirType("ImplementationGuide#ManifestResource")]
     [BackboneType("ImplementationGuide.manifest.resource")]
     public partial class ManifestResourceComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -4578,7 +4578,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ImplementationGuide#ManifestPage", IsNestedType=true)]
+    [FhirType("ImplementationGuide#ManifestPage")]
     [BackboneType("ImplementationGuide.manifest.page")]
     public partial class ManifestPageComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4/Model/Generated/InsurancePlan.cs b/src/Hl7.Fhir.R4/Model/Generated/InsurancePlan.cs
index fdf99df9ed..7c6c974e84 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/InsurancePlan.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/InsurancePlan.cs
@@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model
   /// </summary>
   [Serializable]
   [DataContract]
-  [FhirType("InsurancePlan","http://hl7.org/fhir/StructureDefinition/InsurancePlan", IsResource=true)]
+  [FhirType("InsurancePlan","http://hl7.org/fhir/StructureDefinition/InsurancePlan")]
   public partial class InsurancePlan : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -93,7 +93,7 @@ public enum BenefitCostApplicability
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("InsurancePlan#Contact", IsNestedType=true)]
+    [FhirType("InsurancePlan#Contact")]
     [BackboneType("InsurancePlan.contact")]
     public partial class ContactComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -296,7 +296,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("InsurancePlan#Coverage", IsNestedType=true)]
+    [FhirType("InsurancePlan#Coverage")]
     [BackboneType("InsurancePlan.coverage")]
     public partial class CoverageComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -477,7 +477,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("InsurancePlan#CoverageBenefit", IsNestedType=true)]
+    [FhirType("InsurancePlan#CoverageBenefit")]
     [BackboneType("InsurancePlan.coverage.benefit")]
     public partial class CoverageBenefitComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -673,7 +673,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("InsurancePlan#Limit", IsNestedType=true)]
+    [FhirType("InsurancePlan#Limit")]
     [BackboneType("InsurancePlan.coverage.benefit.limit")]
     public partial class LimitComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -824,7 +824,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("InsurancePlan#Plan", IsNestedType=true)]
+    [FhirType("InsurancePlan#Plan")]
     [BackboneType("InsurancePlan.plan")]
     public partial class PlanComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1084,7 +1084,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("InsurancePlan#GeneralCost", IsNestedType=true)]
+    [FhirType("InsurancePlan#GeneralCost")]
     [BackboneType("InsurancePlan.plan.generalCost")]
     public partial class GeneralCostComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1321,7 +1321,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("InsurancePlan#SpecificCost", IsNestedType=true)]
+    [FhirType("InsurancePlan#SpecificCost")]
     [BackboneType("InsurancePlan.plan.specificCost")]
     public partial class SpecificCostComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1474,7 +1474,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("InsurancePlan#PlanBenefit", IsNestedType=true)]
+    [FhirType("InsurancePlan#PlanBenefit")]
     [BackboneType("InsurancePlan.plan.specificCost.benefit")]
     public partial class PlanBenefitComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1627,7 +1627,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("InsurancePlan#Cost", IsNestedType=true)]
+    [FhirType("InsurancePlan#Cost")]
     [BackboneType("InsurancePlan.plan.specificCost.benefit.cost")]
     public partial class CostComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4/Model/Generated/Invoice.cs b/src/Hl7.Fhir.R4/Model/Generated/Invoice.cs
index 5d2910457d..4fa02a68f3 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/Invoice.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/Invoice.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Invoice","http://hl7.org/fhir/StructureDefinition/Invoice", IsResource=true)]
+  [FhirType("Invoice","http://hl7.org/fhir/StructureDefinition/Invoice")]
   public partial class Invoice : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -107,7 +107,7 @@ public enum InvoiceStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Invoice#Participant", IsNestedType=true)]
+    [FhirType("Invoice#Participant")]
     [BackboneType("Invoice.participant")]
     public partial class ParticipantComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -261,7 +261,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Invoice#LineItem", IsNestedType=true)]
+    [FhirType("Invoice#LineItem")]
     [BackboneType("Invoice.lineItem")]
     public partial class LineItemComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -460,7 +460,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Invoice#PriceComponent", IsNestedType=true)]
+    [FhirType("Invoice#PriceComponent")]
     [BackboneType("Invoice.lineItem.priceComponent")]
     public partial class PriceComponentComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4/Model/Generated/Library.cs b/src/Hl7.Fhir.R4/Model/Generated/Library.cs
index a1274b933a..fcbed94a73 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/Library.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/Library.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Library","http://hl7.org/fhir/StructureDefinition/Library", IsResource=true)]
+  [FhirType("Library","http://hl7.org/fhir/StructureDefinition/Library")]
   public partial class Library : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>, ICoded<List<Hl7.Fhir.Model.CodeableConcept>>
   {
     /// <summary>
diff --git a/src/Hl7.Fhir.R4/Model/Generated/Linkage.cs b/src/Hl7.Fhir.R4/Model/Generated/Linkage.cs
index 72b40f4919..747b4b55a1 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/Linkage.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/Linkage.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Linkage","http://hl7.org/fhir/StructureDefinition/Linkage", IsResource=true)]
+  [FhirType("Linkage","http://hl7.org/fhir/StructureDefinition/Linkage")]
   public partial class Linkage : Hl7.Fhir.Model.DomainResource
   {
     /// <summary>
@@ -95,7 +95,7 @@ public enum LinkageType
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Linkage#Item", IsNestedType=true)]
+    [FhirType("Linkage#Item")]
     [BackboneType("Linkage.item")]
     public partial class ItemComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4/Model/Generated/List.cs b/src/Hl7.Fhir.R4/Model/Generated/List.cs
index 7e8e59148a..5ed1616ec8 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/List.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/List.cs
@@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model
   /// </summary>
   [Serializable]
   [DataContract]
-  [FhirType("List","http://hl7.org/fhir/StructureDefinition/List", IsResource=true)]
+  [FhirType("List","http://hl7.org/fhir/StructureDefinition/List")]
   public partial class List : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>, ICoded<Hl7.Fhir.Model.CodeableConcept>
   {
     /// <summary>
@@ -93,7 +93,7 @@ public enum ListStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("List#Entry", IsNestedType=true)]
+    [FhirType("List#Entry")]
     [BackboneType("List.entry")]
     public partial class EntryComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4/Model/Generated/Location.cs b/src/Hl7.Fhir.R4/Model/Generated/Location.cs
index 40d7d98893..8d82e59642 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/Location.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/Location.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Location","http://hl7.org/fhir/StructureDefinition/Location", IsResource=true)]
+  [FhirType("Location","http://hl7.org/fhir/StructureDefinition/Location")]
   public partial class Location : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>, ICoded<List<Hl7.Fhir.Model.CodeableConcept>>
   {
     /// <summary>
@@ -117,7 +117,7 @@ public enum LocationMode
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Location#Position", IsNestedType=true)]
+    [FhirType("Location#Position")]
     [BackboneType("Location.position")]
     public partial class PositionComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -350,7 +350,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Location#HoursOfOperation", IsNestedType=true)]
+    [FhirType("Location#HoursOfOperation")]
     [BackboneType("Location.hoursOfOperation")]
     public partial class HoursOfOperationComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4/Model/Generated/Measure.cs b/src/Hl7.Fhir.R4/Model/Generated/Measure.cs
index ba76cef10a..2735be1e7d 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/Measure.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/Measure.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Measure","http://hl7.org/fhir/StructureDefinition/Measure", IsResource=true)]
+  [FhirType("Measure","http://hl7.org/fhir/StructureDefinition/Measure")]
   public partial class Measure : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>, ICoded<List<Hl7.Fhir.Model.CodeableConcept>>
   {
     /// <summary>
@@ -67,7 +67,7 @@ public partial class Measure : Hl7.Fhir.Model.DomainResource, IIdentifiable<List
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Measure#Group", IsNestedType=true)]
+    [FhirType("Measure#Group")]
     [BackboneType("Measure.group")]
     public partial class GroupComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -288,7 +288,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Measure#Population", IsNestedType=true)]
+    [FhirType("Measure#Population")]
     [BackboneType("Measure.group.population")]
     public partial class PopulationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -484,7 +484,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Measure#Stratifier", IsNestedType=true)]
+    [FhirType("Measure#Stratifier")]
     [BackboneType("Measure.group.stratifier")]
     public partial class StratifierComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -705,7 +705,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Measure#Component", IsNestedType=true)]
+    [FhirType("Measure#Component")]
     [BackboneType("Measure.group.stratifier.component")]
     public partial class ComponentComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -901,7 +901,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Measure#SupplementalData", IsNestedType=true)]
+    [FhirType("Measure#SupplementalData")]
     [BackboneType("Measure.supplementalData")]
     public partial class SupplementalDataComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4/Model/Generated/MeasureReport.cs b/src/Hl7.Fhir.R4/Model/Generated/MeasureReport.cs
index 7a148c3813..cecbe3c358 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/MeasureReport.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/MeasureReport.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("MeasureReport","http://hl7.org/fhir/StructureDefinition/MeasureReport", IsResource=true)]
+  [FhirType("MeasureReport","http://hl7.org/fhir/StructureDefinition/MeasureReport")]
   public partial class MeasureReport : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -129,7 +129,7 @@ public enum MeasureReportType
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MeasureReport#Group", IsNestedType=true)]
+    [FhirType("MeasureReport#Group")]
     [BackboneType("MeasureReport.group")]
     public partial class GroupComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -332,7 +332,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MeasureReport#Population", IsNestedType=true)]
+    [FhirType("MeasureReport#Population")]
     [BackboneType("MeasureReport.group.population")]
     public partial class PopulationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -529,7 +529,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MeasureReport#Stratifier", IsNestedType=true)]
+    [FhirType("MeasureReport#Stratifier")]
     [BackboneType("MeasureReport.group.stratifier")]
     public partial class StratifierComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -682,7 +682,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MeasureReport#StratifierGroup", IsNestedType=true)]
+    [FhirType("MeasureReport#StratifierGroup")]
     [BackboneType("MeasureReport.group.stratifier.stratum")]
     public partial class StratifierGroupComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -885,7 +885,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MeasureReport#Component", IsNestedType=true)]
+    [FhirType("MeasureReport#Component")]
     [BackboneType("MeasureReport.group.stratifier.stratum.component")]
     public partial class ComponentComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1038,7 +1038,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MeasureReport#StratifierGroupPopulation", IsNestedType=true)]
+    [FhirType("MeasureReport#StratifierGroupPopulation")]
     [BackboneType("MeasureReport.group.stratifier.stratum.population")]
     public partial class StratifierGroupPopulationComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4/Model/Generated/Media.cs b/src/Hl7.Fhir.R4/Model/Generated/Media.cs
index 0d7577619f..a7eb0aff32 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/Media.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/Media.cs
@@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model
   /// </summary>
   [Serializable]
   [DataContract]
-  [FhirType("Media","http://hl7.org/fhir/StructureDefinition/Media", IsResource=true)]
+  [FhirType("Media","http://hl7.org/fhir/StructureDefinition/Media")]
   public partial class Media : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
diff --git a/src/Hl7.Fhir.R4/Model/Generated/Medication.cs b/src/Hl7.Fhir.R4/Model/Generated/Medication.cs
index 97e07ada14..1d29886cd9 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/Medication.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/Medication.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Medication","http://hl7.org/fhir/StructureDefinition/Medication", IsResource=true)]
+  [FhirType("Medication","http://hl7.org/fhir/StructureDefinition/Medication")]
   public partial class Medication : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>, ICoded<Hl7.Fhir.Model.CodeableConcept>
   {
     /// <summary>
@@ -96,7 +96,7 @@ public enum MedicationStatusCodes
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Medication#Ingredient", IsNestedType=true)]
+    [FhirType("Medication#Ingredient")]
     [BackboneType("Medication.ingredient")]
     public partial class IngredientComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -294,7 +294,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Medication#Batch", IsNestedType=true)]
+    [FhirType("Medication#Batch")]
     [BackboneType("Medication.batch")]
     public partial class BatchComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4/Model/Generated/MedicationAdministration.cs b/src/Hl7.Fhir.R4/Model/Generated/MedicationAdministration.cs
index cb6f284659..1253b49735 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/MedicationAdministration.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/MedicationAdministration.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("MedicationAdministration","http://hl7.org/fhir/StructureDefinition/MedicationAdministration", IsResource=true)]
+  [FhirType("MedicationAdministration","http://hl7.org/fhir/StructureDefinition/MedicationAdministration")]
   public partial class MedicationAdministration : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>, ICoded<Hl7.Fhir.Model.DataType>
   {
     /// <summary>
@@ -119,7 +119,7 @@ public enum MedicationAdministrationStatusCodes
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationAdministration#Performer", IsNestedType=true)]
+    [FhirType("MedicationAdministration#Performer")]
     [BackboneType("MedicationAdministration.performer")]
     public partial class PerformerComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -274,7 +274,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationAdministration#Dosage", IsNestedType=true)]
+    [FhirType("MedicationAdministration#Dosage")]
     [BackboneType("MedicationAdministration.dosage")]
     public partial class DosageComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4/Model/Generated/MedicationDispense.cs b/src/Hl7.Fhir.R4/Model/Generated/MedicationDispense.cs
index 93d1ad4a1e..346b6e649d 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/MedicationDispense.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/MedicationDispense.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("MedicationDispense","http://hl7.org/fhir/StructureDefinition/MedicationDispense", IsResource=true)]
+  [FhirType("MedicationDispense","http://hl7.org/fhir/StructureDefinition/MedicationDispense")]
   public partial class MedicationDispense : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>, ICoded<Hl7.Fhir.Model.DataType>
   {
     /// <summary>
@@ -131,7 +131,7 @@ public enum MedicationDispenseStatusCodes
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationDispense#Performer", IsNestedType=true)]
+    [FhirType("MedicationDispense#Performer")]
     [BackboneType("MedicationDispense.performer")]
     public partial class PerformerComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -286,7 +286,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationDispense#Substitution", IsNestedType=true)]
+    [FhirType("MedicationDispense#Substitution")]
     [BackboneType("MedicationDispense.substitution")]
     public partial class SubstitutionComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4/Model/Generated/MedicationKnowledge.cs b/src/Hl7.Fhir.R4/Model/Generated/MedicationKnowledge.cs
index ed12b38b07..05c95ee9ec 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/MedicationKnowledge.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/MedicationKnowledge.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("MedicationKnowledge","http://hl7.org/fhir/StructureDefinition/MedicationKnowledge", IsResource=true)]
+  [FhirType("MedicationKnowledge","http://hl7.org/fhir/StructureDefinition/MedicationKnowledge")]
   public partial class MedicationKnowledge : Hl7.Fhir.Model.DomainResource, ICoded<Hl7.Fhir.Model.CodeableConcept>
   {
     /// <summary>
@@ -95,7 +95,7 @@ public enum MedicationKnowledgeStatusCodes
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationKnowledge#RelatedMedicationKnowledge", IsNestedType=true)]
+    [FhirType("MedicationKnowledge#RelatedMedicationKnowledge")]
     [BackboneType("MedicationKnowledge.relatedMedicationKnowledge")]
     public partial class RelatedMedicationKnowledgeComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -247,7 +247,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationKnowledge#Monograph", IsNestedType=true)]
+    [FhirType("MedicationKnowledge#Monograph")]
     [BackboneType("MedicationKnowledge.monograph")]
     public partial class MonographComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -400,7 +400,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationKnowledge#Ingredient", IsNestedType=true)]
+    [FhirType("MedicationKnowledge#Ingredient")]
     [BackboneType("MedicationKnowledge.ingredient")]
     public partial class IngredientComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -598,7 +598,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationKnowledge#Cost", IsNestedType=true)]
+    [FhirType("MedicationKnowledge#Cost")]
     [BackboneType("MedicationKnowledge.cost")]
     public partial class CostComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -794,7 +794,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationKnowledge#MonitoringProgram", IsNestedType=true)]
+    [FhirType("MedicationKnowledge#MonitoringProgram")]
     [BackboneType("MedicationKnowledge.monitoringProgram")]
     public partial class MonitoringProgramComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -963,7 +963,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationKnowledge#AdministrationGuidelines", IsNestedType=true)]
+    [FhirType("MedicationKnowledge#AdministrationGuidelines")]
     [BackboneType("MedicationKnowledge.administrationGuidelines")]
     public partial class AdministrationGuidelinesComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1141,7 +1141,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationKnowledge#Dosage", IsNestedType=true)]
+    [FhirType("MedicationKnowledge#Dosage")]
     [BackboneType("MedicationKnowledge.administrationGuidelines.dosage")]
     public partial class DosageComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1294,7 +1294,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationKnowledge#PatientCharacteristics", IsNestedType=true)]
+    [FhirType("MedicationKnowledge#PatientCharacteristics")]
     [BackboneType("MedicationKnowledge.administrationGuidelines.patientCharacteristics")]
     public partial class PatientCharacteristicsComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1464,7 +1464,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationKnowledge#MedicineClassification", IsNestedType=true)]
+    [FhirType("MedicationKnowledge#MedicineClassification")]
     [BackboneType("MedicationKnowledge.medicineClassification")]
     public partial class MedicineClassificationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1617,7 +1617,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationKnowledge#Packaging", IsNestedType=true)]
+    [FhirType("MedicationKnowledge#Packaging")]
     [BackboneType("MedicationKnowledge.packaging")]
     public partial class PackagingComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1769,7 +1769,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationKnowledge#DrugCharacteristic", IsNestedType=true)]
+    [FhirType("MedicationKnowledge#DrugCharacteristic")]
     [BackboneType("MedicationKnowledge.drugCharacteristic")]
     public partial class DrugCharacteristicComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1920,7 +1920,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationKnowledge#Regulatory", IsNestedType=true)]
+    [FhirType("MedicationKnowledge#Regulatory")]
     [BackboneType("MedicationKnowledge.regulatory")]
     public partial class RegulatoryComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2123,7 +2123,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationKnowledge#Substitution", IsNestedType=true)]
+    [FhirType("MedicationKnowledge#Substitution")]
     [BackboneType("MedicationKnowledge.regulatory.substitution")]
     public partial class SubstitutionComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2291,7 +2291,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationKnowledge#Schedule", IsNestedType=true)]
+    [FhirType("MedicationKnowledge#Schedule")]
     [BackboneType("MedicationKnowledge.regulatory.schedule")]
     public partial class ScheduleComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2415,7 +2415,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationKnowledge#MaxDispense", IsNestedType=true)]
+    [FhirType("MedicationKnowledge#MaxDispense")]
     [BackboneType("MedicationKnowledge.regulatory.maxDispense")]
     public partial class MaxDispenseComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2564,7 +2564,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationKnowledge#Kinetics", IsNestedType=true)]
+    [FhirType("MedicationKnowledge#Kinetics")]
     [BackboneType("MedicationKnowledge.kinetics")]
     public partial class KineticsComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4/Model/Generated/MedicationRequest.cs b/src/Hl7.Fhir.R4/Model/Generated/MedicationRequest.cs
index 9cf3952102..f5b80a1ad8 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/MedicationRequest.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/MedicationRequest.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("MedicationRequest","http://hl7.org/fhir/StructureDefinition/MedicationRequest", IsResource=true)]
+  [FhirType("MedicationRequest","http://hl7.org/fhir/StructureDefinition/MedicationRequest")]
   public partial class MedicationRequest : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>, ICoded<Hl7.Fhir.Model.DataType>
   {
     /// <summary>
@@ -183,7 +183,7 @@ public enum MedicationRequestIntent
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationRequest#DispenseRequest", IsNestedType=true)]
+    [FhirType("MedicationRequest#DispenseRequest")]
     [BackboneType("MedicationRequest.dispenseRequest")]
     public partial class DispenseRequestComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -480,7 +480,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationRequest#InitialFill", IsNestedType=true)]
+    [FhirType("MedicationRequest#InitialFill")]
     [BackboneType("MedicationRequest.dispenseRequest.initialFill")]
     public partial class InitialFillComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -631,7 +631,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationRequest#Substitution", IsNestedType=true)]
+    [FhirType("MedicationRequest#Substitution")]
     [BackboneType("MedicationRequest.substitution")]
     public partial class SubstitutionComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4/Model/Generated/MedicationStatement.cs b/src/Hl7.Fhir.R4/Model/Generated/MedicationStatement.cs
index 1bf70b8ac5..db362d1fa2 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/MedicationStatement.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/MedicationStatement.cs
@@ -62,7 +62,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("MedicationStatement","http://hl7.org/fhir/StructureDefinition/MedicationStatement", IsResource=true)]
+  [FhirType("MedicationStatement","http://hl7.org/fhir/StructureDefinition/MedicationStatement")]
   public partial class MedicationStatement : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>, ICoded<Hl7.Fhir.Model.DataType>
   {
     /// <summary>
diff --git a/src/Hl7.Fhir.R4/Model/Generated/MedicinalProduct.cs b/src/Hl7.Fhir.R4/Model/Generated/MedicinalProduct.cs
index 108b8ada60..17d3a5db28 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/MedicinalProduct.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/MedicinalProduct.cs
@@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model
   /// </summary>
   [Serializable]
   [DataContract]
-  [FhirType("MedicinalProduct","http://hl7.org/fhir/StructureDefinition/MedicinalProduct", IsResource=true)]
+  [FhirType("MedicinalProduct","http://hl7.org/fhir/StructureDefinition/MedicinalProduct")]
   public partial class MedicinalProduct : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -61,7 +61,7 @@ public partial class MedicinalProduct : Hl7.Fhir.Model.DomainResource, IIdentifi
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("MedicinalProduct#Name", IsNestedType=true)]
+    [FhirType("MedicinalProduct#Name")]
     [BackboneType("MedicinalProduct.name")]
     public partial class NameComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -255,7 +255,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("MedicinalProduct#NamePart", IsNestedType=true)]
+    [FhirType("MedicinalProduct#NamePart")]
     [BackboneType("MedicinalProduct.name.namePart")]
     public partial class NamePartComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -423,7 +423,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("MedicinalProduct#CountryLanguage", IsNestedType=true)]
+    [FhirType("MedicinalProduct#CountryLanguage")]
     [BackboneType("MedicinalProduct.name.countryLanguage")]
     public partial class CountryLanguageComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -598,7 +598,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("MedicinalProduct#ManufacturingBusinessOperation", IsNestedType=true)]
+    [FhirType("MedicinalProduct#ManufacturingBusinessOperation")]
     [BackboneType("MedicinalProduct.manufacturingBusinessOperation")]
     public partial class ManufacturingBusinessOperationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -869,7 +869,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("MedicinalProduct#SpecialDesignation", IsNestedType=true)]
+    [FhirType("MedicinalProduct#SpecialDesignation")]
     [BackboneType("MedicinalProduct.specialDesignation")]
     public partial class SpecialDesignationComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductAuthorization.cs b/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductAuthorization.cs
index 90548009b5..f5f7b20b72 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductAuthorization.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductAuthorization.cs
@@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model
   /// </summary>
   [Serializable]
   [DataContract]
-  [FhirType("MedicinalProductAuthorization","http://hl7.org/fhir/StructureDefinition/MedicinalProductAuthorization", IsResource=true)]
+  [FhirType("MedicinalProductAuthorization","http://hl7.org/fhir/StructureDefinition/MedicinalProductAuthorization")]
   public partial class MedicinalProductAuthorization : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -61,7 +61,7 @@ public partial class MedicinalProductAuthorization : Hl7.Fhir.Model.DomainResour
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("MedicinalProductAuthorization#JurisdictionalAuthorization", IsNestedType=true)]
+    [FhirType("MedicinalProductAuthorization#JurisdictionalAuthorization")]
     [BackboneType("MedicinalProductAuthorization.jurisdictionalAuthorization")]
     public partial class JurisdictionalAuthorizationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -286,7 +286,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("MedicinalProductAuthorization#Procedure", IsNestedType=true)]
+    [FhirType("MedicinalProductAuthorization#Procedure")]
     [BackboneType("MedicinalProductAuthorization.procedure")]
     public partial class ProcedureComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductContraindication.cs b/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductContraindication.cs
index c5de22ac6b..3f74197a91 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductContraindication.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductContraindication.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("MedicinalProductContraindication","http://hl7.org/fhir/StructureDefinition/MedicinalProductContraindication", IsResource=true)]
+  [FhirType("MedicinalProductContraindication","http://hl7.org/fhir/StructureDefinition/MedicinalProductContraindication")]
   public partial class MedicinalProductContraindication : Hl7.Fhir.Model.DomainResource
   {
     /// <summary>
@@ -64,7 +64,7 @@ public partial class MedicinalProductContraindication : Hl7.Fhir.Model.DomainRes
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("MedicinalProductContraindication#OtherTherapy", IsNestedType=true)]
+    [FhirType("MedicinalProductContraindication#OtherTherapy")]
     [BackboneType("MedicinalProductContraindication.otherTherapy")]
     public partial class OtherTherapyComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductIndication.cs b/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductIndication.cs
index 632db1a377..cbb8fd9927 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductIndication.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductIndication.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("MedicinalProductIndication","http://hl7.org/fhir/StructureDefinition/MedicinalProductIndication", IsResource=true)]
+  [FhirType("MedicinalProductIndication","http://hl7.org/fhir/StructureDefinition/MedicinalProductIndication")]
   public partial class MedicinalProductIndication : Hl7.Fhir.Model.DomainResource
   {
     /// <summary>
@@ -64,7 +64,7 @@ public partial class MedicinalProductIndication : Hl7.Fhir.Model.DomainResource
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("MedicinalProductIndication#OtherTherapy", IsNestedType=true)]
+    [FhirType("MedicinalProductIndication#OtherTherapy")]
     [BackboneType("MedicinalProductIndication.otherTherapy")]
     public partial class OtherTherapyComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductIngredient.cs b/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductIngredient.cs
index 946333aaa4..a0984fd4df 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductIngredient.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductIngredient.cs
@@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model
   /// </summary>
   [Serializable]
   [DataContract]
-  [FhirType("MedicinalProductIngredient","http://hl7.org/fhir/StructureDefinition/MedicinalProductIngredient", IsResource=true)]
+  [FhirType("MedicinalProductIngredient","http://hl7.org/fhir/StructureDefinition/MedicinalProductIngredient")]
   public partial class MedicinalProductIngredient : Hl7.Fhir.Model.DomainResource, IIdentifiable<Identifier>
   {
     /// <summary>
@@ -61,7 +61,7 @@ public partial class MedicinalProductIngredient : Hl7.Fhir.Model.DomainResource,
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("MedicinalProductIngredient#SpecifiedSubstance", IsNestedType=true)]
+    [FhirType("MedicinalProductIngredient#SpecifiedSubstance")]
     [BackboneType("MedicinalProductIngredient.specifiedSubstance")]
     public partial class SpecifiedSubstanceComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -262,7 +262,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("MedicinalProductIngredient#Strength", IsNestedType=true)]
+    [FhirType("MedicinalProductIngredient#Strength")]
     [BackboneType("MedicinalProductIngredient.specifiedSubstance.strength")]
     public partial class StrengthComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -556,7 +556,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("MedicinalProductIngredient#ReferenceStrength", IsNestedType=true)]
+    [FhirType("MedicinalProductIngredient#ReferenceStrength")]
     [BackboneType("MedicinalProductIngredient.specifiedSubstance.strength.referenceStrength")]
     public partial class ReferenceStrengthComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -799,7 +799,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("MedicinalProductIngredient#Substance", IsNestedType=true)]
+    [FhirType("MedicinalProductIngredient#Substance")]
     [BackboneType("MedicinalProductIngredient.substance")]
     public partial class SubstanceComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductInteraction.cs b/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductInteraction.cs
index e647a220e0..2a77baea97 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductInteraction.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductInteraction.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("MedicinalProductInteraction","http://hl7.org/fhir/StructureDefinition/MedicinalProductInteraction", IsResource=true)]
+  [FhirType("MedicinalProductInteraction","http://hl7.org/fhir/StructureDefinition/MedicinalProductInteraction")]
   public partial class MedicinalProductInteraction : Hl7.Fhir.Model.DomainResource
   {
     /// <summary>
@@ -64,7 +64,7 @@ public partial class MedicinalProductInteraction : Hl7.Fhir.Model.DomainResource
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("MedicinalProductInteraction#Interactant", IsNestedType=true)]
+    [FhirType("MedicinalProductInteraction#Interactant")]
     [BackboneType("MedicinalProductInteraction.interactant")]
     public partial class InteractantComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductManufactured.cs b/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductManufactured.cs
index 00b4a61208..e10313c783 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductManufactured.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductManufactured.cs
@@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model
   /// </summary>
   [Serializable]
   [DataContract]
-  [FhirType("MedicinalProductManufactured","http://hl7.org/fhir/StructureDefinition/MedicinalProductManufactured", IsResource=true)]
+  [FhirType("MedicinalProductManufactured","http://hl7.org/fhir/StructureDefinition/MedicinalProductManufactured")]
   public partial class MedicinalProductManufactured : Hl7.Fhir.Model.DomainResource
   {
     /// <summary>
diff --git a/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductPackaged.cs b/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductPackaged.cs
index d71f80a36b..48edce22a5 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductPackaged.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductPackaged.cs
@@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model
   /// </summary>
   [Serializable]
   [DataContract]
-  [FhirType("MedicinalProductPackaged","http://hl7.org/fhir/StructureDefinition/MedicinalProductPackaged", IsResource=true)]
+  [FhirType("MedicinalProductPackaged","http://hl7.org/fhir/StructureDefinition/MedicinalProductPackaged")]
   public partial class MedicinalProductPackaged : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -61,7 +61,7 @@ public partial class MedicinalProductPackaged : Hl7.Fhir.Model.DomainResource, I
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("MedicinalProductPackaged#BatchIdentifier", IsNestedType=true)]
+    [FhirType("MedicinalProductPackaged#BatchIdentifier")]
     [BackboneType("MedicinalProductPackaged.batchIdentifier")]
     public partial class BatchIdentifierComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -210,7 +210,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("MedicinalProductPackaged#PackageItem", IsNestedType=true)]
+    [FhirType("MedicinalProductPackaged#PackageItem")]
     [BackboneType("MedicinalProductPackaged.packageItem")]
     public partial class PackageItemComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductPharmaceutical.cs b/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductPharmaceutical.cs
index eacb99d654..4c170a2c02 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductPharmaceutical.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductPharmaceutical.cs
@@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model
   /// </summary>
   [Serializable]
   [DataContract]
-  [FhirType("MedicinalProductPharmaceutical","http://hl7.org/fhir/StructureDefinition/MedicinalProductPharmaceutical", IsResource=true)]
+  [FhirType("MedicinalProductPharmaceutical","http://hl7.org/fhir/StructureDefinition/MedicinalProductPharmaceutical")]
   public partial class MedicinalProductPharmaceutical : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -61,7 +61,7 @@ public partial class MedicinalProductPharmaceutical : Hl7.Fhir.Model.DomainResou
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("MedicinalProductPharmaceutical#Characteristics", IsNestedType=true)]
+    [FhirType("MedicinalProductPharmaceutical#Characteristics")]
     [BackboneType("MedicinalProductPharmaceutical.characteristics")]
     public partial class CharacteristicsComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -210,7 +210,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("MedicinalProductPharmaceutical#RouteOfAdministration", IsNestedType=true)]
+    [FhirType("MedicinalProductPharmaceutical#RouteOfAdministration")]
     [BackboneType("MedicinalProductPharmaceutical.routeOfAdministration")]
     public partial class RouteOfAdministrationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -485,7 +485,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("MedicinalProductPharmaceutical#TargetSpecies", IsNestedType=true)]
+    [FhirType("MedicinalProductPharmaceutical#TargetSpecies")]
     [BackboneType("MedicinalProductPharmaceutical.routeOfAdministration.targetSpecies")]
     public partial class TargetSpeciesComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -635,7 +635,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("MedicinalProductPharmaceutical#WithdrawalPeriod", IsNestedType=true)]
+    [FhirType("MedicinalProductPharmaceutical#WithdrawalPeriod")]
     [BackboneType("MedicinalProductPharmaceutical.routeOfAdministration.targetSpecies.withdrawalPeriod")]
     public partial class WithdrawalPeriodComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductUndesirableEffect.cs b/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductUndesirableEffect.cs
index c7a7eaf317..a66824fda2 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductUndesirableEffect.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductUndesirableEffect.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("MedicinalProductUndesirableEffect","http://hl7.org/fhir/StructureDefinition/MedicinalProductUndesirableEffect", IsResource=true)]
+  [FhirType("MedicinalProductUndesirableEffect","http://hl7.org/fhir/StructureDefinition/MedicinalProductUndesirableEffect")]
   public partial class MedicinalProductUndesirableEffect : Hl7.Fhir.Model.DomainResource
   {
     /// <summary>
diff --git a/src/Hl7.Fhir.R4/Model/Generated/MessageDefinition.cs b/src/Hl7.Fhir.R4/Model/Generated/MessageDefinition.cs
index f544fe255e..ca7add61c7 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/MessageDefinition.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/MessageDefinition.cs
@@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("MessageDefinition","http://hl7.org/fhir/StructureDefinition/MessageDefinition", IsResource=true)]
+  [FhirType("MessageDefinition","http://hl7.org/fhir/StructureDefinition/MessageDefinition")]
   public partial class MessageDefinition : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>, ICoded<Hl7.Fhir.Model.DataType>
   {
     /// <summary>
@@ -96,7 +96,7 @@ public enum MessageSignificanceCategory
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MessageDefinition#Focus", IsNestedType=true)]
+    [FhirType("MessageDefinition#Focus")]
     [BackboneType("MessageDefinition.focus")]
     public partial class FocusComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -374,7 +374,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MessageDefinition#AllowedResponse", IsNestedType=true)]
+    [FhirType("MessageDefinition#AllowedResponse")]
     [BackboneType("MessageDefinition.allowedResponse")]
     public partial class AllowedResponseComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4/Model/Generated/MessageHeader.cs b/src/Hl7.Fhir.R4/Model/Generated/MessageHeader.cs
index d732f42084..fe50c0f56e 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/MessageHeader.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/MessageHeader.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("MessageHeader","http://hl7.org/fhir/StructureDefinition/MessageHeader", IsResource=true)]
+  [FhirType("MessageHeader","http://hl7.org/fhir/StructureDefinition/MessageHeader")]
   public partial class MessageHeader : Hl7.Fhir.Model.DomainResource
   {
     /// <summary>
@@ -96,7 +96,7 @@ public enum ResponseType
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MessageHeader#MessageDestination", IsNestedType=true)]
+    [FhirType("MessageHeader#MessageDestination")]
     [BackboneType("MessageHeader.destination")]
     public partial class MessageDestinationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -338,7 +338,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MessageHeader#MessageSource", IsNestedType=true)]
+    [FhirType("MessageHeader#MessageSource")]
     [BackboneType("MessageHeader.source")]
     public partial class MessageSourceComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -637,7 +637,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MessageHeader#Response", IsNestedType=true)]
+    [FhirType("MessageHeader#Response")]
     [BackboneType("MessageHeader.response")]
     public partial class ResponseComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4/Model/Generated/MolecularSequence.cs b/src/Hl7.Fhir.R4/Model/Generated/MolecularSequence.cs
index 03de0742c6..d035566813 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/MolecularSequence.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/MolecularSequence.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("MolecularSequence","http://hl7.org/fhir/StructureDefinition/MolecularSequence", IsResource=true)]
+  [FhirType("MolecularSequence","http://hl7.org/fhir/StructureDefinition/MolecularSequence")]
   public partial class MolecularSequence : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -207,7 +207,7 @@ public enum RepositoryType
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MolecularSequence#ReferenceSeq", IsNestedType=true)]
+    [FhirType("MolecularSequence#ReferenceSeq")]
     [BackboneType("MolecularSequence.referenceSeq")]
     public partial class ReferenceSeqComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -649,7 +649,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MolecularSequence#Variant", IsNestedType=true)]
+    [FhirType("MolecularSequence#Variant")]
     [BackboneType("MolecularSequence.variant")]
     public partial class VariantComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -992,7 +992,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MolecularSequence#Quality", IsNestedType=true)]
+    [FhirType("MolecularSequence#Quality")]
     [BackboneType("MolecularSequence.quality")]
     public partial class QualityComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1671,7 +1671,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MolecularSequence#Roc", IsNestedType=true)]
+    [FhirType("MolecularSequence#Roc")]
     [BackboneType("MolecularSequence.quality.roc")]
     public partial class RocComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2080,7 +2080,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MolecularSequence#Repository", IsNestedType=true)]
+    [FhirType("MolecularSequence#Repository")]
     [BackboneType("MolecularSequence.repository")]
     public partial class RepositoryComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2442,7 +2442,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MolecularSequence#StructureVariant", IsNestedType=true)]
+    [FhirType("MolecularSequence#StructureVariant")]
     [BackboneType("MolecularSequence.structureVariant")]
     public partial class StructureVariantComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2702,7 +2702,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("MolecularSequence#Outer", IsNestedType=true)]
+    [FhirType("MolecularSequence#Outer")]
     [BackboneType("MolecularSequence.structureVariant.outer")]
     public partial class OuterComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2886,7 +2886,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("MolecularSequence#Inner", IsNestedType=true)]
+    [FhirType("MolecularSequence#Inner")]
     [BackboneType("MolecularSequence.structureVariant.inner")]
     public partial class InnerComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4/Model/Generated/NamingSystem.cs b/src/Hl7.Fhir.R4/Model/Generated/NamingSystem.cs
index d516a6c65e..86520c23ca 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/NamingSystem.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/NamingSystem.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("NamingSystem","http://hl7.org/fhir/StructureDefinition/NamingSystem", IsResource=true)]
+  [FhirType("NamingSystem","http://hl7.org/fhir/StructureDefinition/NamingSystem")]
   public partial class NamingSystem : Hl7.Fhir.Model.DomainResource
   {
     /// <summary>
@@ -130,7 +130,7 @@ public enum NamingSystemIdentifierType
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("NamingSystem#UniqueId", IsNestedType=true)]
+    [FhirType("NamingSystem#UniqueId")]
     [BackboneType("NamingSystem.uniqueId")]
     public partial class UniqueIdComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4/Model/Generated/NutritionOrder.cs b/src/Hl7.Fhir.R4/Model/Generated/NutritionOrder.cs
index 6bd91b00f5..a896ba5161 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/NutritionOrder.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/NutritionOrder.cs
@@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("NutritionOrder","http://hl7.org/fhir/StructureDefinition/NutritionOrder", IsResource=true)]
+  [FhirType("NutritionOrder","http://hl7.org/fhir/StructureDefinition/NutritionOrder")]
   public partial class NutritionOrder : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -68,7 +68,7 @@ public partial class NutritionOrder : Hl7.Fhir.Model.DomainResource, IIdentifiab
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("NutritionOrder#OralDiet", IsNestedType=true)]
+    [FhirType("NutritionOrder#OralDiet")]
     [BackboneType("NutritionOrder.oralDiet")]
     public partial class OralDietComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -344,7 +344,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("NutritionOrder#Nutrient", IsNestedType=true)]
+    [FhirType("NutritionOrder#Nutrient")]
     [BackboneType("NutritionOrder.oralDiet.nutrient")]
     public partial class NutrientComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -496,7 +496,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("NutritionOrder#Texture", IsNestedType=true)]
+    [FhirType("NutritionOrder#Texture")]
     [BackboneType("NutritionOrder.oralDiet.texture")]
     public partial class TextureComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -649,7 +649,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("NutritionOrder#Supplement", IsNestedType=true)]
+    [FhirType("NutritionOrder#Supplement")]
     [BackboneType("NutritionOrder.supplement")]
     public partial class SupplementComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -913,7 +913,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("NutritionOrder#EnteralFormula", IsNestedType=true)]
+    [FhirType("NutritionOrder#EnteralFormula")]
     [BackboneType("NutritionOrder.enteralFormula")]
     public partial class EnteralFormulaComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1298,7 +1298,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("NutritionOrder#Administration", IsNestedType=true)]
+    [FhirType("NutritionOrder#Administration")]
     [BackboneType("NutritionOrder.enteralFormula.administration")]
     public partial class AdministrationComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4/Model/Generated/Observation.cs b/src/Hl7.Fhir.R4/Model/Generated/Observation.cs
index 2aaad91230..f6267094fd 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/Observation.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/Observation.cs
@@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Observation","http://hl7.org/fhir/StructureDefinition/Observation", IsResource=true)]
+  [FhirType("Observation","http://hl7.org/fhir/StructureDefinition/Observation")]
   public partial class Observation : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>, ICoded<Hl7.Fhir.Model.CodeableConcept>
   {
     /// <summary>
@@ -69,7 +69,7 @@ public partial class Observation : Hl7.Fhir.Model.DomainResource, IIdentifiable<
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Observation#ReferenceRange", IsNestedType=true)]
+    [FhirType("Observation#ReferenceRange")]
     [BackboneType("Observation.referenceRange")]
     public partial class ReferenceRangeComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -342,7 +342,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Observation#Component", IsNestedType=true)]
+    [FhirType("Observation#Component")]
     [BackboneType("Observation.component")]
     public partial class ComponentComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4/Model/Generated/ObservationDefinition.cs b/src/Hl7.Fhir.R4/Model/Generated/ObservationDefinition.cs
index 1f91ee2090..13970c8bc5 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/ObservationDefinition.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/ObservationDefinition.cs
@@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("ObservationDefinition","http://hl7.org/fhir/StructureDefinition/ObservationDefinition", IsResource=true)]
+  [FhirType("ObservationDefinition","http://hl7.org/fhir/StructureDefinition/ObservationDefinition")]
   public partial class ObservationDefinition : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>, ICoded<Hl7.Fhir.Model.CodeableConcept>
   {
     /// <summary>
@@ -172,7 +172,7 @@ public enum ObservationRangeCategory
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ObservationDefinition#QuantitativeDetails", IsNestedType=true)]
+    [FhirType("ObservationDefinition#QuantitativeDetails")]
     [BackboneType("ObservationDefinition.quantitativeDetails")]
     public partial class QuantitativeDetailsComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -411,7 +411,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ObservationDefinition#QualifiedInterval", IsNestedType=true)]
+    [FhirType("ObservationDefinition#QualifiedInterval")]
     [BackboneType("ObservationDefinition.qualifiedInterval")]
     public partial class QualifiedIntervalComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4/Model/Generated/OperationDefinition.cs b/src/Hl7.Fhir.R4/Model/Generated/OperationDefinition.cs
index a8696a5c13..1e8d07a97f 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/OperationDefinition.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/OperationDefinition.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("OperationDefinition","http://hl7.org/fhir/StructureDefinition/OperationDefinition", IsResource=true)]
+  [FhirType("OperationDefinition","http://hl7.org/fhir/StructureDefinition/OperationDefinition")]
   public partial class OperationDefinition : Hl7.Fhir.Model.DomainResource, ICoded<Hl7.Fhir.Model.Code>
   {
     /// <summary>
@@ -90,7 +90,7 @@ public enum OperationKind
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("OperationDefinition#Parameter", IsNestedType=true)]
+    [FhirType("OperationDefinition#Parameter")]
     [BackboneType("OperationDefinition.parameter")]
     public partial class ParameterComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -623,7 +623,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("OperationDefinition#Binding", IsNestedType=true)]
+    [FhirType("OperationDefinition#Binding")]
     [BackboneType("OperationDefinition.parameter.binding")]
     public partial class BindingComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -815,7 +815,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("OperationDefinition#ReferencedFrom", IsNestedType=true)]
+    [FhirType("OperationDefinition#ReferencedFrom")]
     [BackboneType("OperationDefinition.parameter.referencedFrom")]
     public partial class ReferencedFromComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1004,7 +1004,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("OperationDefinition#Overload", IsNestedType=true)]
+    [FhirType("OperationDefinition#Overload")]
     [BackboneType("OperationDefinition.overload")]
     public partial class OverloadComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4/Model/Generated/Organization.cs b/src/Hl7.Fhir.R4/Model/Generated/Organization.cs
index 99dc258d21..387f3d100d 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/Organization.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/Organization.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Organization","http://hl7.org/fhir/StructureDefinition/Organization", IsResource=true)]
+  [FhirType("Organization","http://hl7.org/fhir/StructureDefinition/Organization")]
   public partial class Organization : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -67,7 +67,7 @@ public partial class Organization : Hl7.Fhir.Model.DomainResource, IIdentifiable
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Organization#Contact", IsNestedType=true)]
+    [FhirType("Organization#Contact")]
     [BackboneType("Organization.contact")]
     public partial class ContactComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4/Model/Generated/OrganizationAffiliation.cs b/src/Hl7.Fhir.R4/Model/Generated/OrganizationAffiliation.cs
index 7eec29f305..09a1326ab2 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/OrganizationAffiliation.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/OrganizationAffiliation.cs
@@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model
   /// </summary>
   [Serializable]
   [DataContract]
-  [FhirType("OrganizationAffiliation","http://hl7.org/fhir/StructureDefinition/OrganizationAffiliation", IsResource=true)]
+  [FhirType("OrganizationAffiliation","http://hl7.org/fhir/StructureDefinition/OrganizationAffiliation")]
   public partial class OrganizationAffiliation : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
diff --git a/src/Hl7.Fhir.R4/Model/Generated/Patient.cs b/src/Hl7.Fhir.R4/Model/Generated/Patient.cs
index 0f9339d2a6..33cdd8089c 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/Patient.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/Patient.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Patient","http://hl7.org/fhir/StructureDefinition/Patient", IsResource=true)]
+  [FhirType("Patient","http://hl7.org/fhir/StructureDefinition/Patient")]
   public partial class Patient : Hl7.Fhir.Model.DomainResource, Hl7.Fhir.Model.IPatient, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -101,7 +101,7 @@ public enum LinkType
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Patient#Contact", IsNestedType=true)]
+    [FhirType("Patient#Contact")]
     [BackboneType("Patient.contact")]
     public partial class ContactComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -402,7 +402,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Patient#Communication", IsNestedType=true)]
+    [FhirType("Patient#Communication")]
     [BackboneType("Patient.communication")]
     public partial class CommunicationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -574,7 +574,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Patient#Link", IsNestedType=true)]
+    [FhirType("Patient#Link")]
     [BackboneType("Patient.link")]
     public partial class LinkComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4/Model/Generated/PaymentNotice.cs b/src/Hl7.Fhir.R4/Model/Generated/PaymentNotice.cs
index f5d4349f62..783b970eff 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/PaymentNotice.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/PaymentNotice.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("PaymentNotice","http://hl7.org/fhir/StructureDefinition/PaymentNotice", IsResource=true)]
+  [FhirType("PaymentNotice","http://hl7.org/fhir/StructureDefinition/PaymentNotice")]
   public partial class PaymentNotice : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
diff --git a/src/Hl7.Fhir.R4/Model/Generated/PaymentReconciliation.cs b/src/Hl7.Fhir.R4/Model/Generated/PaymentReconciliation.cs
index 8bc50e9a9e..731dae275f 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/PaymentReconciliation.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/PaymentReconciliation.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("PaymentReconciliation","http://hl7.org/fhir/StructureDefinition/PaymentReconciliation", IsResource=true)]
+  [FhirType("PaymentReconciliation","http://hl7.org/fhir/StructureDefinition/PaymentReconciliation")]
   public partial class PaymentReconciliation : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -67,7 +67,7 @@ public partial class PaymentReconciliation : Hl7.Fhir.Model.DomainResource, IIde
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("PaymentReconciliation#Details", IsNestedType=true)]
+    [FhirType("PaymentReconciliation#Details")]
     [BackboneType("PaymentReconciliation.detail")]
     public partial class DetailsComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -448,7 +448,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("PaymentReconciliation#Notes", IsNestedType=true)]
+    [FhirType("PaymentReconciliation#Notes")]
     [BackboneType("PaymentReconciliation.processNote")]
     public partial class NotesComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4/Model/Generated/Person.cs b/src/Hl7.Fhir.R4/Model/Generated/Person.cs
index 2408a2b1a7..76884ed298 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/Person.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/Person.cs
@@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Person","http://hl7.org/fhir/StructureDefinition/Person", IsResource=true)]
+  [FhirType("Person","http://hl7.org/fhir/StructureDefinition/Person")]
   public partial class Person : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -99,7 +99,7 @@ public enum IdentityAssuranceLevel
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Person#Link", IsNestedType=true)]
+    [FhirType("Person#Link")]
     [BackboneType("Person.link")]
     public partial class LinkComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4/Model/Generated/PlanDefinition.cs b/src/Hl7.Fhir.R4/Model/Generated/PlanDefinition.cs
index 78e3888189..de3cbfb6c8 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/PlanDefinition.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/PlanDefinition.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("PlanDefinition","http://hl7.org/fhir/StructureDefinition/PlanDefinition", IsResource=true)]
+  [FhirType("PlanDefinition","http://hl7.org/fhir/StructureDefinition/PlanDefinition")]
   public partial class PlanDefinition : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -67,7 +67,7 @@ public partial class PlanDefinition : Hl7.Fhir.Model.DomainResource, IIdentifiab
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("PlanDefinition#Goal", IsNestedType=true)]
+    [FhirType("PlanDefinition#Goal")]
     [BackboneType("PlanDefinition.goal")]
     public partial class GoalComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -352,7 +352,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("PlanDefinition#Target", IsNestedType=true)]
+    [FhirType("PlanDefinition#Target")]
     [BackboneType("PlanDefinition.goal.target")]
     public partial class TargetComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -532,7 +532,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("PlanDefinition#Action", IsNestedType=true)]
+    [FhirType("PlanDefinition#Action")]
     [BackboneType("PlanDefinition.action")]
     public partial class ActionComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1558,7 +1558,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("PlanDefinition#Condition", IsNestedType=true)]
+    [FhirType("PlanDefinition#Condition")]
     [BackboneType("PlanDefinition.action.condition")]
     public partial class ConditionComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1731,7 +1731,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("PlanDefinition#RelatedAction", IsNestedType=true)]
+    [FhirType("PlanDefinition#RelatedAction")]
     [BackboneType("PlanDefinition.action.relatedAction")]
     public partial class RelatedActionComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1949,7 +1949,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("PlanDefinition#Participant", IsNestedType=true)]
+    [FhirType("PlanDefinition#Participant")]
     [BackboneType("PlanDefinition.action.participant")]
     public partial class ParticipantComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2123,7 +2123,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("PlanDefinition#DynamicValue", IsNestedType=true)]
+    [FhirType("PlanDefinition#DynamicValue")]
     [BackboneType("PlanDefinition.action.dynamicValue")]
     public partial class DynamicValueComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4/Model/Generated/Practitioner.cs b/src/Hl7.Fhir.R4/Model/Generated/Practitioner.cs
index 14af0bb071..9d1f92afb0 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/Practitioner.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/Practitioner.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Practitioner","http://hl7.org/fhir/StructureDefinition/Practitioner", IsResource=true)]
+  [FhirType("Practitioner","http://hl7.org/fhir/StructureDefinition/Practitioner")]
   public partial class Practitioner : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -67,7 +67,7 @@ public partial class Practitioner : Hl7.Fhir.Model.DomainResource, IIdentifiable
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Practitioner#Qualification", IsNestedType=true)]
+    [FhirType("Practitioner#Qualification")]
     [BackboneType("Practitioner.qualification")]
     public partial class QualificationComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4/Model/Generated/PractitionerRole.cs b/src/Hl7.Fhir.R4/Model/Generated/PractitionerRole.cs
index e9ebf9cb70..b13ac78eb2 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/PractitionerRole.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/PractitionerRole.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("PractitionerRole","http://hl7.org/fhir/StructureDefinition/PractitionerRole", IsResource=true)]
+  [FhirType("PractitionerRole","http://hl7.org/fhir/StructureDefinition/PractitionerRole")]
   public partial class PractitionerRole : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>, ICoded<List<Hl7.Fhir.Model.CodeableConcept>>
   {
     /// <summary>
@@ -68,7 +68,7 @@ public partial class PractitionerRole : Hl7.Fhir.Model.DomainResource, IIdentifi
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("PractitionerRole#AvailableTime", IsNestedType=true)]
+    [FhirType("PractitionerRole#AvailableTime")]
     [BackboneType("PractitionerRole.availableTime")]
     public partial class AvailableTimeComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -344,7 +344,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("PractitionerRole#NotAvailable", IsNestedType=true)]
+    [FhirType("PractitionerRole#NotAvailable")]
     [BackboneType("PractitionerRole.notAvailable")]
     public partial class NotAvailableComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4/Model/Generated/Procedure.cs b/src/Hl7.Fhir.R4/Model/Generated/Procedure.cs
index 52b6473cb3..c6a78e0cac 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/Procedure.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/Procedure.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Procedure","http://hl7.org/fhir/StructureDefinition/Procedure", IsResource=true)]
+  [FhirType("Procedure","http://hl7.org/fhir/StructureDefinition/Procedure")]
   public partial class Procedure : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>, ICoded<Hl7.Fhir.Model.CodeableConcept>
   {
     /// <summary>
@@ -67,7 +67,7 @@ public partial class Procedure : Hl7.Fhir.Model.DomainResource, IIdentifiable<Li
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Procedure#Performer", IsNestedType=true)]
+    [FhirType("Procedure#Performer")]
     [BackboneType("Procedure.performer")]
     public partial class PerformerComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -249,7 +249,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Procedure#FocalDevice", IsNestedType=true)]
+    [FhirType("Procedure#FocalDevice")]
     [BackboneType("Procedure.focalDevice")]
     public partial class FocalDeviceComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4/Model/Generated/Provenance.cs b/src/Hl7.Fhir.R4/Model/Generated/Provenance.cs
index 789456bd2e..44742f7554 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/Provenance.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/Provenance.cs
@@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Provenance","http://hl7.org/fhir/StructureDefinition/Provenance", IsResource=true)]
+  [FhirType("Provenance","http://hl7.org/fhir/StructureDefinition/Provenance")]
   public partial class Provenance : Hl7.Fhir.Model.DomainResource
   {
     /// <summary>
@@ -109,7 +109,7 @@ public enum ProvenanceEntityRole
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Provenance#Agent", IsNestedType=true)]
+    [FhirType("Provenance#Agent")]
     [BackboneType("Provenance.agent")]
     public partial class AgentComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -315,7 +315,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Provenance#Entity", IsNestedType=true)]
+    [FhirType("Provenance#Entity")]
     [BackboneType("Provenance.entity")]
     public partial class EntityComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4/Model/Generated/Questionnaire.cs b/src/Hl7.Fhir.R4/Model/Generated/Questionnaire.cs
index 446793d6fb..0a27265338 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/Questionnaire.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/Questionnaire.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Questionnaire","http://hl7.org/fhir/StructureDefinition/Questionnaire", IsResource=true)]
+  [FhirType("Questionnaire","http://hl7.org/fhir/StructureDefinition/Questionnaire")]
   public partial class Questionnaire : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>, ICoded<Hl7.Fhir.Model.FhirString>
   {
     /// <summary>
@@ -248,7 +248,7 @@ public enum QuestionnaireItemOperator
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Questionnaire#Item", IsNestedType=true)]
+    [FhirType("Questionnaire#Item")]
     [BackboneType("Questionnaire.item")]
     public partial class ItemComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -960,7 +960,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Questionnaire#EnableWhen", IsNestedType=true)]
+    [FhirType("Questionnaire#EnableWhen")]
     [BackboneType("Questionnaire.item.enableWhen")]
     public partial class EnableWhenComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1182,7 +1182,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Questionnaire#AnswerOption", IsNestedType=true)]
+    [FhirType("Questionnaire#AnswerOption")]
     [BackboneType("Questionnaire.item.answerOption")]
     public partial class AnswerOptionComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1357,7 +1357,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Questionnaire#Initial", IsNestedType=true)]
+    [FhirType("Questionnaire#Initial")]
     [BackboneType("Questionnaire.item.initial")]
     public partial class InitialComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4/Model/Generated/QuestionnaireResponse.cs b/src/Hl7.Fhir.R4/Model/Generated/QuestionnaireResponse.cs
index 4bd212fc42..44a26c5dc5 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/QuestionnaireResponse.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/QuestionnaireResponse.cs
@@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("QuestionnaireResponse","http://hl7.org/fhir/StructureDefinition/QuestionnaireResponse", IsResource=true)]
+  [FhirType("QuestionnaireResponse","http://hl7.org/fhir/StructureDefinition/QuestionnaireResponse")]
   public partial class QuestionnaireResponse : Hl7.Fhir.Model.DomainResource, IIdentifiable<Identifier>
   {
     /// <summary>
@@ -109,7 +109,7 @@ public enum QuestionnaireResponseStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("QuestionnaireResponse#Item", IsNestedType=true)]
+    [FhirType("QuestionnaireResponse#Item")]
     [BackboneType("QuestionnaireResponse.item")]
     public partial class ItemComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -393,7 +393,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("QuestionnaireResponse#Answer", IsNestedType=true)]
+    [FhirType("QuestionnaireResponse#Answer")]
     [BackboneType("QuestionnaireResponse.item.answer")]
     public partial class AnswerComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4/Model/Generated/RelatedPerson.cs b/src/Hl7.Fhir.R4/Model/Generated/RelatedPerson.cs
index 67b147a64c..867f39a940 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/RelatedPerson.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/RelatedPerson.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("RelatedPerson","http://hl7.org/fhir/StructureDefinition/RelatedPerson", IsResource=true)]
+  [FhirType("RelatedPerson","http://hl7.org/fhir/StructureDefinition/RelatedPerson")]
   public partial class RelatedPerson : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>, ICoded<List<Hl7.Fhir.Model.CodeableConcept>>
   {
     /// <summary>
@@ -67,7 +67,7 @@ public partial class RelatedPerson : Hl7.Fhir.Model.DomainResource, IIdentifiabl
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("RelatedPerson#Communication", IsNestedType=true)]
+    [FhirType("RelatedPerson#Communication")]
     [BackboneType("RelatedPerson.communication")]
     public partial class CommunicationComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4/Model/Generated/RequestGroup.cs b/src/Hl7.Fhir.R4/Model/Generated/RequestGroup.cs
index be87baacc1..844336629f 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/RequestGroup.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/RequestGroup.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("RequestGroup","http://hl7.org/fhir/StructureDefinition/RequestGroup", IsResource=true)]
+  [FhirType("RequestGroup","http://hl7.org/fhir/StructureDefinition/RequestGroup")]
   public partial class RequestGroup : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>, ICoded<Hl7.Fhir.Model.CodeableConcept>
   {
     /// <summary>
@@ -67,7 +67,7 @@ public partial class RequestGroup : Hl7.Fhir.Model.DomainResource, IIdentifiable
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("RequestGroup#Action", IsNestedType=true)]
+    [FhirType("RequestGroup#Action")]
     [BackboneType("RequestGroup.action")]
     public partial class ActionComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -849,7 +849,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("RequestGroup#Condition", IsNestedType=true)]
+    [FhirType("RequestGroup#Condition")]
     [BackboneType("RequestGroup.action.condition")]
     public partial class ConditionComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1021,7 +1021,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("RequestGroup#RelatedAction", IsNestedType=true)]
+    [FhirType("RequestGroup#RelatedAction")]
     [BackboneType("RequestGroup.action.relatedAction")]
     public partial class RelatedActionComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4/Model/Generated/ResearchDefinition.cs b/src/Hl7.Fhir.R4/Model/Generated/ResearchDefinition.cs
index 2236c169c6..56cef94cf9 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/ResearchDefinition.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/ResearchDefinition.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("ResearchDefinition","http://hl7.org/fhir/StructureDefinition/ResearchDefinition", IsResource=true)]
+  [FhirType("ResearchDefinition","http://hl7.org/fhir/StructureDefinition/ResearchDefinition")]
   public partial class ResearchDefinition : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
diff --git a/src/Hl7.Fhir.R4/Model/Generated/ResearchElementDefinition.cs b/src/Hl7.Fhir.R4/Model/Generated/ResearchElementDefinition.cs
index 27afc5bc22..7a0753436b 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/ResearchElementDefinition.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/ResearchElementDefinition.cs
@@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("ResearchElementDefinition","http://hl7.org/fhir/StructureDefinition/ResearchElementDefinition", IsResource=true)]
+  [FhirType("ResearchElementDefinition","http://hl7.org/fhir/StructureDefinition/ResearchElementDefinition")]
   public partial class ResearchElementDefinition : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -97,7 +97,7 @@ public enum ResearchElementType
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ResearchElementDefinition#Characteristic", IsNestedType=true)]
+    [FhirType("ResearchElementDefinition#Characteristic")]
     [BackboneType("ResearchElementDefinition.characteristic")]
     public partial class CharacteristicComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4/Model/Generated/ResearchStudy.cs b/src/Hl7.Fhir.R4/Model/Generated/ResearchStudy.cs
index be69ad3e78..efa565c616 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/ResearchStudy.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/ResearchStudy.cs
@@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("ResearchStudy","http://hl7.org/fhir/StructureDefinition/ResearchStudy", IsResource=true)]
+  [FhirType("ResearchStudy","http://hl7.org/fhir/StructureDefinition/ResearchStudy")]
   public partial class ResearchStudy : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -144,7 +144,7 @@ public enum ResearchStudyStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ResearchStudy#Arm", IsNestedType=true)]
+    [FhirType("ResearchStudy#Arm")]
     [BackboneType("ResearchStudy.arm")]
     public partial class ArmComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -357,7 +357,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ResearchStudy#Objective", IsNestedType=true)]
+    [FhirType("ResearchStudy#Objective")]
     [BackboneType("ResearchStudy.objective")]
     public partial class ObjectiveComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4/Model/Generated/ResearchSubject.cs b/src/Hl7.Fhir.R4/Model/Generated/ResearchSubject.cs
index 3f84b16123..564746c9c3 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/ResearchSubject.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/ResearchSubject.cs
@@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("ResearchSubject","http://hl7.org/fhir/StructureDefinition/ResearchSubject", IsResource=true)]
+  [FhirType("ResearchSubject","http://hl7.org/fhir/StructureDefinition/ResearchSubject")]
   public partial class ResearchSubject : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
diff --git a/src/Hl7.Fhir.R4/Model/Generated/RiskAssessment.cs b/src/Hl7.Fhir.R4/Model/Generated/RiskAssessment.cs
index 328a00b924..75b6465c2a 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/RiskAssessment.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/RiskAssessment.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("RiskAssessment","http://hl7.org/fhir/StructureDefinition/RiskAssessment", IsResource=true)]
+  [FhirType("RiskAssessment","http://hl7.org/fhir/StructureDefinition/RiskAssessment")]
   public partial class RiskAssessment : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>, ICoded<Hl7.Fhir.Model.CodeableConcept>
   {
     /// <summary>
@@ -68,7 +68,7 @@ public partial class RiskAssessment : Hl7.Fhir.Model.DomainResource, IIdentifiab
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("RiskAssessment#Prediction", IsNestedType=true)]
+    [FhirType("RiskAssessment#Prediction")]
     [BackboneType("RiskAssessment.prediction")]
     public partial class PredictionComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4/Model/Generated/RiskEvidenceSynthesis.cs b/src/Hl7.Fhir.R4/Model/Generated/RiskEvidenceSynthesis.cs
index dc69b07e68..03d23c9340 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/RiskEvidenceSynthesis.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/RiskEvidenceSynthesis.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("RiskEvidenceSynthesis","http://hl7.org/fhir/StructureDefinition/RiskEvidenceSynthesis", IsResource=true)]
+  [FhirType("RiskEvidenceSynthesis","http://hl7.org/fhir/StructureDefinition/RiskEvidenceSynthesis")]
   public partial class RiskEvidenceSynthesis : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -67,7 +67,7 @@ public partial class RiskEvidenceSynthesis : Hl7.Fhir.Model.DomainResource, IIde
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("RiskEvidenceSynthesis#SampleSize", IsNestedType=true)]
+    [FhirType("RiskEvidenceSynthesis#SampleSize")]
     [BackboneType("RiskEvidenceSynthesis.sampleSize")]
     public partial class SampleSizeComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -297,7 +297,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("RiskEvidenceSynthesis#RiskEstimate", IsNestedType=true)]
+    [FhirType("RiskEvidenceSynthesis#RiskEstimate")]
     [BackboneType("RiskEvidenceSynthesis.riskEstimate")]
     public partial class RiskEstimateComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -648,7 +648,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("RiskEvidenceSynthesis#PrecisionEstimate", IsNestedType=true)]
+    [FhirType("RiskEvidenceSynthesis#PrecisionEstimate")]
     [BackboneType("RiskEvidenceSynthesis.riskEstimate.precisionEstimate")]
     public partial class PrecisionEstimateComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -904,7 +904,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("RiskEvidenceSynthesis#Certainty", IsNestedType=true)]
+    [FhirType("RiskEvidenceSynthesis#Certainty")]
     [BackboneType("RiskEvidenceSynthesis.certainty")]
     public partial class CertaintyComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1084,7 +1084,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("RiskEvidenceSynthesis#CertaintySubcomponent", IsNestedType=true)]
+    [FhirType("RiskEvidenceSynthesis#CertaintySubcomponent")]
     [BackboneType("RiskEvidenceSynthesis.certainty.certaintySubcomponent")]
     public partial class CertaintySubcomponentComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4/Model/Generated/Schedule.cs b/src/Hl7.Fhir.R4/Model/Generated/Schedule.cs
index c813a79132..e1a9e98efa 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/Schedule.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/Schedule.cs
@@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model
   /// </summary>
   [Serializable]
   [DataContract]
-  [FhirType("Schedule","http://hl7.org/fhir/StructureDefinition/Schedule", IsResource=true)]
+  [FhirType("Schedule","http://hl7.org/fhir/StructureDefinition/Schedule")]
   public partial class Schedule : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
diff --git a/src/Hl7.Fhir.R4/Model/Generated/SearchParameter.cs b/src/Hl7.Fhir.R4/Model/Generated/SearchParameter.cs
index 0b35c901bd..f51b70c875 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/SearchParameter.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/SearchParameter.cs
@@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("SearchParameter","http://hl7.org/fhir/StructureDefinition/SearchParameter", IsResource=true)]
+  [FhirType("SearchParameter","http://hl7.org/fhir/StructureDefinition/SearchParameter")]
   public partial class SearchParameter : Hl7.Fhir.Model.DomainResource, ICoded<List<Code<Hl7.Fhir.Model.ResourceType>>>
   {
     /// <summary>
@@ -254,7 +254,7 @@ public enum SearchModifierCode
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("SearchParameter#Component", IsNestedType=true)]
+    [FhirType("SearchParameter#Component")]
     [BackboneType("SearchParameter.component")]
     public partial class ComponentComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4/Model/Generated/ServiceRequest.cs b/src/Hl7.Fhir.R4/Model/Generated/ServiceRequest.cs
index 8aaf552f2e..b25da3d4d3 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/ServiceRequest.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/ServiceRequest.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("ServiceRequest","http://hl7.org/fhir/StructureDefinition/ServiceRequest", IsResource=true)]
+  [FhirType("ServiceRequest","http://hl7.org/fhir/StructureDefinition/ServiceRequest")]
   public partial class ServiceRequest : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>, ICoded<Hl7.Fhir.Model.CodeableConcept>
   {
     /// <summary>
diff --git a/src/Hl7.Fhir.R4/Model/Generated/Slot.cs b/src/Hl7.Fhir.R4/Model/Generated/Slot.cs
index 92ecd95072..f65d2dab27 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/Slot.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/Slot.cs
@@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model
   /// </summary>
   [Serializable]
   [DataContract]
-  [FhirType("Slot","http://hl7.org/fhir/StructureDefinition/Slot", IsResource=true)]
+  [FhirType("Slot","http://hl7.org/fhir/StructureDefinition/Slot")]
   public partial class Slot : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
diff --git a/src/Hl7.Fhir.R4/Model/Generated/Specimen.cs b/src/Hl7.Fhir.R4/Model/Generated/Specimen.cs
index 581c261fe8..fb50d2acea 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/Specimen.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/Specimen.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Specimen","http://hl7.org/fhir/StructureDefinition/Specimen", IsResource=true)]
+  [FhirType("Specimen","http://hl7.org/fhir/StructureDefinition/Specimen")]
   public partial class Specimen : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>, ICoded<Hl7.Fhir.Model.CodeableConcept>
   {
     /// <summary>
@@ -101,7 +101,7 @@ public enum SpecimenStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Specimen#Collection", IsNestedType=true)]
+    [FhirType("Specimen#Collection")]
     [BackboneType("Specimen.collection")]
     public partial class CollectionComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -386,7 +386,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Specimen#Processing", IsNestedType=true)]
+    [FhirType("Specimen#Processing")]
     [BackboneType("Specimen.processing")]
     public partial class ProcessingComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -611,7 +611,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Specimen#Container", IsNestedType=true)]
+    [FhirType("Specimen#Container")]
     [BackboneType("Specimen.container")]
     public partial class ContainerComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4/Model/Generated/SpecimenDefinition.cs b/src/Hl7.Fhir.R4/Model/Generated/SpecimenDefinition.cs
index f17be3ea35..54b9a77263 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/SpecimenDefinition.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/SpecimenDefinition.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("SpecimenDefinition","http://hl7.org/fhir/StructureDefinition/SpecimenDefinition", IsResource=true)]
+  [FhirType("SpecimenDefinition","http://hl7.org/fhir/StructureDefinition/SpecimenDefinition")]
   public partial class SpecimenDefinition : Hl7.Fhir.Model.DomainResource, IIdentifiable<Identifier>
   {
     /// <summary>
@@ -89,7 +89,7 @@ public enum SpecimenContainedPreference
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("SpecimenDefinition#TypeTested", IsNestedType=true)]
+    [FhirType("SpecimenDefinition#TypeTested")]
     [BackboneType("SpecimenDefinition.typeTested")]
     public partial class TypeTestedComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -448,7 +448,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SpecimenDefinition#Container", IsNestedType=true)]
+    [FhirType("SpecimenDefinition#Container")]
     [BackboneType("SpecimenDefinition.typeTested.container")]
     public partial class ContainerComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -791,7 +791,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("SpecimenDefinition#Additive", IsNestedType=true)]
+    [FhirType("SpecimenDefinition#Additive")]
     [BackboneType("SpecimenDefinition.typeTested.container.additive")]
     public partial class AdditiveComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -922,7 +922,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("SpecimenDefinition#Handling", IsNestedType=true)]
+    [FhirType("SpecimenDefinition#Handling")]
     [BackboneType("SpecimenDefinition.typeTested.handling")]
     public partial class HandlingComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4/Model/Generated/StructureMap.cs b/src/Hl7.Fhir.R4/Model/Generated/StructureMap.cs
index 41c775f9f0..5117090ef5 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/StructureMap.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/StructureMap.cs
@@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model
   /// </summary>
   [Serializable]
   [DataContract]
-  [FhirType("StructureMap","http://hl7.org/fhir/StructureDefinition/StructureMap", IsResource=true)]
+  [FhirType("StructureMap","http://hl7.org/fhir/StructureDefinition/StructureMap")]
   public partial class StructureMap : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -357,7 +357,7 @@ public enum StructureMapTransform
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("StructureMap#Structure", IsNestedType=true)]
+    [FhirType("StructureMap#Structure")]
     [BackboneType("StructureMap.structure")]
     public partial class StructureComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -634,7 +634,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("StructureMap#Group", IsNestedType=true)]
+    [FhirType("StructureMap#Group")]
     [BackboneType("StructureMap.group")]
     public partial class GroupComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -964,7 +964,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("StructureMap#Input", IsNestedType=true)]
+    [FhirType("StructureMap#Input")]
     [BackboneType("StructureMap.group.input")]
     public partial class InputComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1238,7 +1238,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("StructureMap#Rule", IsNestedType=true)]
+    [FhirType("StructureMap#Rule")]
     [BackboneType("StructureMap.group.rule")]
     public partial class RuleComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1527,7 +1527,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("StructureMap#Source", IsNestedType=true)]
+    [FhirType("StructureMap#Source")]
     [BackboneType("StructureMap.group.rule.source")]
     public partial class SourceComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2085,7 +2085,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("StructureMap#Target", IsNestedType=true)]
+    [FhirType("StructureMap#Target")]
     [BackboneType("StructureMap.group.rule.target")]
     public partial class TargetComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2517,7 +2517,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("StructureMap#Parameter", IsNestedType=true)]
+    [FhirType("StructureMap#Parameter")]
     [BackboneType("StructureMap.group.rule.target.parameter")]
     public partial class ParameterComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2643,7 +2643,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("StructureMap#Dependent", IsNestedType=true)]
+    [FhirType("StructureMap#Dependent")]
     [BackboneType("StructureMap.group.rule.dependent")]
     public partial class DependentComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4/Model/Generated/Subscription.cs b/src/Hl7.Fhir.R4/Model/Generated/Subscription.cs
index 2922ca1a45..59edabdef8 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/Subscription.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/Subscription.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Subscription","http://hl7.org/fhir/StructureDefinition/Subscription", IsResource=true)]
+  [FhirType("Subscription","http://hl7.org/fhir/StructureDefinition/Subscription")]
   public partial class Subscription : Hl7.Fhir.Model.DomainResource
   {
     /// <summary>
@@ -141,7 +141,7 @@ public enum SubscriptionChannelType
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Subscription#Channel", IsNestedType=true)]
+    [FhirType("Subscription#Channel")]
     [BackboneType("Subscription.channel")]
     public partial class ChannelComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4/Model/Generated/Substance.cs b/src/Hl7.Fhir.R4/Model/Generated/Substance.cs
index 622ab24197..a7ab422032 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/Substance.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/Substance.cs
@@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model
   /// </summary>
   [Serializable]
   [DataContract]
-  [FhirType("Substance","http://hl7.org/fhir/StructureDefinition/Substance", IsResource=true)]
+  [FhirType("Substance","http://hl7.org/fhir/StructureDefinition/Substance")]
   public partial class Substance : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>, ICoded<Hl7.Fhir.Model.CodeableConcept>
   {
     /// <summary>
@@ -92,7 +92,7 @@ public enum FHIRSubstanceStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Substance#Instance", IsNestedType=true)]
+    [FhirType("Substance#Instance")]
     [BackboneType("Substance.instance")]
     public partial class InstanceComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -286,7 +286,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Substance#Ingredient", IsNestedType=true)]
+    [FhirType("Substance#Ingredient")]
     [BackboneType("Substance.ingredient")]
     public partial class IngredientComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4/Model/Generated/SubstanceAmount.cs b/src/Hl7.Fhir.R4/Model/Generated/SubstanceAmount.cs
index f42543412b..5d01f2291b 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/SubstanceAmount.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/SubstanceAmount.cs
@@ -61,7 +61,7 @@ public partial class SubstanceAmount : Hl7.Fhir.Model.BackboneType
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SubstanceAmount#ReferenceRange", IsNestedType=true)]
+    [FhirType("SubstanceAmount#ReferenceRange")]
     [BackboneType("SubstanceAmount.referenceRange")]
     public partial class ReferenceRangeComponent : Hl7.Fhir.Model.Element
     {
diff --git a/src/Hl7.Fhir.R4/Model/Generated/SubstanceNucleicAcid.cs b/src/Hl7.Fhir.R4/Model/Generated/SubstanceNucleicAcid.cs
index 991db06dd9..d74fa4f9a7 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/SubstanceNucleicAcid.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/SubstanceNucleicAcid.cs
@@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model
   /// </summary>
   [Serializable]
   [DataContract]
-  [FhirType("SubstanceNucleicAcid","http://hl7.org/fhir/StructureDefinition/SubstanceNucleicAcid", IsResource=true)]
+  [FhirType("SubstanceNucleicAcid","http://hl7.org/fhir/StructureDefinition/SubstanceNucleicAcid")]
   public partial class SubstanceNucleicAcid : Hl7.Fhir.Model.DomainResource
   {
     /// <summary>
@@ -61,7 +61,7 @@ public partial class SubstanceNucleicAcid : Hl7.Fhir.Model.DomainResource
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SubstanceNucleicAcid#Subunit", IsNestedType=true)]
+    [FhirType("SubstanceNucleicAcid#Subunit")]
     [BackboneType("SubstanceNucleicAcid.subunit")]
     public partial class SubunitComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -415,7 +415,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SubstanceNucleicAcid#Linkage", IsNestedType=true)]
+    [FhirType("SubstanceNucleicAcid#Linkage")]
     [BackboneType("SubstanceNucleicAcid.subunit.linkage")]
     public partial class LinkageComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -667,7 +667,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SubstanceNucleicAcid#Sugar", IsNestedType=true)]
+    [FhirType("SubstanceNucleicAcid#Sugar")]
     [BackboneType("SubstanceNucleicAcid.subunit.sugar")]
     public partial class SugarComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4/Model/Generated/SubstancePolymer.cs b/src/Hl7.Fhir.R4/Model/Generated/SubstancePolymer.cs
index 19f186e695..82a57c541e 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/SubstancePolymer.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/SubstancePolymer.cs
@@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model
   /// </summary>
   [Serializable]
   [DataContract]
-  [FhirType("SubstancePolymer","http://hl7.org/fhir/StructureDefinition/SubstancePolymer", IsResource=true)]
+  [FhirType("SubstancePolymer","http://hl7.org/fhir/StructureDefinition/SubstancePolymer")]
   public partial class SubstancePolymer : Hl7.Fhir.Model.DomainResource
   {
     /// <summary>
@@ -61,7 +61,7 @@ public partial class SubstancePolymer : Hl7.Fhir.Model.DomainResource
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SubstancePolymer#MonomerSet", IsNestedType=true)]
+    [FhirType("SubstancePolymer#MonomerSet")]
     [BackboneType("SubstancePolymer.monomerSet")]
     public partial class MonomerSetComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -210,7 +210,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SubstancePolymer#StartingMaterial", IsNestedType=true)]
+    [FhirType("SubstancePolymer#StartingMaterial")]
     [BackboneType("SubstancePolymer.monomerSet.startingMaterial")]
     public partial class StartingMaterialComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -426,7 +426,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SubstancePolymer#Repeat", IsNestedType=true)]
+    [FhirType("SubstancePolymer#Repeat")]
     [BackboneType("SubstancePolymer.repeat")]
     public partial class RepeatComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -661,7 +661,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SubstancePolymer#RepeatUnit", IsNestedType=true)]
+    [FhirType("SubstancePolymer#RepeatUnit")]
     [BackboneType("SubstancePolymer.repeat.repeatUnit")]
     public partial class RepeatUnitComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -904,7 +904,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SubstancePolymer#DegreeOfPolymerisation", IsNestedType=true)]
+    [FhirType("SubstancePolymer#DegreeOfPolymerisation")]
     [BackboneType("SubstancePolymer.repeat.repeatUnit.degreeOfPolymerisation")]
     public partial class DegreeOfPolymerisationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1052,7 +1052,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SubstancePolymer#StructuralRepresentation", IsNestedType=true)]
+    [FhirType("SubstancePolymer#StructuralRepresentation")]
     [BackboneType("SubstancePolymer.repeat.repeatUnit.structuralRepresentation")]
     public partial class StructuralRepresentationComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4/Model/Generated/SubstanceProtein.cs b/src/Hl7.Fhir.R4/Model/Generated/SubstanceProtein.cs
index 86a3766009..5b6dc53e17 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/SubstanceProtein.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/SubstanceProtein.cs
@@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model
   /// </summary>
   [Serializable]
   [DataContract]
-  [FhirType("SubstanceProtein","http://hl7.org/fhir/StructureDefinition/SubstanceProtein", IsResource=true)]
+  [FhirType("SubstanceProtein","http://hl7.org/fhir/StructureDefinition/SubstanceProtein")]
   public partial class SubstanceProtein : Hl7.Fhir.Model.DomainResource
   {
     /// <summary>
@@ -61,7 +61,7 @@ public partial class SubstanceProtein : Hl7.Fhir.Model.DomainResource
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SubstanceProtein#Subunit", IsNestedType=true)]
+    [FhirType("SubstanceProtein#Subunit")]
     [BackboneType("SubstanceProtein.subunit")]
     public partial class SubunitComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4/Model/Generated/SubstanceReferenceInformation.cs b/src/Hl7.Fhir.R4/Model/Generated/SubstanceReferenceInformation.cs
index 0293b7f7a3..81ceed5b90 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/SubstanceReferenceInformation.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/SubstanceReferenceInformation.cs
@@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model
   /// </summary>
   [Serializable]
   [DataContract]
-  [FhirType("SubstanceReferenceInformation","http://hl7.org/fhir/StructureDefinition/SubstanceReferenceInformation", IsResource=true)]
+  [FhirType("SubstanceReferenceInformation","http://hl7.org/fhir/StructureDefinition/SubstanceReferenceInformation")]
   public partial class SubstanceReferenceInformation : Hl7.Fhir.Model.DomainResource
   {
     /// <summary>
@@ -61,7 +61,7 @@ public partial class SubstanceReferenceInformation : Hl7.Fhir.Model.DomainResour
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SubstanceReferenceInformation#Gene", IsNestedType=true)]
+    [FhirType("SubstanceReferenceInformation#Gene")]
     [BackboneType("SubstanceReferenceInformation.gene")]
     public partial class GeneComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -237,7 +237,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SubstanceReferenceInformation#GeneElement", IsNestedType=true)]
+    [FhirType("SubstanceReferenceInformation#GeneElement")]
     [BackboneType("SubstanceReferenceInformation.geneElement")]
     public partial class GeneElementComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -413,7 +413,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SubstanceReferenceInformation#Classification", IsNestedType=true)]
+    [FhirType("SubstanceReferenceInformation#Classification")]
     [BackboneType("SubstanceReferenceInformation.classification")]
     public partial class ClassificationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -615,7 +615,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SubstanceReferenceInformation#Target", IsNestedType=true)]
+    [FhirType("SubstanceReferenceInformation#Target")]
     [BackboneType("SubstanceReferenceInformation.target")]
     public partial class TargetComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4/Model/Generated/SubstanceSourceMaterial.cs b/src/Hl7.Fhir.R4/Model/Generated/SubstanceSourceMaterial.cs
index 6d6da390d1..9b17827d14 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/SubstanceSourceMaterial.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/SubstanceSourceMaterial.cs
@@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model
   /// </summary>
   [Serializable]
   [DataContract]
-  [FhirType("SubstanceSourceMaterial","http://hl7.org/fhir/StructureDefinition/SubstanceSourceMaterial", IsResource=true)]
+  [FhirType("SubstanceSourceMaterial","http://hl7.org/fhir/StructureDefinition/SubstanceSourceMaterial")]
   public partial class SubstanceSourceMaterial : Hl7.Fhir.Model.DomainResource
   {
     /// <summary>
@@ -61,7 +61,7 @@ public partial class SubstanceSourceMaterial : Hl7.Fhir.Model.DomainResource
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SubstanceSourceMaterial#FractionDescription", IsNestedType=true)]
+    [FhirType("SubstanceSourceMaterial#FractionDescription")]
     [BackboneType("SubstanceSourceMaterial.fractionDescription")]
     public partial class FractionDescriptionComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -227,7 +227,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SubstanceSourceMaterial#Organism", IsNestedType=true)]
+    [FhirType("SubstanceSourceMaterial#Organism")]
     [BackboneType("SubstanceSourceMaterial.organism")]
     public partial class OrganismComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -544,7 +544,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SubstanceSourceMaterial#Author", IsNestedType=true)]
+    [FhirType("SubstanceSourceMaterial#Author")]
     [BackboneType("SubstanceSourceMaterial.organism.author")]
     public partial class AuthorComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -710,7 +710,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SubstanceSourceMaterial#Hybrid", IsNestedType=true)]
+    [FhirType("SubstanceSourceMaterial#Hybrid")]
     [BackboneType("SubstanceSourceMaterial.organism.hybrid")]
     public partial class HybridComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1005,7 +1005,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SubstanceSourceMaterial#OrganismGeneral", IsNestedType=true)]
+    [FhirType("SubstanceSourceMaterial#OrganismGeneral")]
     [BackboneType("SubstanceSourceMaterial.organism.organismGeneral")]
     public partial class OrganismGeneralComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1203,7 +1203,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SubstanceSourceMaterial#PartDescription", IsNestedType=true)]
+    [FhirType("SubstanceSourceMaterial#PartDescription")]
     [BackboneType("SubstanceSourceMaterial.partDescription")]
     public partial class PartDescriptionComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4/Model/Generated/SubstanceSpecification.cs b/src/Hl7.Fhir.R4/Model/Generated/SubstanceSpecification.cs
index 152fa1c0c5..a82c0f7cd2 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/SubstanceSpecification.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/SubstanceSpecification.cs
@@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model
   /// </summary>
   [Serializable]
   [DataContract]
-  [FhirType("SubstanceSpecification","http://hl7.org/fhir/StructureDefinition/SubstanceSpecification", IsResource=true)]
+  [FhirType("SubstanceSpecification","http://hl7.org/fhir/StructureDefinition/SubstanceSpecification")]
   public partial class SubstanceSpecification : Hl7.Fhir.Model.DomainResource, IIdentifiable<Identifier>
   {
     /// <summary>
@@ -61,7 +61,7 @@ public partial class SubstanceSpecification : Hl7.Fhir.Model.DomainResource, IId
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SubstanceSpecification#Moiety", IsNestedType=true)]
+    [FhirType("SubstanceSpecification#Moiety")]
     [BackboneType("SubstanceSpecification.moiety")]
     public partial class MoietyComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -372,7 +372,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SubstanceSpecification#Property", IsNestedType=true)]
+    [FhirType("SubstanceSpecification#Property")]
     [BackboneType("SubstanceSpecification.property")]
     public partial class PropertyComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -618,7 +618,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SubstanceSpecification#Structure", IsNestedType=true)]
+    [FhirType("SubstanceSpecification#Structure")]
     [BackboneType("SubstanceSpecification.structure")]
     public partial class StructureComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -957,7 +957,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SubstanceSpecification#Isotope", IsNestedType=true)]
+    [FhirType("SubstanceSpecification#Isotope")]
     [BackboneType("SubstanceSpecification.structure.isotope")]
     public partial class IsotopeComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1180,7 +1180,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SubstanceSpecification#MolecularWeight", IsNestedType=true)]
+    [FhirType("SubstanceSpecification#MolecularWeight")]
     [BackboneType("SubstanceSpecification.structure.isotope.molecularWeight")]
     public partial class MolecularWeightComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1353,7 +1353,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SubstanceSpecification#Representation", IsNestedType=true)]
+    [FhirType("SubstanceSpecification#Representation")]
     [BackboneType("SubstanceSpecification.structure.representation")]
     public partial class RepresentationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1544,7 +1544,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SubstanceSpecification#Code", IsNestedType=true)]
+    [FhirType("SubstanceSpecification#Code")]
     [BackboneType("SubstanceSpecification.code")]
     public partial class CodeComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1806,7 +1806,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SubstanceSpecification#Name", IsNestedType=true)]
+    [FhirType("SubstanceSpecification#Name")]
     [BackboneType("SubstanceSpecification.name")]
     public partial class NameComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2225,7 +2225,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SubstanceSpecification#Official", IsNestedType=true)]
+    [FhirType("SubstanceSpecification#Official")]
     [BackboneType("SubstanceSpecification.name.official")]
     public partial class OfficialComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2416,7 +2416,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SubstanceSpecification#Relationship", IsNestedType=true)]
+    [FhirType("SubstanceSpecification#Relationship")]
     [BackboneType("SubstanceSpecification.relationship")]
     public partial class RelationshipComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4/Model/Generated/SupplyDelivery.cs b/src/Hl7.Fhir.R4/Model/Generated/SupplyDelivery.cs
index 507718aae8..567b762dd0 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/SupplyDelivery.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/SupplyDelivery.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("SupplyDelivery","http://hl7.org/fhir/StructureDefinition/SupplyDelivery", IsResource=true)]
+  [FhirType("SupplyDelivery","http://hl7.org/fhir/StructureDefinition/SupplyDelivery")]
   public partial class SupplyDelivery : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>, ICoded<Hl7.Fhir.Model.CodeableConcept>
   {
     /// <summary>
@@ -123,7 +123,7 @@ public enum SupplyItemType
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("SupplyDelivery#SuppliedItem", IsNestedType=true)]
+    [FhirType("SupplyDelivery#SuppliedItem")]
     [BackboneType("SupplyDelivery.suppliedItem")]
     public partial class SuppliedItemComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4/Model/Generated/SupplyRequest.cs b/src/Hl7.Fhir.R4/Model/Generated/SupplyRequest.cs
index 99296f6508..38c13929d3 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/SupplyRequest.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/SupplyRequest.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("SupplyRequest","http://hl7.org/fhir/StructureDefinition/SupplyRequest", IsResource=true)]
+  [FhirType("SupplyRequest","http://hl7.org/fhir/StructureDefinition/SupplyRequest")]
   public partial class SupplyRequest : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>, ICoded<Hl7.Fhir.Model.CodeableConcept>
   {
     /// <summary>
@@ -119,7 +119,7 @@ public enum SupplyRequestStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("SupplyRequest#Parameter", IsNestedType=true)]
+    [FhirType("SupplyRequest#Parameter")]
     [BackboneType("SupplyRequest.parameter")]
     public partial class ParameterComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4/Model/Generated/Task.cs b/src/Hl7.Fhir.R4/Model/Generated/Task.cs
index 0c676b1699..840486489a 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/Task.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/Task.cs
@@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model
   /// </summary>
   [Serializable]
   [DataContract]
-  [FhirType("Task","http://hl7.org/fhir/StructureDefinition/Task", IsResource=true)]
+  [FhirType("Task","http://hl7.org/fhir/StructureDefinition/Task")]
   public partial class Task : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>, ICoded<Hl7.Fhir.Model.CodeableConcept>
   {
     /// <summary>
@@ -210,7 +210,7 @@ public enum TaskIntent
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Task#Restriction", IsNestedType=true)]
+    [FhirType("Task#Restriction")]
     [BackboneType("Task.restriction")]
     public partial class RestrictionComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -407,7 +407,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Task#Parameter", IsNestedType=true)]
+    [FhirType("Task#Parameter")]
     [BackboneType("Task.input")]
     public partial class ParameterComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -563,7 +563,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Task#Output", IsNestedType=true)]
+    [FhirType("Task#Output")]
     [BackboneType("Task.output")]
     public partial class OutputComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4/Model/Generated/TerminologyCapabilities.cs b/src/Hl7.Fhir.R4/Model/Generated/TerminologyCapabilities.cs
index 6cda7dd039..0dd41b0cb6 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/TerminologyCapabilities.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/TerminologyCapabilities.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("TerminologyCapabilities","http://hl7.org/fhir/StructureDefinition/TerminologyCapabilities", IsResource=true)]
+  [FhirType("TerminologyCapabilities","http://hl7.org/fhir/StructureDefinition/TerminologyCapabilities")]
   public partial class TerminologyCapabilities : Hl7.Fhir.Model.DomainResource
   {
     /// <summary>
@@ -89,7 +89,7 @@ public enum CodeSearchSupport
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TerminologyCapabilities#Software", IsNestedType=true)]
+    [FhirType("TerminologyCapabilities#Software")]
     [BackboneType("TerminologyCapabilities.software")]
     public partial class SoftwareComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -277,7 +277,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TerminologyCapabilities#Implementation", IsNestedType=true)]
+    [FhirType("TerminologyCapabilities#Implementation")]
     [BackboneType("TerminologyCapabilities.implementation")]
     public partial class ImplementationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -466,7 +466,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TerminologyCapabilities#CodeSystem", IsNestedType=true)]
+    [FhirType("TerminologyCapabilities#CodeSystem")]
     [BackboneType("TerminologyCapabilities.codeSystem")]
     public partial class CodeSystemComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -680,7 +680,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TerminologyCapabilities#Version", IsNestedType=true)]
+    [FhirType("TerminologyCapabilities#Version")]
     [BackboneType("TerminologyCapabilities.codeSystem.version")]
     public partial class VersionComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1021,7 +1021,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("TerminologyCapabilities#Filter", IsNestedType=true)]
+    [FhirType("TerminologyCapabilities#Filter")]
     [BackboneType("TerminologyCapabilities.codeSystem.version.filter")]
     public partial class FilterComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1207,7 +1207,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("TerminologyCapabilities#Expansion", IsNestedType=true)]
+    [FhirType("TerminologyCapabilities#Expansion")]
     [BackboneType("TerminologyCapabilities.expansion")]
     public partial class ExpansionComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1503,7 +1503,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("TerminologyCapabilities#Parameter", IsNestedType=true)]
+    [FhirType("TerminologyCapabilities#Parameter")]
     [BackboneType("TerminologyCapabilities.expansion.parameter")]
     public partial class ParameterComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1688,7 +1688,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("TerminologyCapabilities#ValidateCode", IsNestedType=true)]
+    [FhirType("TerminologyCapabilities#ValidateCode")]
     [BackboneType("TerminologyCapabilities.validateCode")]
     public partial class ValidateCodeComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1830,7 +1830,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("TerminologyCapabilities#Translation", IsNestedType=true)]
+    [FhirType("TerminologyCapabilities#Translation")]
     [BackboneType("TerminologyCapabilities.translation")]
     public partial class TranslationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1975,7 +1975,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TerminologyCapabilities#Closure", IsNestedType=true)]
+    [FhirType("TerminologyCapabilities#Closure")]
     [BackboneType("TerminologyCapabilities.closure")]
     public partial class ClosureComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4/Model/Generated/TestReport.cs b/src/Hl7.Fhir.R4/Model/Generated/TestReport.cs
index 3ff0af3ed6..05cb1ac08b 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/TestReport.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/TestReport.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("TestReport","http://hl7.org/fhir/StructureDefinition/TestReport", IsResource=true)]
+  [FhirType("TestReport","http://hl7.org/fhir/StructureDefinition/TestReport")]
   public partial class TestReport : Hl7.Fhir.Model.DomainResource, IIdentifiable<Identifier>
   {
     /// <summary>
@@ -200,7 +200,7 @@ public enum TestReportActionResult
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("TestReport#Participant", IsNestedType=true)]
+    [FhirType("TestReport#Participant")]
     [BackboneType("TestReport.participant")]
     public partial class ParticipantComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -431,7 +431,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("TestReport#Setup", IsNestedType=true)]
+    [FhirType("TestReport#Setup")]
     [BackboneType("TestReport.setup")]
     public partial class SetupComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -559,7 +559,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestReport#SetupAction", IsNestedType=true)]
+    [FhirType("TestReport#SetupAction")]
     [BackboneType("TestReport.setup.action")]
     public partial class SetupActionComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -710,7 +710,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestReport#Operation", IsNestedType=true)]
+    [FhirType("TestReport#Operation")]
     [BackboneType("TestReport.setup.action.operation")]
     public partial class OperationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -943,7 +943,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestReport#Assert", IsNestedType=true)]
+    [FhirType("TestReport#Assert")]
     [BackboneType("TestReport.setup.action.assert")]
     public partial class AssertComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1173,7 +1173,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("TestReport#Test", IsNestedType=true)]
+    [FhirType("TestReport#Test")]
     [BackboneType("TestReport.test")]
     public partial class TestComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1387,7 +1387,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestReport#TestAction", IsNestedType=true)]
+    [FhirType("TestReport#TestAction")]
     [BackboneType("TestReport.test.action")]
     public partial class TestActionComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1538,7 +1538,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestReport#Teardown", IsNestedType=true)]
+    [FhirType("TestReport#Teardown")]
     [BackboneType("TestReport.teardown")]
     public partial class TeardownComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1666,7 +1666,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestReport#TeardownAction", IsNestedType=true)]
+    [FhirType("TestReport#TeardownAction")]
     [BackboneType("TestReport.teardown.action")]
     public partial class TeardownActionComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4/Model/Generated/TestScript.cs b/src/Hl7.Fhir.R4/Model/Generated/TestScript.cs
index 7145881272..3e5cf2025f 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/TestScript.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/TestScript.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("TestScript","http://hl7.org/fhir/StructureDefinition/TestScript", IsResource=true)]
+  [FhirType("TestScript","http://hl7.org/fhir/StructureDefinition/TestScript")]
   public partial class TestScript : Hl7.Fhir.Model.DomainResource, IIdentifiable<Identifier>
   {
     /// <summary>
@@ -300,7 +300,7 @@ public enum AssertionResponseTypes
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#Origin", IsNestedType=true)]
+    [FhirType("TestScript#Origin")]
     [BackboneType("TestScript.origin")]
     public partial class OriginComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -473,7 +473,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#Destination", IsNestedType=true)]
+    [FhirType("TestScript#Destination")]
     [BackboneType("TestScript.destination")]
     public partial class DestinationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -645,7 +645,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#Metadata", IsNestedType=true)]
+    [FhirType("TestScript#Metadata")]
     [BackboneType("TestScript.metadata")]
     public partial class MetadataComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -798,7 +798,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#Link", IsNestedType=true)]
+    [FhirType("TestScript#Link")]
     [BackboneType("TestScript.metadata.link")]
     public partial class LinkComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -987,7 +987,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#Capability", IsNestedType=true)]
+    [FhirType("TestScript#Capability")]
     [BackboneType("TestScript.metadata.capability")]
     public partial class CapabilityComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1394,7 +1394,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#Fixture", IsNestedType=true)]
+    [FhirType("TestScript#Fixture")]
     [BackboneType("TestScript.fixture")]
     public partial class FixtureComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1611,7 +1611,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#Variable", IsNestedType=true)]
+    [FhirType("TestScript#Variable")]
     [BackboneType("TestScript.variable")]
     public partial class VariableComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2054,7 +2054,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#Setup", IsNestedType=true)]
+    [FhirType("TestScript#Setup")]
     [BackboneType("TestScript.setup")]
     public partial class SetupComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2182,7 +2182,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#SetupAction", IsNestedType=true)]
+    [FhirType("TestScript#SetupAction")]
     [BackboneType("TestScript.setup.action")]
     public partial class SetupActionComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2333,7 +2333,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#Operation", IsNestedType=true)]
+    [FhirType("TestScript#Operation")]
     [BackboneType("TestScript.setup.action.operation")]
     public partial class OperationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -3139,7 +3139,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#RequestHeader", IsNestedType=true)]
+    [FhirType("TestScript#RequestHeader")]
     [BackboneType("TestScript.setup.action.operation.requestHeader")]
     public partial class RequestHeaderComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -3329,7 +3329,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#Assert", IsNestedType=true)]
+    [FhirType("TestScript#Assert")]
     [BackboneType("TestScript.setup.action.assert")]
     public partial class AssertComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -4385,7 +4385,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#Test", IsNestedType=true)]
+    [FhirType("TestScript#Test")]
     [BackboneType("TestScript.test")]
     public partial class TestComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -4599,7 +4599,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#TestAction", IsNestedType=true)]
+    [FhirType("TestScript#TestAction")]
     [BackboneType("TestScript.test.action")]
     public partial class TestActionComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -4750,7 +4750,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#Teardown", IsNestedType=true)]
+    [FhirType("TestScript#Teardown")]
     [BackboneType("TestScript.teardown")]
     public partial class TeardownComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -4878,7 +4878,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#TeardownAction", IsNestedType=true)]
+    [FhirType("TestScript#TeardownAction")]
     [BackboneType("TestScript.teardown.action")]
     public partial class TeardownActionComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4/Model/Generated/Timing.cs b/src/Hl7.Fhir.R4/Model/Generated/Timing.cs
index 81685daa82..565a58f340 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/Timing.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/Timing.cs
@@ -291,7 +291,7 @@ public enum EventTiming
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Timing#Repeat", IsNestedType=true)]
+    [FhirType("Timing#Repeat")]
     [BackboneType("Timing.repeat")]
     public partial class RepeatComponent : Hl7.Fhir.Model.Element
     {
diff --git a/src/Hl7.Fhir.R4/Model/Generated/VerificationResult.cs b/src/Hl7.Fhir.R4/Model/Generated/VerificationResult.cs
index 3028c3a90f..bd3216392f 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/VerificationResult.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/VerificationResult.cs
@@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model
   /// </summary>
   [Serializable]
   [DataContract]
-  [FhirType("VerificationResult","http://hl7.org/fhir/StructureDefinition/VerificationResult", IsResource=true)]
+  [FhirType("VerificationResult","http://hl7.org/fhir/StructureDefinition/VerificationResult")]
   public partial class VerificationResult : Hl7.Fhir.Model.DomainResource
   {
     /// <summary>
@@ -107,7 +107,7 @@ public enum StatusCode
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("VerificationResult#PrimarySource", IsNestedType=true)]
+    [FhirType("VerificationResult#PrimarySource")]
     [BackboneType("VerificationResult.primarySource")]
     public partial class PrimarySourceComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -408,7 +408,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("VerificationResult#Attestation", IsNestedType=true)]
+    [FhirType("VerificationResult#Attestation")]
     [BackboneType("VerificationResult.attestation")]
     public partial class AttestationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -765,7 +765,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("VerificationResult#Validator", IsNestedType=true)]
+    [FhirType("VerificationResult#Validator")]
     [BackboneType("VerificationResult.validator")]
     public partial class ValidatorComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4/Model/Generated/VisionPrescription.cs b/src/Hl7.Fhir.R4/Model/Generated/VisionPrescription.cs
index 1268c01658..0038cc3fde 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/VisionPrescription.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/VisionPrescription.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("VisionPrescription","http://hl7.org/fhir/StructureDefinition/VisionPrescription", IsResource=true)]
+  [FhirType("VisionPrescription","http://hl7.org/fhir/StructureDefinition/VisionPrescription")]
   public partial class VisionPrescription : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -123,7 +123,7 @@ public enum VisionBase
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("VisionPrescription#LensSpecification", IsNestedType=true)]
+    [FhirType("VisionPrescription#LensSpecification")]
     [BackboneType("VisionPrescription.lensSpecification")]
     public partial class LensSpecificationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -761,7 +761,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("VisionPrescription#Prism", IsNestedType=true)]
+    [FhirType("VisionPrescription#Prism")]
     [BackboneType("VisionPrescription.lensSpecification.prism")]
     public partial class PrismComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Account.cs b/src/Hl7.Fhir.R4B/Model/Generated/Account.cs
index 1846f50618..9608acf6de 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/Account.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/Account.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Account","http://hl7.org/fhir/StructureDefinition/Account", IsResource=true)]
+  [FhirType("Account","http://hl7.org/fhir/StructureDefinition/Account")]
   public partial class Account : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -109,7 +109,7 @@ public enum AccountStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Account#Coverage", IsNestedType=true)]
+    [FhirType("Account#Coverage")]
     [BackboneType("Account.coverage")]
     public partial class CoverageComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -281,7 +281,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Account#Guarantor", IsNestedType=true)]
+    [FhirType("Account#Guarantor")]
     [BackboneType("Account.guarantor")]
     public partial class GuarantorComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/ActivityDefinition.cs b/src/Hl7.Fhir.R4B/Model/Generated/ActivityDefinition.cs
index 7adc2af71d..9a7a7ba1b3 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/ActivityDefinition.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/ActivityDefinition.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("ActivityDefinition","http://hl7.org/fhir/StructureDefinition/ActivityDefinition", IsResource=true)]
+  [FhirType("ActivityDefinition","http://hl7.org/fhir/StructureDefinition/ActivityDefinition")]
   public partial class ActivityDefinition : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -167,7 +167,7 @@ public enum RequestResourceType
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ActivityDefinition#Participant", IsNestedType=true)]
+    [FhirType("ActivityDefinition#Participant")]
     [BackboneType("ActivityDefinition.participant")]
     public partial class ParticipantComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -341,7 +341,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ActivityDefinition#DynamicValue", IsNestedType=true)]
+    [FhirType("ActivityDefinition#DynamicValue")]
     [BackboneType("ActivityDefinition.dynamicValue")]
     public partial class DynamicValueComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/AdministrableProductDefinition.cs b/src/Hl7.Fhir.R4B/Model/Generated/AdministrableProductDefinition.cs
index 41afb91c8f..687e73fc9c 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/AdministrableProductDefinition.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/AdministrableProductDefinition.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("AdministrableProductDefinition","http://hl7.org/fhir/StructureDefinition/AdministrableProductDefinition", IsResource=true)]
+  [FhirType("AdministrableProductDefinition","http://hl7.org/fhir/StructureDefinition/AdministrableProductDefinition")]
   public partial class AdministrableProductDefinition : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -64,7 +64,7 @@ public partial class AdministrableProductDefinition : Hl7.Fhir.Model.DomainResou
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("AdministrableProductDefinition#Property", IsNestedType=true)]
+    [FhirType("AdministrableProductDefinition#Property")]
     [BackboneType("AdministrableProductDefinition.property")]
     public partial class PropertyComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -245,7 +245,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("AdministrableProductDefinition#RouteOfAdministration", IsNestedType=true)]
+    [FhirType("AdministrableProductDefinition#RouteOfAdministration")]
     [BackboneType("AdministrableProductDefinition.routeOfAdministration")]
     public partial class RouteOfAdministrationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -521,7 +521,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("AdministrableProductDefinition#TargetSpecies", IsNestedType=true)]
+    [FhirType("AdministrableProductDefinition#TargetSpecies")]
     [BackboneType("AdministrableProductDefinition.routeOfAdministration.targetSpecies")]
     public partial class TargetSpeciesComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -672,7 +672,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("AdministrableProductDefinition#WithdrawalPeriod", IsNestedType=true)]
+    [FhirType("AdministrableProductDefinition#WithdrawalPeriod")]
     [BackboneType("AdministrableProductDefinition.routeOfAdministration.targetSpecies.withdrawalPeriod")]
     public partial class WithdrawalPeriodComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/AdverseEvent.cs b/src/Hl7.Fhir.R4B/Model/Generated/AdverseEvent.cs
index 34425784fb..3bb4f9de68 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/AdverseEvent.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/AdverseEvent.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("AdverseEvent","http://hl7.org/fhir/StructureDefinition/AdverseEvent", IsResource=true)]
+  [FhirType("AdverseEvent","http://hl7.org/fhir/StructureDefinition/AdverseEvent")]
   public partial class AdverseEvent : Hl7.Fhir.Model.DomainResource, IIdentifiable<Identifier>
   {
     /// <summary>
@@ -163,7 +163,7 @@ public enum AdverseEventOutcome
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("AdverseEvent#SuspectEntity", IsNestedType=true)]
+    [FhirType("AdverseEvent#SuspectEntity")]
     [BackboneType("AdverseEvent.suspectEntity")]
     public partial class SuspectEntityComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -315,7 +315,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("AdverseEvent#Causality", IsNestedType=true)]
+    [FhirType("AdverseEvent#Causality")]
     [BackboneType("AdverseEvent.suspectEntity.causality")]
     public partial class CausalityComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/AllergyIntolerance.cs b/src/Hl7.Fhir.R4B/Model/Generated/AllergyIntolerance.cs
index a8ba67ef83..c239270896 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/AllergyIntolerance.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/AllergyIntolerance.cs
@@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("AllergyIntolerance","http://hl7.org/fhir/StructureDefinition/AllergyIntolerance", IsResource=true)]
+  [FhirType("AllergyIntolerance","http://hl7.org/fhir/StructureDefinition/AllergyIntolerance")]
   public partial class AllergyIntolerance : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -242,7 +242,7 @@ public enum AllergyIntoleranceSeverity
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("AllergyIntolerance#Reaction", IsNestedType=true)]
+    [FhirType("AllergyIntolerance#Reaction")]
     [BackboneType("AllergyIntolerance.reaction")]
     public partial class ReactionComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Appointment.cs b/src/Hl7.Fhir.R4B/Model/Generated/Appointment.cs
index 73094e11f5..70297c4cae 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/Appointment.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/Appointment.cs
@@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model
   /// </summary>
   [Serializable]
   [DataContract]
-  [FhirType("Appointment","http://hl7.org/fhir/StructureDefinition/Appointment", IsResource=true)]
+  [FhirType("Appointment","http://hl7.org/fhir/StructureDefinition/Appointment")]
   public partial class Appointment : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -162,7 +162,7 @@ public enum ParticipantRequired
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Appointment#Participant", IsNestedType=true)]
+    [FhirType("Appointment#Participant")]
     [BackboneType("Appointment.participant")]
     public partial class ParticipantComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/AppointmentResponse.cs b/src/Hl7.Fhir.R4B/Model/Generated/AppointmentResponse.cs
index 87f25f913e..41fb0ea65a 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/AppointmentResponse.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/AppointmentResponse.cs
@@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model
   /// </summary>
   [Serializable]
   [DataContract]
-  [FhirType("AppointmentResponse","http://hl7.org/fhir/StructureDefinition/AppointmentResponse", IsResource=true)]
+  [FhirType("AppointmentResponse","http://hl7.org/fhir/StructureDefinition/AppointmentResponse")]
   public partial class AppointmentResponse : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/AuditEvent.cs b/src/Hl7.Fhir.R4B/Model/Generated/AuditEvent.cs
index 2254afbd9d..9742a297f8 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/AuditEvent.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/AuditEvent.cs
@@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("AuditEvent","http://hl7.org/fhir/StructureDefinition/AuditEvent", IsResource=true)]
+  [FhirType("AuditEvent","http://hl7.org/fhir/StructureDefinition/AuditEvent")]
   public partial class AuditEvent : Hl7.Fhir.Model.DomainResource
   {
     /// <summary>
@@ -184,7 +184,7 @@ public enum AuditEventAgentNetworkType
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("AuditEvent#Agent", IsNestedType=true)]
+    [FhirType("AuditEvent#Agent")]
     [BackboneType("AuditEvent.agent")]
     public partial class AgentComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -644,7 +644,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("AuditEvent#Network", IsNestedType=true)]
+    [FhirType("AuditEvent#Network")]
     [BackboneType("AuditEvent.agent.network")]
     public partial class NetworkComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -834,7 +834,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("AuditEvent#Source", IsNestedType=true)]
+    [FhirType("AuditEvent#Source")]
     [BackboneType("AuditEvent.source")]
     public partial class SourceComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1034,7 +1034,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("AuditEvent#Entity", IsNestedType=true)]
+    [FhirType("AuditEvent#Entity")]
     [BackboneType("AuditEvent.entity")]
     public partial class EntityComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1422,7 +1422,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("AuditEvent#Detail", IsNestedType=true)]
+    [FhirType("AuditEvent#Detail")]
     [BackboneType("AuditEvent.entity.detail")]
     public partial class DetailComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Basic.cs b/src/Hl7.Fhir.R4B/Model/Generated/Basic.cs
index b1d548c966..9f20602b74 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/Basic.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/Basic.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Basic","http://hl7.org/fhir/StructureDefinition/Basic", IsResource=true)]
+  [FhirType("Basic","http://hl7.org/fhir/StructureDefinition/Basic")]
   public partial class Basic : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/BiologicallyDerivedProduct.cs b/src/Hl7.Fhir.R4B/Model/Generated/BiologicallyDerivedProduct.cs
index 064d8e8078..7d9235540c 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/BiologicallyDerivedProduct.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/BiologicallyDerivedProduct.cs
@@ -53,7 +53,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("BiologicallyDerivedProduct","http://hl7.org/fhir/StructureDefinition/BiologicallyDerivedProduct", IsResource=true)]
+  [FhirType("BiologicallyDerivedProduct","http://hl7.org/fhir/StructureDefinition/BiologicallyDerivedProduct")]
   public partial class BiologicallyDerivedProduct : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -156,7 +156,7 @@ public enum BiologicallyDerivedProductStorageScale
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("BiologicallyDerivedProduct#Collection", IsNestedType=true)]
+    [FhirType("BiologicallyDerivedProduct#Collection")]
     [BackboneType("BiologicallyDerivedProduct.collection")]
     public partial class CollectionComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -338,7 +338,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("BiologicallyDerivedProduct#Processing", IsNestedType=true)]
+    [FhirType("BiologicallyDerivedProduct#Processing")]
     [BackboneType("BiologicallyDerivedProduct.processing")]
     public partial class ProcessingComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -562,7 +562,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("BiologicallyDerivedProduct#Manipulation", IsNestedType=true)]
+    [FhirType("BiologicallyDerivedProduct#Manipulation")]
     [BackboneType("BiologicallyDerivedProduct.manipulation")]
     public partial class ManipulationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -730,7 +730,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("BiologicallyDerivedProduct#Storage", IsNestedType=true)]
+    [FhirType("BiologicallyDerivedProduct#Storage")]
     [BackboneType("BiologicallyDerivedProduct.storage")]
     public partial class StorageComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/BodyStructure.cs b/src/Hl7.Fhir.R4B/Model/Generated/BodyStructure.cs
index 3f46cc8b29..5ddf0fe79c 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/BodyStructure.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/BodyStructure.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("BodyStructure","http://hl7.org/fhir/StructureDefinition/BodyStructure", IsResource=true)]
+  [FhirType("BodyStructure","http://hl7.org/fhir/StructureDefinition/BodyStructure")]
   public partial class BodyStructure : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/CarePlan.cs b/src/Hl7.Fhir.R4B/Model/Generated/CarePlan.cs
index 3a43f5d022..9c024d34f2 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/CarePlan.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/CarePlan.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("CarePlan","http://hl7.org/fhir/StructureDefinition/CarePlan", IsResource=true)]
+  [FhirType("CarePlan","http://hl7.org/fhir/StructureDefinition/CarePlan")]
   public partial class CarePlan : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -223,7 +223,7 @@ public enum CarePlanActivityStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CarePlan#Activity", IsNestedType=true)]
+    [FhirType("CarePlan#Activity")]
     [BackboneType("CarePlan.activity")]
     public partial class ActivityComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -457,7 +457,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CarePlan#Detail", IsNestedType=true)]
+    [FhirType("CarePlan#Detail")]
     [BackboneType("CarePlan.activity.detail")]
     public partial class DetailComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/CareTeam.cs b/src/Hl7.Fhir.R4B/Model/Generated/CareTeam.cs
index eb8f046c62..203022a1c8 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/CareTeam.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/CareTeam.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("CareTeam","http://hl7.org/fhir/StructureDefinition/CareTeam", IsResource=true)]
+  [FhirType("CareTeam","http://hl7.org/fhir/StructureDefinition/CareTeam")]
   public partial class CareTeam : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -107,7 +107,7 @@ public enum CareTeamStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CareTeam#Participant", IsNestedType=true)]
+    [FhirType("CareTeam#Participant")]
     [BackboneType("CareTeam.participant")]
     public partial class ParticipantComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/CatalogEntry.cs b/src/Hl7.Fhir.R4B/Model/Generated/CatalogEntry.cs
index 652fa72fc0..e6ece4dd3e 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/CatalogEntry.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/CatalogEntry.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("CatalogEntry","http://hl7.org/fhir/StructureDefinition/CatalogEntry", IsResource=true)]
+  [FhirType("CatalogEntry","http://hl7.org/fhir/StructureDefinition/CatalogEntry")]
   public partial class CatalogEntry : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -89,7 +89,7 @@ public enum CatalogEntryRelationType
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CatalogEntry#RelatedEntry", IsNestedType=true)]
+    [FhirType("CatalogEntry#RelatedEntry")]
     [BackboneType("CatalogEntry.relatedEntry")]
     public partial class RelatedEntryComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/ChargeItem.cs b/src/Hl7.Fhir.R4B/Model/Generated/ChargeItem.cs
index e90020f4c2..0d569d2ad2 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/ChargeItem.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/ChargeItem.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("ChargeItem","http://hl7.org/fhir/StructureDefinition/ChargeItem", IsResource=true)]
+  [FhirType("ChargeItem","http://hl7.org/fhir/StructureDefinition/ChargeItem")]
   public partial class ChargeItem : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -119,7 +119,7 @@ public enum ChargeItemStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ChargeItem#Performer", IsNestedType=true)]
+    [FhirType("ChargeItem#Performer")]
     [BackboneType("ChargeItem.performer")]
     public partial class PerformerComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/ChargeItemDefinition.cs b/src/Hl7.Fhir.R4B/Model/Generated/ChargeItemDefinition.cs
index c8b40a2b19..49f498c1cd 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/ChargeItemDefinition.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/ChargeItemDefinition.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("ChargeItemDefinition","http://hl7.org/fhir/StructureDefinition/ChargeItemDefinition", IsResource=true)]
+  [FhirType("ChargeItemDefinition","http://hl7.org/fhir/StructureDefinition/ChargeItemDefinition")]
   public partial class ChargeItemDefinition : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -68,7 +68,7 @@ public partial class ChargeItemDefinition : Hl7.Fhir.Model.DomainResource, IIden
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ChargeItemDefinition#Applicability", IsNestedType=true)]
+    [FhirType("ChargeItemDefinition#Applicability")]
     [BackboneType("ChargeItemDefinition.applicability")]
     public partial class ApplicabilityComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -298,7 +298,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ChargeItemDefinition#PropertyGroup", IsNestedType=true)]
+    [FhirType("ChargeItemDefinition#PropertyGroup")]
     [BackboneType("ChargeItemDefinition.propertyGroup")]
     public partial class PropertyGroupComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -451,7 +451,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ChargeItemDefinition#PriceComponent", IsNestedType=true)]
+    [FhirType("ChargeItemDefinition#PriceComponent")]
     [BackboneType("ChargeItemDefinition.propertyGroup.priceComponent")]
     public partial class PriceComponentComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Citation.cs b/src/Hl7.Fhir.R4B/Model/Generated/Citation.cs
index f19ce29cf6..a3b5278368 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/Citation.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/Citation.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Citation","http://hl7.org/fhir/StructureDefinition/Citation", IsResource=true)]
+  [FhirType("Citation","http://hl7.org/fhir/StructureDefinition/Citation")]
   public partial class Citation : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -64,7 +64,7 @@ public partial class Citation : Hl7.Fhir.Model.DomainResource, IIdentifiable<Lis
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Citation#Summary", IsNestedType=true)]
+    [FhirType("Citation#Summary")]
     [BackboneType("Citation.summary")]
     public partial class SummaryComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -232,7 +232,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Citation#Classification", IsNestedType=true)]
+    [FhirType("Citation#Classification")]
     [BackboneType("Citation.classification")]
     public partial class ClassificationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -383,7 +383,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Citation#StatusDate", IsNestedType=true)]
+    [FhirType("Citation#StatusDate")]
     [BackboneType("Citation.statusDate")]
     public partial class StatusDateComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -577,7 +577,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Citation#RelatesTo", IsNestedType=true)]
+    [FhirType("Citation#RelatesTo")]
     [BackboneType("Citation.relatesTo")]
     public partial class RelatesToComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -758,7 +758,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Citation#CitedArtifact", IsNestedType=true)]
+    [FhirType("Citation#CitedArtifact")]
     [BackboneType("Citation.citedArtifact")]
     public partial class CitedArtifactComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1261,7 +1261,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Citation#CitedArtifactVersion", IsNestedType=true)]
+    [FhirType("Citation#CitedArtifactVersion")]
     [BackboneType("Citation.citedArtifact.version")]
     public partial class CitedArtifactVersionComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1430,7 +1430,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Citation#CitedArtifactStatusDate", IsNestedType=true)]
+    [FhirType("Citation#CitedArtifactStatusDate")]
     [BackboneType("Citation.citedArtifact.statusDate")]
     public partial class CitedArtifactStatusDateComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1624,7 +1624,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Citation#CitedArtifactTitle", IsNestedType=true)]
+    [FhirType("Citation#CitedArtifactTitle")]
     [BackboneType("Citation.citedArtifact.title")]
     public partial class CitedArtifactTitleComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1819,7 +1819,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Citation#CitedArtifactAbstract", IsNestedType=true)]
+    [FhirType("Citation#CitedArtifactAbstract")]
     [BackboneType("Citation.citedArtifact.abstract")]
     public partial class CitedArtifactAbstractComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2056,7 +2056,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Citation#CitedArtifactPart", IsNestedType=true)]
+    [FhirType("Citation#CitedArtifactPart")]
     [BackboneType("Citation.citedArtifact.part")]
     public partial class CitedArtifactPartComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2250,7 +2250,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Citation#CitedArtifactRelatesTo", IsNestedType=true)]
+    [FhirType("Citation#CitedArtifactRelatesTo")]
     [BackboneType("Citation.citedArtifact.relatesTo")]
     public partial class CitedArtifactRelatesToComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2434,7 +2434,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Citation#CitedArtifactPublicationForm", IsNestedType=true)]
+    [FhirType("Citation#CitedArtifactPublicationForm")]
     [BackboneType("Citation.citedArtifact.publicationForm")]
     public partial class CitedArtifactPublicationFormComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2953,7 +2953,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Citation#CitedArtifactPublicationFormPublishedIn", IsNestedType=true)]
+    [FhirType("Citation#CitedArtifactPublicationFormPublishedIn")]
     [BackboneType("Citation.citedArtifact.publicationForm.publishedIn")]
     public partial class CitedArtifactPublicationFormPublishedInComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -3216,7 +3216,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Citation#CitedArtifactPublicationFormPeriodicRelease", IsNestedType=true)]
+    [FhirType("Citation#CitedArtifactPublicationFormPeriodicRelease")]
     [BackboneType("Citation.citedArtifact.publicationForm.periodicRelease")]
     public partial class CitedArtifactPublicationFormPeriodicReleaseComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -3451,7 +3451,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Citation#CitedArtifactPublicationFormPeriodicReleaseDateOfPublication", IsNestedType=true)]
+    [FhirType("Citation#CitedArtifactPublicationFormPeriodicReleaseDateOfPublication")]
     [BackboneType("Citation.citedArtifact.publicationForm.periodicRelease.dateOfPublication")]
     public partial class CitedArtifactPublicationFormPeriodicReleaseDateOfPublicationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -3807,7 +3807,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Citation#CitedArtifactWebLocation", IsNestedType=true)]
+    [FhirType("Citation#CitedArtifactWebLocation")]
     [BackboneType("Citation.citedArtifact.webLocation")]
     public partial class CitedArtifactWebLocationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -3974,7 +3974,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Citation#CitedArtifactClassification", IsNestedType=true)]
+    [FhirType("Citation#CitedArtifactClassification")]
     [BackboneType("Citation.citedArtifact.classification")]
     public partial class CitedArtifactClassificationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -4150,7 +4150,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Citation#CitedArtifactClassificationWhoClassified", IsNestedType=true)]
+    [FhirType("Citation#CitedArtifactClassificationWhoClassified")]
     [BackboneType("Citation.citedArtifact.classification.whoClassified")]
     public partial class CitedArtifactClassificationWhoClassifiedComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -4418,7 +4418,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Citation#CitedArtifactContributorship", IsNestedType=true)]
+    [FhirType("Citation#CitedArtifactContributorship")]
     [BackboneType("Citation.citedArtifact.contributorship")]
     public partial class CitedArtifactContributorshipComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -4615,7 +4615,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Citation#CitedArtifactContributorshipEntry", IsNestedType=true)]
+    [FhirType("Citation#CitedArtifactContributorshipEntry")]
     [BackboneType("Citation.citedArtifact.contributorship.entry")]
     public partial class CitedArtifactContributorshipEntryComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -5096,7 +5096,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Citation#CitedArtifactContributorshipEntryAffiliationInfo", IsNestedType=true)]
+    [FhirType("Citation#CitedArtifactContributorshipEntryAffiliationInfo")]
     [BackboneType("Citation.citedArtifact.contributorship.entry.affiliationInfo")]
     public partial class CitedArtifactContributorshipEntryAffiliationInfoComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -5306,7 +5306,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Citation#CitedArtifactContributorshipEntryContributionInstance", IsNestedType=true)]
+    [FhirType("Citation#CitedArtifactContributorshipEntryContributionInstance")]
     [BackboneType("Citation.citedArtifact.contributorship.entry.contributionInstance")]
     public partial class CitedArtifactContributorshipEntryContributionInstanceComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -5474,7 +5474,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Citation#CitedArtifactContributorshipSummary", IsNestedType=true)]
+    [FhirType("Citation#CitedArtifactContributorshipSummary")]
     [BackboneType("Citation.citedArtifact.contributorship.summary")]
     public partial class CitedArtifactContributorshipSummaryComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Claim.cs b/src/Hl7.Fhir.R4B/Model/Generated/Claim.cs
index 1d6be4fcaf..0f05563ed9 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/Claim.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/Claim.cs
@@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Claim","http://hl7.org/fhir/StructureDefinition/Claim", IsResource=true)]
+  [FhirType("Claim","http://hl7.org/fhir/StructureDefinition/Claim")]
   public partial class Claim : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -69,7 +69,7 @@ public partial class Claim : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<I
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Claim#RelatedClaim", IsNestedType=true)]
+    [FhirType("Claim#RelatedClaim")]
     [BackboneType("Claim.related")]
     public partial class RelatedClaimComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -249,7 +249,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Claim#Payee", IsNestedType=true)]
+    [FhirType("Claim#Payee")]
     [BackboneType("Claim.payee")]
     public partial class PayeeComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -404,7 +404,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Claim#CareTeam", IsNestedType=true)]
+    [FhirType("Claim#CareTeam")]
     [BackboneType("Claim.careTeam")]
     public partial class CareTeamComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -673,7 +673,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Claim#SupportingInformation", IsNestedType=true)]
+    [FhirType("Claim#SupportingInformation")]
     [BackboneType("Claim.supportingInfo")]
     public partial class SupportingInformationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -952,7 +952,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Claim#Diagnosis", IsNestedType=true)]
+    [FhirType("Claim#Diagnosis")]
     [BackboneType("Claim.diagnosis")]
     public partial class DiagnosisComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1206,7 +1206,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Claim#Procedure", IsNestedType=true)]
+    [FhirType("Claim#Procedure")]
     [BackboneType("Claim.procedure")]
     public partial class ProcedureComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1480,7 +1480,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Claim#Insurance", IsNestedType=true)]
+    [FhirType("Claim#Insurance")]
     [BackboneType("Claim.insurance")]
     public partial class InsuranceComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1836,7 +1836,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Claim#Accident", IsNestedType=true)]
+    [FhirType("Claim#Accident")]
     [BackboneType("Claim.accident")]
     public partial class AccidentComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2035,7 +2035,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Claim#Item", IsNestedType=true)]
+    [FhirType("Claim#Item")]
     [BackboneType("Claim.item")]
     public partial class ItemComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2798,7 +2798,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Claim#Detail", IsNestedType=true)]
+    [FhirType("Claim#Detail")]
     [BackboneType("Claim.item.detail")]
     public partial class DetailComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -3248,7 +3248,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Claim#SubDetail", IsNestedType=true)]
+    [FhirType("Claim#SubDetail")]
     [BackboneType("Claim.item.detail.subDetail")]
     public partial class SubDetailComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/ClaimResponse.cs b/src/Hl7.Fhir.R4B/Model/Generated/ClaimResponse.cs
index c4f7a54f51..9975da2485 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/ClaimResponse.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/ClaimResponse.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("ClaimResponse","http://hl7.org/fhir/StructureDefinition/ClaimResponse", IsResource=true)]
+  [FhirType("ClaimResponse","http://hl7.org/fhir/StructureDefinition/ClaimResponse")]
   public partial class ClaimResponse : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -67,7 +67,7 @@ public partial class ClaimResponse : Hl7.Fhir.Model.DomainResource, IIdentifiabl
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ClaimResponse#Item", IsNestedType=true)]
+    [FhirType("ClaimResponse#Item")]
     [BackboneType("ClaimResponse.item")]
     public partial class ItemComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -308,7 +308,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ClaimResponse#Adjudication", IsNestedType=true)]
+    [FhirType("ClaimResponse#Adjudication")]
     [BackboneType("ClaimResponse.item.adjudication")]
     public partial class AdjudicationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -530,7 +530,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ClaimResponse#ItemDetail", IsNestedType=true)]
+    [FhirType("ClaimResponse#ItemDetail")]
     [BackboneType("ClaimResponse.item.detail")]
     public partial class ItemDetailComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -771,7 +771,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ClaimResponse#SubDetail", IsNestedType=true)]
+    [FhirType("ClaimResponse#SubDetail")]
     [BackboneType("ClaimResponse.item.detail.subDetail")]
     public partial class SubDetailComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -986,7 +986,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ClaimResponse#AddedItem", IsNestedType=true)]
+    [FhirType("ClaimResponse#AddedItem")]
     [BackboneType("ClaimResponse.addItem")]
     public partial class AddedItemComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1651,7 +1651,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ClaimResponse#AddedItemDetail", IsNestedType=true)]
+    [FhirType("ClaimResponse#AddedItemDetail")]
     [BackboneType("ClaimResponse.addItem.detail")]
     public partial class AddedItemDetailComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2020,7 +2020,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ClaimResponse#AddedItemSubDetail", IsNestedType=true)]
+    [FhirType("ClaimResponse#AddedItemSubDetail")]
     [BackboneType("ClaimResponse.addItem.detail.subDetail")]
     public partial class AddedItemSubDetailComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2364,7 +2364,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ClaimResponse#Total", IsNestedType=true)]
+    [FhirType("ClaimResponse#Total")]
     [BackboneType("ClaimResponse.total")]
     public partial class TotalComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2518,7 +2518,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ClaimResponse#Payment", IsNestedType=true)]
+    [FhirType("ClaimResponse#Payment")]
     [BackboneType("ClaimResponse.payment")]
     public partial class PaymentComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2791,7 +2791,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ClaimResponse#Note", IsNestedType=true)]
+    [FhirType("ClaimResponse#Note")]
     [BackboneType("ClaimResponse.processNote")]
     public partial class NoteComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -3051,7 +3051,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ClaimResponse#Insurance", IsNestedType=true)]
+    [FhirType("ClaimResponse#Insurance")]
     [BackboneType("ClaimResponse.insurance")]
     public partial class InsuranceComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -3339,7 +3339,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ClaimResponse#Error", IsNestedType=true)]
+    [FhirType("ClaimResponse#Error")]
     [BackboneType("ClaimResponse.error")]
     public partial class ErrorComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/ClinicalImpression.cs b/src/Hl7.Fhir.R4B/Model/Generated/ClinicalImpression.cs
index 834e23cbce..fd6dc1665d 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/ClinicalImpression.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/ClinicalImpression.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("ClinicalImpression","http://hl7.org/fhir/StructureDefinition/ClinicalImpression", IsResource=true)]
+  [FhirType("ClinicalImpression","http://hl7.org/fhir/StructureDefinition/ClinicalImpression")]
   public partial class ClinicalImpression : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -95,7 +95,7 @@ public enum ClinicalImpressionStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ClinicalImpression#Investigation", IsNestedType=true)]
+    [FhirType("ClinicalImpression#Investigation")]
     [BackboneType("ClinicalImpression.investigation")]
     public partial class InvestigationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -251,7 +251,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ClinicalImpression#Finding", IsNestedType=true)]
+    [FhirType("ClinicalImpression#Finding")]
     [BackboneType("ClinicalImpression.finding")]
     public partial class FindingComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/ClinicalUseDefinition.cs b/src/Hl7.Fhir.R4B/Model/Generated/ClinicalUseDefinition.cs
index 6dde3b1d7e..164de5944e 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/ClinicalUseDefinition.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/ClinicalUseDefinition.cs
@@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model
   /// </summary>
   [Serializable]
   [DataContract]
-  [FhirType("ClinicalUseDefinition","http://hl7.org/fhir/StructureDefinition/ClinicalUseDefinition", IsResource=true)]
+  [FhirType("ClinicalUseDefinition","http://hl7.org/fhir/StructureDefinition/ClinicalUseDefinition")]
   public partial class ClinicalUseDefinition : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -101,7 +101,7 @@ public enum ClinicalUseDefinitionType
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("ClinicalUseDefinition#Contraindication", IsNestedType=true)]
+    [FhirType("ClinicalUseDefinition#Contraindication")]
     [BackboneType("ClinicalUseDefinition.contraindication")]
     public partial class ContraindicationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -335,7 +335,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ClinicalUseDefinition#OtherTherapy", IsNestedType=true)]
+    [FhirType("ClinicalUseDefinition#OtherTherapy")]
     [BackboneType("ClinicalUseDefinition.contraindication.otherTherapy")]
     public partial class OtherTherapyComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -487,7 +487,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("ClinicalUseDefinition#Indication", IsNestedType=true)]
+    [FhirType("ClinicalUseDefinition#Indication")]
     [BackboneType("ClinicalUseDefinition.indication")]
     public partial class IndicationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -771,7 +771,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("ClinicalUseDefinition#Interaction", IsNestedType=true)]
+    [FhirType("ClinicalUseDefinition#Interaction")]
     [BackboneType("ClinicalUseDefinition.interaction")]
     public partial class InteractionComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1000,7 +1000,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("ClinicalUseDefinition#Interactant", IsNestedType=true)]
+    [FhirType("ClinicalUseDefinition#Interactant")]
     [BackboneType("ClinicalUseDefinition.interaction.interactant")]
     public partial class InteractantComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1131,7 +1131,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ClinicalUseDefinition#UndesirableEffect", IsNestedType=true)]
+    [FhirType("ClinicalUseDefinition#UndesirableEffect")]
     [BackboneType("ClinicalUseDefinition.undesirableEffect")]
     public partial class UndesirableEffectComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1310,7 +1310,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ClinicalUseDefinition#Warning", IsNestedType=true)]
+    [FhirType("ClinicalUseDefinition#Warning")]
     [BackboneType("ClinicalUseDefinition.warning")]
     public partial class WarningComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Communication.cs b/src/Hl7.Fhir.R4B/Model/Generated/Communication.cs
index 4ac5f46c54..01b81c1d6b 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/Communication.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/Communication.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Communication","http://hl7.org/fhir/StructureDefinition/Communication", IsResource=true)]
+  [FhirType("Communication","http://hl7.org/fhir/StructureDefinition/Communication")]
   public partial class Communication : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -67,7 +67,7 @@ public partial class Communication : Hl7.Fhir.Model.DomainResource, IIdentifiabl
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Communication#Payload", IsNestedType=true)]
+    [FhirType("Communication#Payload")]
     [BackboneType("Communication.payload")]
     public partial class PayloadComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/CommunicationRequest.cs b/src/Hl7.Fhir.R4B/Model/Generated/CommunicationRequest.cs
index c9e9a7a591..c954ae3a16 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/CommunicationRequest.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/CommunicationRequest.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("CommunicationRequest","http://hl7.org/fhir/StructureDefinition/CommunicationRequest", IsResource=true)]
+  [FhirType("CommunicationRequest","http://hl7.org/fhir/StructureDefinition/CommunicationRequest")]
   public partial class CommunicationRequest : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -67,7 +67,7 @@ public partial class CommunicationRequest : Hl7.Fhir.Model.DomainResource, IIden
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CommunicationRequest#Payload", IsNestedType=true)]
+    [FhirType("CommunicationRequest#Payload")]
     [BackboneType("CommunicationRequest.payload")]
     public partial class PayloadComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/CompartmentDefinition.cs b/src/Hl7.Fhir.R4B/Model/Generated/CompartmentDefinition.cs
index d8da7fa037..0a4322605b 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/CompartmentDefinition.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/CompartmentDefinition.cs
@@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("CompartmentDefinition","http://hl7.org/fhir/StructureDefinition/CompartmentDefinition", IsResource=true)]
+  [FhirType("CompartmentDefinition","http://hl7.org/fhir/StructureDefinition/CompartmentDefinition")]
   public partial class CompartmentDefinition : Hl7.Fhir.Model.DomainResource
   {
     /// <summary>
@@ -68,7 +68,7 @@ public partial class CompartmentDefinition : Hl7.Fhir.Model.DomainResource
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CompartmentDefinition#Resource", IsNestedType=true)]
+    [FhirType("CompartmentDefinition#Resource")]
     [BackboneType("CompartmentDefinition.resource")]
     public partial class ResourceComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Composition.cs b/src/Hl7.Fhir.R4B/Model/Generated/Composition.cs
index 23ec521208..5404b9e831 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/Composition.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/Composition.cs
@@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Composition","http://hl7.org/fhir/StructureDefinition/Composition", IsResource=true)]
+  [FhirType("Composition","http://hl7.org/fhir/StructureDefinition/Composition")]
   public partial class Composition : Hl7.Fhir.Model.DomainResource, IIdentifiable<Identifier>
   {
     /// <summary>
@@ -149,7 +149,7 @@ public enum CompositionAttestationMode
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Composition#Attester", IsNestedType=true)]
+    [FhirType("Composition#Attester")]
     [BackboneType("Composition.attester")]
     public partial class AttesterComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -367,7 +367,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Composition#RelatesTo", IsNestedType=true)]
+    [FhirType("Composition#RelatesTo")]
     [BackboneType("Composition.relatesTo")]
     public partial class RelatesToComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -544,7 +544,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Composition#Event", IsNestedType=true)]
+    [FhirType("Composition#Event")]
     [BackboneType("Composition.event")]
     public partial class EventComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -725,7 +725,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Composition#Section", IsNestedType=true)]
+    [FhirType("Composition#Section")]
     [BackboneType("Composition.section")]
     public partial class SectionComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/ConceptMap.cs b/src/Hl7.Fhir.R4B/Model/Generated/ConceptMap.cs
index 6b63a565ed..d799566bb9 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/ConceptMap.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/ConceptMap.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("ConceptMap","http://hl7.org/fhir/StructureDefinition/ConceptMap", IsResource=true)]
+  [FhirType("ConceptMap","http://hl7.org/fhir/StructureDefinition/ConceptMap")]
   public partial class ConceptMap : Hl7.Fhir.Model.DomainResource, IIdentifiable<Identifier>
   {
     /// <summary>
@@ -95,7 +95,7 @@ public enum ConceptMapGroupUnmappedMode
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ConceptMap#Group", IsNestedType=true)]
+    [FhirType("ConceptMap#Group")]
     [BackboneType("ConceptMap.group")]
     public partial class GroupComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -420,7 +420,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ConceptMap#SourceElement", IsNestedType=true)]
+    [FhirType("ConceptMap#SourceElement")]
     [BackboneType("ConceptMap.group.element")]
     public partial class SourceElementComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -634,7 +634,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ConceptMap#TargetElement", IsNestedType=true)]
+    [FhirType("ConceptMap#TargetElement")]
     [BackboneType("ConceptMap.group.element.target")]
     public partial class TargetElementComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -962,7 +962,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ConceptMap#OtherElement", IsNestedType=true)]
+    [FhirType("ConceptMap#OtherElement")]
     [BackboneType("ConceptMap.group.element.target.dependsOn")]
     public partial class OtherElementComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1238,7 +1238,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ConceptMap#Unmapped", IsNestedType=true)]
+    [FhirType("ConceptMap#Unmapped")]
     [BackboneType("ConceptMap.group.unmapped")]
     public partial class UnmappedComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Condition.cs b/src/Hl7.Fhir.R4B/Model/Generated/Condition.cs
index 6bb7806674..936c3093a6 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/Condition.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/Condition.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Condition","http://hl7.org/fhir/StructureDefinition/Condition", IsResource=true)]
+  [FhirType("Condition","http://hl7.org/fhir/StructureDefinition/Condition")]
   public partial class Condition : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -159,7 +159,7 @@ public enum ConditionVerificationStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Condition#Stage", IsNestedType=true)]
+    [FhirType("Condition#Stage")]
     [BackboneType("Condition.stage")]
     public partial class StageComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -341,7 +341,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Condition#Evidence", IsNestedType=true)]
+    [FhirType("Condition#Evidence")]
     [BackboneType("Condition.evidence")]
     public partial class EvidenceComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Consent.cs b/src/Hl7.Fhir.R4B/Model/Generated/Consent.cs
index 7365b6ea45..8d62197859 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/Consent.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/Consent.cs
@@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Consent","http://hl7.org/fhir/StructureDefinition/Consent", IsResource=true)]
+  [FhirType("Consent","http://hl7.org/fhir/StructureDefinition/Consent")]
   public partial class Consent : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -170,7 +170,7 @@ public enum ConsentDataMeaning
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Consent#Policy", IsNestedType=true)]
+    [FhirType("Consent#Policy")]
     [BackboneType("Consent.policy")]
     public partial class PolicyComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -357,7 +357,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Consent#Verification", IsNestedType=true)]
+    [FhirType("Consent#Verification")]
     [BackboneType("Consent.verification")]
     public partial class VerificationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -572,7 +572,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Consent#provision", IsNestedType=true)]
+    [FhirType("Consent#provision")]
     [BackboneType("Consent.provision")]
     public partial class provisionComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -981,7 +981,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Consent#provisionActor", IsNestedType=true)]
+    [FhirType("Consent#provisionActor")]
     [BackboneType("Consent.provision.actor")]
     public partial class provisionActorComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1137,7 +1137,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Consent#provisionData", IsNestedType=true)]
+    [FhirType("Consent#provisionData")]
     [BackboneType("Consent.provision.data")]
     public partial class provisionDataComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Contract.cs b/src/Hl7.Fhir.R4B/Model/Generated/Contract.cs
index 6e2812e5e1..3d0ed720ea 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/Contract.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/Contract.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Contract","http://hl7.org/fhir/StructureDefinition/Contract", IsResource=true)]
+  [FhirType("Contract","http://hl7.org/fhir/StructureDefinition/Contract")]
   public partial class Contract : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -267,7 +267,7 @@ public enum ContractResourcePublicationStatusCodes
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Contract#ContentDefinition", IsNestedType=true)]
+    [FhirType("Contract#ContentDefinition")]
     [BackboneType("Contract.contentDefinition")]
     public partial class ContentDefinitionComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -580,7 +580,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Contract#Term", IsNestedType=true)]
+    [FhirType("Contract#Term")]
     [BackboneType("Contract.term")]
     public partial class TermComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1027,7 +1027,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Contract#SecurityLabel", IsNestedType=true)]
+    [FhirType("Contract#SecurityLabel")]
     [BackboneType("Contract.term.securityLabel")]
     public partial class SecurityLabelComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1253,7 +1253,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Contract#ContractOffer", IsNestedType=true)]
+    [FhirType("Contract#ContractOffer")]
     [BackboneType("Contract.term.offer")]
     public partial class ContractOfferComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1666,7 +1666,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Contract#ContractParty", IsNestedType=true)]
+    [FhirType("Contract#ContractParty")]
     [BackboneType("Contract.term.offer.party")]
     public partial class ContractPartyComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1819,7 +1819,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Contract#Answer", IsNestedType=true)]
+    [FhirType("Contract#Answer")]
     [BackboneType("Contract.term.offer.answer")]
     public partial class AnswerComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1946,7 +1946,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Contract#ContractAsset", IsNestedType=true)]
+    [FhirType("Contract#ContractAsset")]
     [BackboneType("Contract.term.asset")]
     public partial class ContractAssetComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2509,7 +2509,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Contract#AssetContext", IsNestedType=true)]
+    [FhirType("Contract#AssetContext")]
     [BackboneType("Contract.term.asset.context")]
     public partial class AssetContextComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2704,7 +2704,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Contract#ValuedItem", IsNestedType=true)]
+    [FhirType("Contract#ValuedItem")]
     [BackboneType("Contract.term.asset.valuedItem")]
     public partial class ValuedItemComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -3292,7 +3292,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Contract#Action", IsNestedType=true)]
+    [FhirType("Contract#Action")]
     [BackboneType("Contract.term.action")]
     public partial class ActionComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -4091,7 +4091,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Contract#ActionSubject", IsNestedType=true)]
+    [FhirType("Contract#ActionSubject")]
     [BackboneType("Contract.term.action.subject")]
     public partial class ActionSubjectComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -4248,7 +4248,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Contract#Signatory", IsNestedType=true)]
+    [FhirType("Contract#Signatory")]
     [BackboneType("Contract.signer")]
     public partial class SignatoryComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -4430,7 +4430,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Contract#FriendlyLanguage", IsNestedType=true)]
+    [FhirType("Contract#FriendlyLanguage")]
     [BackboneType("Contract.friendly")]
     public partial class FriendlyLanguageComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -4560,7 +4560,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Contract#LegalLanguage", IsNestedType=true)]
+    [FhirType("Contract#LegalLanguage")]
     [BackboneType("Contract.legal")]
     public partial class LegalLanguageComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -4690,7 +4690,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Contract#ComputableLanguage", IsNestedType=true)]
+    [FhirType("Contract#ComputableLanguage")]
     [BackboneType("Contract.rule")]
     public partial class ComputableLanguageComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Coverage.cs b/src/Hl7.Fhir.R4B/Model/Generated/Coverage.cs
index 9e2099f864..963ec70ca3 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/Coverage.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/Coverage.cs
@@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Coverage","http://hl7.org/fhir/StructureDefinition/Coverage", IsResource=true)]
+  [FhirType("Coverage","http://hl7.org/fhir/StructureDefinition/Coverage")]
   public partial class Coverage : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -69,7 +69,7 @@ public partial class Coverage : Hl7.Fhir.Model.DomainResource, IIdentifiable<Lis
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Coverage#Class", IsNestedType=true)]
+    [FhirType("Coverage#Class")]
     [BackboneType("Coverage.class")]
     public partial class ClassComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -285,7 +285,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Coverage#CostToBeneficiary", IsNestedType=true)]
+    [FhirType("Coverage#CostToBeneficiary")]
     [BackboneType("Coverage.costToBeneficiary")]
     public partial class CostToBeneficiaryComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -466,7 +466,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Coverage#Exemption", IsNestedType=true)]
+    [FhirType("Coverage#Exemption")]
     [BackboneType("Coverage.costToBeneficiary.exception")]
     public partial class ExemptionComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/CoverageEligibilityRequest.cs b/src/Hl7.Fhir.R4B/Model/Generated/CoverageEligibilityRequest.cs
index 804b746aae..8e9def6f3d 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/CoverageEligibilityRequest.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/CoverageEligibilityRequest.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("CoverageEligibilityRequest","http://hl7.org/fhir/StructureDefinition/CoverageEligibilityRequest", IsResource=true)]
+  [FhirType("CoverageEligibilityRequest","http://hl7.org/fhir/StructureDefinition/CoverageEligibilityRequest")]
   public partial class CoverageEligibilityRequest : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -102,7 +102,7 @@ public enum EligibilityRequestPurpose
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CoverageEligibilityRequest#SupportingInformation", IsNestedType=true)]
+    [FhirType("CoverageEligibilityRequest#SupportingInformation")]
     [BackboneType("CoverageEligibilityRequest.supportingInfo")]
     public partial class SupportingInformationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -319,7 +319,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CoverageEligibilityRequest#Insurance", IsNestedType=true)]
+    [FhirType("CoverageEligibilityRequest#Insurance")]
     [BackboneType("CoverageEligibilityRequest.insurance")]
     public partial class InsuranceComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -534,7 +534,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CoverageEligibilityRequest#Details", IsNestedType=true)]
+    [FhirType("CoverageEligibilityRequest#Details")]
     [BackboneType("CoverageEligibilityRequest.item")]
     public partial class DetailsComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -916,7 +916,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CoverageEligibilityRequest#Diagnosis", IsNestedType=true)]
+    [FhirType("CoverageEligibilityRequest#Diagnosis")]
     [BackboneType("CoverageEligibilityRequest.item.diagnosis")]
     public partial class DiagnosisComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/CoverageEligibilityResponse.cs b/src/Hl7.Fhir.R4B/Model/Generated/CoverageEligibilityResponse.cs
index 04647a5db3..f41ccce207 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/CoverageEligibilityResponse.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/CoverageEligibilityResponse.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("CoverageEligibilityResponse","http://hl7.org/fhir/StructureDefinition/CoverageEligibilityResponse", IsResource=true)]
+  [FhirType("CoverageEligibilityResponse","http://hl7.org/fhir/StructureDefinition/CoverageEligibilityResponse")]
   public partial class CoverageEligibilityResponse : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -102,7 +102,7 @@ public enum EligibilityResponsePurpose
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CoverageEligibilityResponse#Insurance", IsNestedType=true)]
+    [FhirType("CoverageEligibilityResponse#Insurance")]
     [BackboneType("CoverageEligibilityResponse.insurance")]
     public partial class InsuranceComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -325,7 +325,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CoverageEligibilityResponse#Items", IsNestedType=true)]
+    [FhirType("CoverageEligibilityResponse#Items")]
     [BackboneType("CoverageEligibilityResponse.insurance.item")]
     public partial class ItemsComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -878,7 +878,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CoverageEligibilityResponse#Benefit", IsNestedType=true)]
+    [FhirType("CoverageEligibilityResponse#Benefit")]
     [BackboneType("CoverageEligibilityResponse.insurance.item.benefit")]
     public partial class BenefitComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1060,7 +1060,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CoverageEligibilityResponse#Errors", IsNestedType=true)]
+    [FhirType("CoverageEligibilityResponse#Errors")]
     [BackboneType("CoverageEligibilityResponse.error")]
     public partial class ErrorsComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/DataRequirement.cs b/src/Hl7.Fhir.R4B/Model/Generated/DataRequirement.cs
index 99078bfe4d..7963be359b 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/DataRequirement.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/DataRequirement.cs
@@ -89,7 +89,7 @@ public enum SortDirection
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("DataRequirement#CodeFilter", IsNestedType=true)]
+    [FhirType("DataRequirement#CodeFilter")]
     [BackboneType("DataRequirement.codeFilter")]
     public partial class CodeFilterComponent : Hl7.Fhir.Model.Element
     {
@@ -345,7 +345,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("DataRequirement#DateFilter", IsNestedType=true)]
+    [FhirType("DataRequirement#DateFilter")]
     [BackboneType("DataRequirement.dateFilter")]
     public partial class DateFilterComponent : Hl7.Fhir.Model.Element
     {
@@ -560,7 +560,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("DataRequirement#Sort", IsNestedType=true)]
+    [FhirType("DataRequirement#Sort")]
     [BackboneType("DataRequirement.sort")]
     public partial class SortComponent : Hl7.Fhir.Model.Element
     {
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/DetectedIssue.cs b/src/Hl7.Fhir.R4B/Model/Generated/DetectedIssue.cs
index a17a93d09e..31b07de624 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/DetectedIssue.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/DetectedIssue.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("DetectedIssue","http://hl7.org/fhir/StructureDefinition/DetectedIssue", IsResource=true)]
+  [FhirType("DetectedIssue","http://hl7.org/fhir/StructureDefinition/DetectedIssue")]
   public partial class DetectedIssue : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -95,7 +95,7 @@ public enum DetectedIssueSeverity
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("DetectedIssue#Evidence", IsNestedType=true)]
+    [FhirType("DetectedIssue#Evidence")]
     [BackboneType("DetectedIssue.evidence")]
     public partial class EvidenceComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -251,7 +251,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("DetectedIssue#Mitigation", IsNestedType=true)]
+    [FhirType("DetectedIssue#Mitigation")]
     [BackboneType("DetectedIssue.mitigation")]
     public partial class MitigationComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Device.cs b/src/Hl7.Fhir.R4B/Model/Generated/Device.cs
index b16fa9685e..1183f733b6 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/Device.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/Device.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Device","http://hl7.org/fhir/StructureDefinition/Device", IsResource=true)]
+  [FhirType("Device","http://hl7.org/fhir/StructureDefinition/Device")]
   public partial class Device : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -148,7 +148,7 @@ public enum UDIEntryType
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Device#UdiCarrier", IsNestedType=true)]
+    [FhirType("Device#UdiCarrier")]
     [BackboneType("Device.udiCarrier")]
     public partial class UdiCarrierComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -509,7 +509,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Device#DeviceName", IsNestedType=true)]
+    [FhirType("Device#DeviceName")]
     [BackboneType("Device.deviceName")]
     public partial class DeviceNameComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -697,7 +697,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Device#Specialization", IsNestedType=true)]
+    [FhirType("Device#Specialization")]
     [BackboneType("Device.specialization")]
     public partial class SpecializationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -864,7 +864,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Device#Version", IsNestedType=true)]
+    [FhirType("Device#Version")]
     [BackboneType("Device.version")]
     public partial class VersionComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1056,7 +1056,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Device#Property", IsNestedType=true)]
+    [FhirType("Device#Property")]
     [BackboneType("Device.property")]
     public partial class PropertyComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/DeviceDefinition.cs b/src/Hl7.Fhir.R4B/Model/Generated/DeviceDefinition.cs
index b938124a6e..780efc82c8 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/DeviceDefinition.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/DeviceDefinition.cs
@@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("DeviceDefinition","http://hl7.org/fhir/StructureDefinition/DeviceDefinition", IsResource=true)]
+  [FhirType("DeviceDefinition","http://hl7.org/fhir/StructureDefinition/DeviceDefinition")]
   public partial class DeviceDefinition : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -68,7 +68,7 @@ public partial class DeviceDefinition : Hl7.Fhir.Model.DomainResource, IIdentifi
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("DeviceDefinition#UdiDeviceIdentifier", IsNestedType=true)]
+    [FhirType("DeviceDefinition#UdiDeviceIdentifier")]
     [BackboneType("DeviceDefinition.udiDeviceIdentifier")]
     public partial class UdiDeviceIdentifierComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -298,7 +298,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("DeviceDefinition#DeviceName", IsNestedType=true)]
+    [FhirType("DeviceDefinition#DeviceName")]
     [BackboneType("DeviceDefinition.deviceName")]
     public partial class DeviceNameComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -486,7 +486,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("DeviceDefinition#Specialization", IsNestedType=true)]
+    [FhirType("DeviceDefinition#Specialization")]
     [BackboneType("DeviceDefinition.specialization")]
     public partial class SpecializationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -671,7 +671,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("DeviceDefinition#Capability", IsNestedType=true)]
+    [FhirType("DeviceDefinition#Capability")]
     [BackboneType("DeviceDefinition.capability")]
     public partial class CapabilityComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -821,7 +821,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("DeviceDefinition#Property", IsNestedType=true)]
+    [FhirType("DeviceDefinition#Property")]
     [BackboneType("DeviceDefinition.property")]
     public partial class PropertyComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -997,7 +997,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("DeviceDefinition#Material", IsNestedType=true)]
+    [FhirType("DeviceDefinition#Material")]
     [BackboneType("DeviceDefinition.material")]
     public partial class MaterialComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/DeviceMetric.cs b/src/Hl7.Fhir.R4B/Model/Generated/DeviceMetric.cs
index 45f5ac0565..f7c4b8beee 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/DeviceMetric.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/DeviceMetric.cs
@@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("DeviceMetric","http://hl7.org/fhir/StructureDefinition/DeviceMetric", IsResource=true)]
+  [FhirType("DeviceMetric","http://hl7.org/fhir/StructureDefinition/DeviceMetric")]
   public partial class DeviceMetric : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -259,7 +259,7 @@ public enum DeviceMetricCalibrationState
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("DeviceMetric#Calibration", IsNestedType=true)]
+    [FhirType("DeviceMetric#Calibration")]
     [BackboneType("DeviceMetric.calibration")]
     public partial class CalibrationComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/DeviceRequest.cs b/src/Hl7.Fhir.R4B/Model/Generated/DeviceRequest.cs
index 22a10abf73..6d6fe78f41 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/DeviceRequest.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/DeviceRequest.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("DeviceRequest","http://hl7.org/fhir/StructureDefinition/DeviceRequest", IsResource=true)]
+  [FhirType("DeviceRequest","http://hl7.org/fhir/StructureDefinition/DeviceRequest")]
   public partial class DeviceRequest : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -67,7 +67,7 @@ public partial class DeviceRequest : Hl7.Fhir.Model.DomainResource, IIdentifiabl
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("DeviceRequest#Parameter", IsNestedType=true)]
+    [FhirType("DeviceRequest#Parameter")]
     [BackboneType("DeviceRequest.parameter")]
     public partial class ParameterComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/DeviceUseStatement.cs b/src/Hl7.Fhir.R4B/Model/Generated/DeviceUseStatement.cs
index cc81242106..00b3b84fbd 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/DeviceUseStatement.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/DeviceUseStatement.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("DeviceUseStatement","http://hl7.org/fhir/StructureDefinition/DeviceUseStatement", IsResource=true)]
+  [FhirType("DeviceUseStatement","http://hl7.org/fhir/StructureDefinition/DeviceUseStatement")]
   public partial class DeviceUseStatement : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/DiagnosticReport.cs b/src/Hl7.Fhir.R4B/Model/Generated/DiagnosticReport.cs
index 0a4e749db5..fcdbb05260 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/DiagnosticReport.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/DiagnosticReport.cs
@@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("DiagnosticReport","http://hl7.org/fhir/StructureDefinition/DiagnosticReport", IsResource=true)]
+  [FhirType("DiagnosticReport","http://hl7.org/fhir/StructureDefinition/DiagnosticReport")]
   public partial class DiagnosticReport : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -138,7 +138,7 @@ public enum DiagnosticReportStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("DiagnosticReport#Media", IsNestedType=true)]
+    [FhirType("DiagnosticReport#Media")]
     [BackboneType("DiagnosticReport.media")]
     public partial class MediaComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/DocumentManifest.cs b/src/Hl7.Fhir.R4B/Model/Generated/DocumentManifest.cs
index 0054ec5d93..7b82d81bf5 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/DocumentManifest.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/DocumentManifest.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("DocumentManifest","http://hl7.org/fhir/StructureDefinition/DocumentManifest", IsResource=true)]
+  [FhirType("DocumentManifest","http://hl7.org/fhir/StructureDefinition/DocumentManifest")]
   public partial class DocumentManifest : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -68,7 +68,7 @@ public partial class DocumentManifest : Hl7.Fhir.Model.DomainResource, IIdentifi
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("DocumentManifest#Related", IsNestedType=true)]
+    [FhirType("DocumentManifest#Related")]
     [BackboneType("DocumentManifest.related")]
     public partial class RelatedComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/DocumentReference.cs b/src/Hl7.Fhir.R4B/Model/Generated/DocumentReference.cs
index 51541f2b56..ad165f137f 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/DocumentReference.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/DocumentReference.cs
@@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("DocumentReference","http://hl7.org/fhir/StructureDefinition/DocumentReference", IsResource=true)]
+  [FhirType("DocumentReference","http://hl7.org/fhir/StructureDefinition/DocumentReference")]
   public partial class DocumentReference : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -69,7 +69,7 @@ public partial class DocumentReference : Hl7.Fhir.Model.DomainResource, IIdentif
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("DocumentReference#RelatesTo", IsNestedType=true)]
+    [FhirType("DocumentReference#RelatesTo")]
     [BackboneType("DocumentReference.relatesTo")]
     public partial class RelatesToComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -244,7 +244,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("DocumentReference#Content", IsNestedType=true)]
+    [FhirType("DocumentReference#Content")]
     [BackboneType("DocumentReference.content")]
     public partial class ContentComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -398,7 +398,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("DocumentReference#Context", IsNestedType=true)]
+    [FhirType("DocumentReference#Context")]
     [BackboneType("DocumentReference.context")]
     public partial class ContextComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Dosage.cs b/src/Hl7.Fhir.R4B/Model/Generated/Dosage.cs
index cc52340ab2..13dbac9512 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/Dosage.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/Dosage.cs
@@ -67,7 +67,7 @@ public partial class Dosage : Hl7.Fhir.Model.BackboneType
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Dosage#DoseAndRate", IsNestedType=true)]
+    [FhirType("Dosage#DoseAndRate")]
     [BackboneType("Dosage.doseAndRate")]
     public partial class DoseAndRateComponent : Hl7.Fhir.Model.Element
     {
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Encounter.cs b/src/Hl7.Fhir.R4B/Model/Generated/Encounter.cs
index ae3b085814..ca574239a3 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/Encounter.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/Encounter.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Encounter","http://hl7.org/fhir/StructureDefinition/Encounter", IsResource=true)]
+  [FhirType("Encounter","http://hl7.org/fhir/StructureDefinition/Encounter")]
   public partial class Encounter : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -168,7 +168,7 @@ public enum EncounterLocationStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Encounter#StatusHistory", IsNestedType=true)]
+    [FhirType("Encounter#StatusHistory")]
     [BackboneType("Encounter.statusHistory")]
     public partial class StatusHistoryComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -341,7 +341,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Encounter#ClassHistory", IsNestedType=true)]
+    [FhirType("Encounter#ClassHistory")]
     [BackboneType("Encounter.classHistory")]
     public partial class ClassHistoryComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -495,7 +495,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Encounter#Participant", IsNestedType=true)]
+    [FhirType("Encounter#Participant")]
     [BackboneType("Encounter.participant")]
     public partial class ParticipantComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -672,7 +672,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Encounter#Diagnosis", IsNestedType=true)]
+    [FhirType("Encounter#Diagnosis")]
     [BackboneType("Encounter.diagnosis")]
     public partial class DiagnosisComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -871,7 +871,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Encounter#Hospitalization", IsNestedType=true)]
+    [FhirType("Encounter#Hospitalization")]
     [BackboneType("Encounter.hospitalization")]
     public partial class HospitalizationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1211,7 +1211,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Encounter#Location", IsNestedType=true)]
+    [FhirType("Encounter#Location")]
     [BackboneType("Encounter.location")]
     public partial class LocationComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Endpoint.cs b/src/Hl7.Fhir.R4B/Model/Generated/Endpoint.cs
index 4faf7d0f25..e51d75d459 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/Endpoint.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/Endpoint.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Endpoint","http://hl7.org/fhir/StructureDefinition/Endpoint", IsResource=true)]
+  [FhirType("Endpoint","http://hl7.org/fhir/StructureDefinition/Endpoint")]
   public partial class Endpoint : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/EnrollmentRequest.cs b/src/Hl7.Fhir.R4B/Model/Generated/EnrollmentRequest.cs
index f79c48050f..1d45182c25 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/EnrollmentRequest.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/EnrollmentRequest.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("EnrollmentRequest","http://hl7.org/fhir/StructureDefinition/EnrollmentRequest", IsResource=true)]
+  [FhirType("EnrollmentRequest","http://hl7.org/fhir/StructureDefinition/EnrollmentRequest")]
   public partial class EnrollmentRequest : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/EnrollmentResponse.cs b/src/Hl7.Fhir.R4B/Model/Generated/EnrollmentResponse.cs
index 4e185428f4..e9d39ab3df 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/EnrollmentResponse.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/EnrollmentResponse.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("EnrollmentResponse","http://hl7.org/fhir/StructureDefinition/EnrollmentResponse", IsResource=true)]
+  [FhirType("EnrollmentResponse","http://hl7.org/fhir/StructureDefinition/EnrollmentResponse")]
   public partial class EnrollmentResponse : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/EpisodeOfCare.cs b/src/Hl7.Fhir.R4B/Model/Generated/EpisodeOfCare.cs
index bc800335ba..042b963cdc 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/EpisodeOfCare.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/EpisodeOfCare.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("EpisodeOfCare","http://hl7.org/fhir/StructureDefinition/EpisodeOfCare", IsResource=true)]
+  [FhirType("EpisodeOfCare","http://hl7.org/fhir/StructureDefinition/EpisodeOfCare")]
   public partial class EpisodeOfCare : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -119,7 +119,7 @@ public enum EpisodeOfCareStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("EpisodeOfCare#StatusHistory", IsNestedType=true)]
+    [FhirType("EpisodeOfCare#StatusHistory")]
     [BackboneType("EpisodeOfCare.statusHistory")]
     public partial class StatusHistoryComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -289,7 +289,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("EpisodeOfCare#Diagnosis", IsNestedType=true)]
+    [FhirType("EpisodeOfCare#Diagnosis")]
     [BackboneType("EpisodeOfCare.diagnosis")]
     public partial class DiagnosisComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/EventDefinition.cs b/src/Hl7.Fhir.R4B/Model/Generated/EventDefinition.cs
index 900ca2be63..283281dc65 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/EventDefinition.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/EventDefinition.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("EventDefinition","http://hl7.org/fhir/StructureDefinition/EventDefinition", IsResource=true)]
+  [FhirType("EventDefinition","http://hl7.org/fhir/StructureDefinition/EventDefinition")]
   public partial class EventDefinition : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Evidence.cs b/src/Hl7.Fhir.R4B/Model/Generated/Evidence.cs
index 1620b7803c..854c959798 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/Evidence.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/Evidence.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Evidence","http://hl7.org/fhir/StructureDefinition/Evidence", IsResource=true)]
+  [FhirType("Evidence","http://hl7.org/fhir/StructureDefinition/Evidence")]
   public partial class Evidence : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -64,7 +64,7 @@ public partial class Evidence : Hl7.Fhir.Model.DomainResource, IIdentifiable<Lis
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Evidence#VariableDefinition", IsNestedType=true)]
+    [FhirType("Evidence#VariableDefinition")]
     [BackboneType("Evidence.variableDefinition")]
     public partial class VariableDefinitionComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -338,7 +338,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Evidence#Statistic", IsNestedType=true)]
+    [FhirType("Evidence#Statistic")]
     [BackboneType("Evidence.statistic")]
     public partial class StatisticComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -744,7 +744,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Evidence#SampleSize", IsNestedType=true)]
+    [FhirType("Evidence#SampleSize")]
     [BackboneType("Evidence.statistic.sampleSize")]
     public partial class SampleSizeComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1043,7 +1043,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Evidence#AttributeEstimate", IsNestedType=true)]
+    [FhirType("Evidence#AttributeEstimate")]
     [BackboneType("Evidence.statistic.attributeEstimate")]
     public partial class AttributeEstimateComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1358,7 +1358,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Evidence#ModelCharacteristic", IsNestedType=true)]
+    [FhirType("Evidence#ModelCharacteristic")]
     [BackboneType("Evidence.statistic.modelCharacteristic")]
     public partial class ModelCharacteristicComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1560,7 +1560,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Evidence#Variable", IsNestedType=true)]
+    [FhirType("Evidence#Variable")]
     [BackboneType("Evidence.statistic.modelCharacteristic.variable")]
     public partial class VariableComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1812,7 +1812,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Evidence#Certainty", IsNestedType=true)]
+    [FhirType("Evidence#Certainty")]
     [BackboneType("Evidence.certainty")]
     public partial class CertaintyComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/EvidenceReport.cs b/src/Hl7.Fhir.R4B/Model/Generated/EvidenceReport.cs
index e003511c2d..d9dc63e508 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/EvidenceReport.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/EvidenceReport.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("EvidenceReport","http://hl7.org/fhir/StructureDefinition/EvidenceReport", IsResource=true)]
+  [FhirType("EvidenceReport","http://hl7.org/fhir/StructureDefinition/EvidenceReport")]
   public partial class EvidenceReport : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -126,7 +126,7 @@ public enum ReportRelationshipType
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("EvidenceReport#Subject", IsNestedType=true)]
+    [FhirType("EvidenceReport#Subject")]
     [BackboneType("EvidenceReport.subject")]
     public partial class SubjectComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -276,7 +276,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("EvidenceReport#Characteristic", IsNestedType=true)]
+    [FhirType("EvidenceReport#Characteristic")]
     [BackboneType("EvidenceReport.subject.characteristic")]
     public partial class CharacteristicComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -502,7 +502,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("EvidenceReport#RelatesTo", IsNestedType=true)]
+    [FhirType("EvidenceReport#RelatesTo")]
     [BackboneType("EvidenceReport.relatesTo")]
     public partial class RelatesToComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -678,7 +678,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("EvidenceReport#Section", IsNestedType=true)]
+    [FhirType("EvidenceReport#Section")]
     [BackboneType("EvidenceReport.section")]
     public partial class SectionComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/EvidenceVariable.cs b/src/Hl7.Fhir.R4B/Model/Generated/EvidenceVariable.cs
index 0c44327aaf..4160382221 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/EvidenceVariable.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/EvidenceVariable.cs
@@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("EvidenceVariable","http://hl7.org/fhir/StructureDefinition/EvidenceVariable", IsResource=true)]
+  [FhirType("EvidenceVariable","http://hl7.org/fhir/StructureDefinition/EvidenceVariable")]
   public partial class EvidenceVariable : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -91,7 +91,7 @@ public enum CharacteristicCombinationCode
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("EvidenceVariable#Characteristic", IsNestedType=true)]
+    [FhirType("EvidenceVariable#Characteristic")]
     [BackboneType("EvidenceVariable.characteristic")]
     public partial class CharacteristicComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -430,7 +430,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("EvidenceVariable#TimeFromStart", IsNestedType=true)]
+    [FhirType("EvidenceVariable#TimeFromStart")]
     [BackboneType("EvidenceVariable.characteristic.timeFromStart")]
     public partial class TimeFromStartComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -650,7 +650,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("EvidenceVariable#Category", IsNestedType=true)]
+    [FhirType("EvidenceVariable#Category")]
     [BackboneType("EvidenceVariable.category")]
     public partial class CategoryComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/ExampleScenario.cs b/src/Hl7.Fhir.R4B/Model/Generated/ExampleScenario.cs
index c598e03f21..1ee9fa6348 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/ExampleScenario.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/ExampleScenario.cs
@@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model
   /// </summary>
   [Serializable]
   [DataContract]
-  [FhirType("ExampleScenario","http://hl7.org/fhir/StructureDefinition/ExampleScenario", IsResource=true)]
+  [FhirType("ExampleScenario","http://hl7.org/fhir/StructureDefinition/ExampleScenario")]
   public partial class ExampleScenario : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -83,7 +83,7 @@ public enum ExampleScenarioActorType
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("ExampleScenario#Actor", IsNestedType=true)]
+    [FhirType("ExampleScenario#Actor")]
     [BackboneType("ExampleScenario.actor")]
     public partial class ActorComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -357,7 +357,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("ExampleScenario#Instance", IsNestedType=true)]
+    [FhirType("ExampleScenario#Instance")]
     [BackboneType("ExampleScenario.instance")]
     public partial class InstanceComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -683,7 +683,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("ExampleScenario#Version", IsNestedType=true)]
+    [FhirType("ExampleScenario#Version")]
     [BackboneType("ExampleScenario.instance.version")]
     public partial class VersionComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -872,7 +872,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExampleScenario#ContainedInstance", IsNestedType=true)]
+    [FhirType("ExampleScenario#ContainedInstance")]
     [BackboneType("ExampleScenario.instance.containedInstance")]
     public partial class ContainedInstanceComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1057,7 +1057,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("ExampleScenario#Process", IsNestedType=true)]
+    [FhirType("ExampleScenario#Process")]
     [BackboneType("ExampleScenario.process")]
     public partial class ProcessComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1354,7 +1354,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("ExampleScenario#Step", IsNestedType=true)]
+    [FhirType("ExampleScenario#Step")]
     [BackboneType("ExampleScenario.process.step")]
     public partial class StepComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1572,7 +1572,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("ExampleScenario#Operation", IsNestedType=true)]
+    [FhirType("ExampleScenario#Operation")]
     [BackboneType("ExampleScenario.process.step.operation")]
     public partial class OperationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2068,7 +2068,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExampleScenario#Alternative", IsNestedType=true)]
+    [FhirType("ExampleScenario#Alternative")]
     [BackboneType("ExampleScenario.process.step.alternative")]
     public partial class AlternativeComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/ExplanationOfBenefit.cs b/src/Hl7.Fhir.R4B/Model/Generated/ExplanationOfBenefit.cs
index afc33908d4..7acd921cf3 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/ExplanationOfBenefit.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/ExplanationOfBenefit.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("ExplanationOfBenefit","http://hl7.org/fhir/StructureDefinition/ExplanationOfBenefit", IsResource=true)]
+  [FhirType("ExplanationOfBenefit","http://hl7.org/fhir/StructureDefinition/ExplanationOfBenefit")]
   public partial class ExplanationOfBenefit : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -102,7 +102,7 @@ public enum ExplanationOfBenefitStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#RelatedClaim", IsNestedType=true)]
+    [FhirType("ExplanationOfBenefit#RelatedClaim")]
     [BackboneType("ExplanationOfBenefit.related")]
     public partial class RelatedClaimComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -282,7 +282,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#Payee", IsNestedType=true)]
+    [FhirType("ExplanationOfBenefit#Payee")]
     [BackboneType("ExplanationOfBenefit.payee")]
     public partial class PayeeComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -436,7 +436,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#CareTeam", IsNestedType=true)]
+    [FhirType("ExplanationOfBenefit#CareTeam")]
     [BackboneType("ExplanationOfBenefit.careTeam")]
     public partial class CareTeamComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -705,7 +705,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#SupportingInformation", IsNestedType=true)]
+    [FhirType("ExplanationOfBenefit#SupportingInformation")]
     [BackboneType("ExplanationOfBenefit.supportingInfo")]
     public partial class SupportingInformationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -984,7 +984,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#Diagnosis", IsNestedType=true)]
+    [FhirType("ExplanationOfBenefit#Diagnosis")]
     [BackboneType("ExplanationOfBenefit.diagnosis")]
     public partial class DiagnosisComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1238,7 +1238,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#Procedure", IsNestedType=true)]
+    [FhirType("ExplanationOfBenefit#Procedure")]
     [BackboneType("ExplanationOfBenefit.procedure")]
     public partial class ProcedureComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1512,7 +1512,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#Insurance", IsNestedType=true)]
+    [FhirType("ExplanationOfBenefit#Insurance")]
     [BackboneType("ExplanationOfBenefit.insurance")]
     public partial class InsuranceComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1729,7 +1729,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#Accident", IsNestedType=true)]
+    [FhirType("ExplanationOfBenefit#Accident")]
     [BackboneType("ExplanationOfBenefit.accident")]
     public partial class AccidentComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1927,7 +1927,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#Item", IsNestedType=true)]
+    [FhirType("ExplanationOfBenefit#Item")]
     [BackboneType("ExplanationOfBenefit.item")]
     public partial class ItemComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2760,7 +2760,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#Adjudication", IsNestedType=true)]
+    [FhirType("ExplanationOfBenefit#Adjudication")]
     [BackboneType("ExplanationOfBenefit.item.adjudication")]
     public partial class AdjudicationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2982,7 +2982,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#Detail", IsNestedType=true)]
+    [FhirType("ExplanationOfBenefit#Detail")]
     [BackboneType("ExplanationOfBenefit.item.detail")]
     public partial class DetailComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -3502,7 +3502,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#SubDetail", IsNestedType=true)]
+    [FhirType("ExplanationOfBenefit#SubDetail")]
     [BackboneType("ExplanationOfBenefit.item.detail.subDetail")]
     public partial class SubDetailComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -3996,7 +3996,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#AddedItem", IsNestedType=true)]
+    [FhirType("ExplanationOfBenefit#AddedItem")]
     [BackboneType("ExplanationOfBenefit.addItem")]
     public partial class AddedItemComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -4661,7 +4661,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#AddedItemDetail", IsNestedType=true)]
+    [FhirType("ExplanationOfBenefit#AddedItemDetail")]
     [BackboneType("ExplanationOfBenefit.addItem.detail")]
     public partial class AddedItemDetailComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -5030,7 +5030,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#AddedItemDetailSubDetail", IsNestedType=true)]
+    [FhirType("ExplanationOfBenefit#AddedItemDetailSubDetail")]
     [BackboneType("ExplanationOfBenefit.addItem.detail.subDetail")]
     public partial class AddedItemDetailSubDetailComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -5374,7 +5374,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#Total", IsNestedType=true)]
+    [FhirType("ExplanationOfBenefit#Total")]
     [BackboneType("ExplanationOfBenefit.total")]
     public partial class TotalComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -5528,7 +5528,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#Payment", IsNestedType=true)]
+    [FhirType("ExplanationOfBenefit#Payment")]
     [BackboneType("ExplanationOfBenefit.payment")]
     public partial class PaymentComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -5799,7 +5799,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#Note", IsNestedType=true)]
+    [FhirType("ExplanationOfBenefit#Note")]
     [BackboneType("ExplanationOfBenefit.processNote")]
     public partial class NoteComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -6054,7 +6054,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#BenefitBalance", IsNestedType=true)]
+    [FhirType("ExplanationOfBenefit#BenefitBalance")]
     [BackboneType("ExplanationOfBenefit.benefitBalance")]
     public partial class BenefitBalanceComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -6415,7 +6415,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#Benefit", IsNestedType=true)]
+    [FhirType("ExplanationOfBenefit#Benefit")]
     [BackboneType("ExplanationOfBenefit.benefitBalance.financial")]
     public partial class BenefitComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/FamilyMemberHistory.cs b/src/Hl7.Fhir.R4B/Model/Generated/FamilyMemberHistory.cs
index 571fd66183..313d18cad0 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/FamilyMemberHistory.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/FamilyMemberHistory.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("FamilyMemberHistory","http://hl7.org/fhir/StructureDefinition/FamilyMemberHistory", IsResource=true)]
+  [FhirType("FamilyMemberHistory","http://hl7.org/fhir/StructureDefinition/FamilyMemberHistory")]
   public partial class FamilyMemberHistory : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -101,7 +101,7 @@ public enum FamilyHistoryStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("FamilyMemberHistory#Condition", IsNestedType=true)]
+    [FhirType("FamilyMemberHistory#Condition")]
     [BackboneType("FamilyMemberHistory.condition")]
     public partial class ConditionComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Flag.cs b/src/Hl7.Fhir.R4B/Model/Generated/Flag.cs
index dbd7c9e42a..84bb347b2f 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/Flag.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/Flag.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Flag","http://hl7.org/fhir/StructureDefinition/Flag", IsResource=true)]
+  [FhirType("Flag","http://hl7.org/fhir/StructureDefinition/Flag")]
   public partial class Flag : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Goal.cs b/src/Hl7.Fhir.R4B/Model/Generated/Goal.cs
index 0163423be0..8b87dc2455 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/Goal.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/Goal.cs
@@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Goal","http://hl7.org/fhir/StructureDefinition/Goal", IsResource=true)]
+  [FhirType("Goal","http://hl7.org/fhir/StructureDefinition/Goal")]
   public partial class Goal : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -133,7 +133,7 @@ public enum GoalLifecycleStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Goal#Target", IsNestedType=true)]
+    [FhirType("Goal#Target")]
     [BackboneType("Goal.target")]
     public partial class TargetComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/GraphDefinition.cs b/src/Hl7.Fhir.R4B/Model/Generated/GraphDefinition.cs
index fac6f406b0..e4d30a28d9 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/GraphDefinition.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/GraphDefinition.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("GraphDefinition","http://hl7.org/fhir/StructureDefinition/GraphDefinition", IsResource=true)]
+  [FhirType("GraphDefinition","http://hl7.org/fhir/StructureDefinition/GraphDefinition")]
   public partial class GraphDefinition : Hl7.Fhir.Model.DomainResource
   {
     /// <summary>
@@ -120,7 +120,7 @@ public enum GraphCompartmentRule
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("GraphDefinition#Link", IsNestedType=true)]
+    [FhirType("GraphDefinition#Link")]
     [BackboneType("GraphDefinition.link")]
     public partial class LinkComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -459,7 +459,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("GraphDefinition#Target", IsNestedType=true)]
+    [FhirType("GraphDefinition#Target")]
     [BackboneType("GraphDefinition.link.target")]
     public partial class TargetComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -741,7 +741,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("GraphDefinition#Compartment", IsNestedType=true)]
+    [FhirType("GraphDefinition#Compartment")]
     [BackboneType("GraphDefinition.link.target.compartment")]
     public partial class CompartmentComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Group.cs b/src/Hl7.Fhir.R4B/Model/Generated/Group.cs
index 4600f4b1f1..4ff1598869 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/Group.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/Group.cs
@@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Group","http://hl7.org/fhir/StructureDefinition/Group", IsResource=true)]
+  [FhirType("Group","http://hl7.org/fhir/StructureDefinition/Group")]
   public partial class Group : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -115,7 +115,7 @@ public enum GroupType
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Group#Characteristic", IsNestedType=true)]
+    [FhirType("Group#Characteristic")]
     [BackboneType("Group.characteristic")]
     public partial class CharacteristicComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -341,7 +341,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Group#Member", IsNestedType=true)]
+    [FhirType("Group#Member")]
     [BackboneType("Group.member")]
     public partial class MemberComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/GuidanceResponse.cs b/src/Hl7.Fhir.R4B/Model/Generated/GuidanceResponse.cs
index fdb47cd016..f79ea07761 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/GuidanceResponse.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/GuidanceResponse.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("GuidanceResponse","http://hl7.org/fhir/StructureDefinition/GuidanceResponse", IsResource=true)]
+  [FhirType("GuidanceResponse","http://hl7.org/fhir/StructureDefinition/GuidanceResponse")]
   public partial class GuidanceResponse : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/HealthcareService.cs b/src/Hl7.Fhir.R4B/Model/Generated/HealthcareService.cs
index c49dcc35ca..7a1a23c30d 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/HealthcareService.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/HealthcareService.cs
@@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model
   /// </summary>
   [Serializable]
   [DataContract]
-  [FhirType("HealthcareService","http://hl7.org/fhir/StructureDefinition/HealthcareService", IsResource=true)]
+  [FhirType("HealthcareService","http://hl7.org/fhir/StructureDefinition/HealthcareService")]
   public partial class HealthcareService : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -64,7 +64,7 @@ public partial class HealthcareService : Hl7.Fhir.Model.DomainResource, IIdentif
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("HealthcareService#Eligibility", IsNestedType=true)]
+    [FhirType("HealthcareService#Eligibility")]
     [BackboneType("HealthcareService.eligibility")]
     public partial class EligibilityComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -235,7 +235,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("HealthcareService#AvailableTime", IsNestedType=true)]
+    [FhirType("HealthcareService#AvailableTime")]
     [BackboneType("HealthcareService.availableTime")]
     public partial class AvailableTimeComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -511,7 +511,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("HealthcareService#NotAvailable", IsNestedType=true)]
+    [FhirType("HealthcareService#NotAvailable")]
     [BackboneType("HealthcareService.notAvailable")]
     public partial class NotAvailableComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/ImagingStudy.cs b/src/Hl7.Fhir.R4B/Model/Generated/ImagingStudy.cs
index cca6524870..3049d5b9cc 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/ImagingStudy.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/ImagingStudy.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("ImagingStudy","http://hl7.org/fhir/StructureDefinition/ImagingStudy", IsResource=true)]
+  [FhirType("ImagingStudy","http://hl7.org/fhir/StructureDefinition/ImagingStudy")]
   public partial class ImagingStudy : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -107,7 +107,7 @@ public enum ImagingStudyStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ImagingStudy#Series", IsNestedType=true)]
+    [FhirType("ImagingStudy#Series")]
     [BackboneType("ImagingStudy.series")]
     public partial class SeriesComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -612,7 +612,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ImagingStudy#Performer", IsNestedType=true)]
+    [FhirType("ImagingStudy#Performer")]
     [BackboneType("ImagingStudy.series.performer")]
     public partial class PerformerComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -767,7 +767,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ImagingStudy#Instance", IsNestedType=true)]
+    [FhirType("ImagingStudy#Instance")]
     [BackboneType("ImagingStudy.series.instance")]
     public partial class InstanceComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Immunization.cs b/src/Hl7.Fhir.R4B/Model/Generated/Immunization.cs
index 08fca3e75c..003c5a12a5 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/Immunization.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/Immunization.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Immunization","http://hl7.org/fhir/StructureDefinition/Immunization", IsResource=true)]
+  [FhirType("Immunization","http://hl7.org/fhir/StructureDefinition/Immunization")]
   public partial class Immunization : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -95,7 +95,7 @@ public enum ImmunizationStatusCodes
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Immunization#Performer", IsNestedType=true)]
+    [FhirType("Immunization#Performer")]
     [BackboneType("Immunization.performer")]
     public partial class PerformerComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -250,7 +250,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Immunization#Education", IsNestedType=true)]
+    [FhirType("Immunization#Education")]
     [BackboneType("Immunization.education")]
     public partial class EducationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -524,7 +524,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Immunization#Reaction", IsNestedType=true)]
+    [FhirType("Immunization#Reaction")]
     [BackboneType("Immunization.reaction")]
     public partial class ReactionComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -738,7 +738,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Immunization#ProtocolApplied", IsNestedType=true)]
+    [FhirType("Immunization#ProtocolApplied")]
     [BackboneType("Immunization.protocolApplied")]
     public partial class ProtocolAppliedComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/ImmunizationEvaluation.cs b/src/Hl7.Fhir.R4B/Model/Generated/ImmunizationEvaluation.cs
index 064428acb9..0809b03c87 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/ImmunizationEvaluation.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/ImmunizationEvaluation.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("ImmunizationEvaluation","http://hl7.org/fhir/StructureDefinition/ImmunizationEvaluation", IsResource=true)]
+  [FhirType("ImmunizationEvaluation","http://hl7.org/fhir/StructureDefinition/ImmunizationEvaluation")]
   public partial class ImmunizationEvaluation : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/ImmunizationRecommendation.cs b/src/Hl7.Fhir.R4B/Model/Generated/ImmunizationRecommendation.cs
index 3392b979b7..d0bf439add 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/ImmunizationRecommendation.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/ImmunizationRecommendation.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("ImmunizationRecommendation","http://hl7.org/fhir/StructureDefinition/ImmunizationRecommendation", IsResource=true)]
+  [FhirType("ImmunizationRecommendation","http://hl7.org/fhir/StructureDefinition/ImmunizationRecommendation")]
   public partial class ImmunizationRecommendation : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -64,7 +64,7 @@ public partial class ImmunizationRecommendation : Hl7.Fhir.Model.DomainResource,
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("ImmunizationRecommendation#Recommendation", IsNestedType=true)]
+    [FhirType("ImmunizationRecommendation#Recommendation")]
     [BackboneType("ImmunizationRecommendation.recommendation")]
     public partial class RecommendationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -521,7 +521,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ImmunizationRecommendation#DateCriterion", IsNestedType=true)]
+    [FhirType("ImmunizationRecommendation#DateCriterion")]
     [BackboneType("ImmunizationRecommendation.recommendation.dateCriterion")]
     public partial class DateCriterionComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/ImplementationGuide.cs b/src/Hl7.Fhir.R4B/Model/Generated/ImplementationGuide.cs
index 8cb307c6aa..c6c81bfb29 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/ImplementationGuide.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/ImplementationGuide.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("ImplementationGuide","http://hl7.org/fhir/StructureDefinition/ImplementationGuide", IsResource=true)]
+  [FhirType("ImplementationGuide","http://hl7.org/fhir/StructureDefinition/ImplementationGuide")]
   public partial class ImplementationGuide : Hl7.Fhir.Model.DomainResource
   {
     /// <summary>
@@ -2257,7 +2257,7 @@ public enum GuideParameterCode
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ImplementationGuide#DependsOn", IsNestedType=true)]
+    [FhirType("ImplementationGuide#DependsOn")]
     [BackboneType("ImplementationGuide.dependsOn")]
     public partial class DependsOnComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2489,7 +2489,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ImplementationGuide#Global", IsNestedType=true)]
+    [FhirType("ImplementationGuide#Global")]
     [BackboneType("ImplementationGuide.global")]
     public partial class GlobalComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2681,7 +2681,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ImplementationGuide#Definition", IsNestedType=true)]
+    [FhirType("ImplementationGuide#Definition")]
     [BackboneType("ImplementationGuide.definition")]
     public partial class DefinitionComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2912,7 +2912,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ImplementationGuide#Grouping", IsNestedType=true)]
+    [FhirType("ImplementationGuide#Grouping")]
     [BackboneType("ImplementationGuide.definition.grouping")]
     public partial class GroupingComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -3100,7 +3100,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ImplementationGuide#Resource", IsNestedType=true)]
+    [FhirType("ImplementationGuide#Resource")]
     [BackboneType("ImplementationGuide.definition.resource")]
     public partial class ResourceComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -3432,7 +3432,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ImplementationGuide#Page", IsNestedType=true)]
+    [FhirType("ImplementationGuide#Page")]
     [BackboneType("ImplementationGuide.definition.page")]
     public partial class PageComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -3675,7 +3675,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("ImplementationGuide#Parameter", IsNestedType=true)]
+    [FhirType("ImplementationGuide#Parameter")]
     [BackboneType("ImplementationGuide.definition.parameter")]
     public partial class ParameterComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -3863,7 +3863,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("ImplementationGuide#Template", IsNestedType=true)]
+    [FhirType("ImplementationGuide#Template")]
     [BackboneType("ImplementationGuide.definition.template")]
     public partial class TemplateComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -4095,7 +4095,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ImplementationGuide#Manifest", IsNestedType=true)]
+    [FhirType("ImplementationGuide#Manifest")]
     [BackboneType("ImplementationGuide.manifest")]
     public partial class ManifestComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -4379,7 +4379,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ImplementationGuide#ManifestResource", IsNestedType=true)]
+    [FhirType("ImplementationGuide#ManifestResource")]
     [BackboneType("ImplementationGuide.manifest.resource")]
     public partial class ManifestResourceComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -4578,7 +4578,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ImplementationGuide#ManifestPage", IsNestedType=true)]
+    [FhirType("ImplementationGuide#ManifestPage")]
     [BackboneType("ImplementationGuide.manifest.page")]
     public partial class ManifestPageComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Ingredient.cs b/src/Hl7.Fhir.R4B/Model/Generated/Ingredient.cs
index d17cd21f3c..7af811e034 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/Ingredient.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/Ingredient.cs
@@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model
   /// </summary>
   [Serializable]
   [DataContract]
-  [FhirType("Ingredient","http://hl7.org/fhir/StructureDefinition/Ingredient", IsResource=true)]
+  [FhirType("Ingredient","http://hl7.org/fhir/StructureDefinition/Ingredient")]
   public partial class Ingredient : Hl7.Fhir.Model.DomainResource, IIdentifiable<Identifier>
   {
     /// <summary>
@@ -92,7 +92,7 @@ public enum IngredientManufacturerRole
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Ingredient#Manufacturer", IsNestedType=true)]
+    [FhirType("Ingredient#Manufacturer")]
     [BackboneType("Ingredient.manufacturer")]
     public partial class ManufacturerComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -263,7 +263,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Ingredient#Substance", IsNestedType=true)]
+    [FhirType("Ingredient#Substance")]
     [BackboneType("Ingredient.substance")]
     public partial class SubstanceComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -417,7 +417,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Ingredient#Strength", IsNestedType=true)]
+    [FhirType("Ingredient#Strength")]
     [BackboneType("Ingredient.substance.strength")]
     public partial class StrengthComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -754,7 +754,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Ingredient#ReferenceStrength", IsNestedType=true)]
+    [FhirType("Ingredient#ReferenceStrength")]
     [BackboneType("Ingredient.substance.strength.referenceStrength")]
     public partial class ReferenceStrengthComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/InsurancePlan.cs b/src/Hl7.Fhir.R4B/Model/Generated/InsurancePlan.cs
index d0507e9de4..fd065cac40 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/InsurancePlan.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/InsurancePlan.cs
@@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model
   /// </summary>
   [Serializable]
   [DataContract]
-  [FhirType("InsurancePlan","http://hl7.org/fhir/StructureDefinition/InsurancePlan", IsResource=true)]
+  [FhirType("InsurancePlan","http://hl7.org/fhir/StructureDefinition/InsurancePlan")]
   public partial class InsurancePlan : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -93,7 +93,7 @@ public enum BenefitCostApplicability
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("InsurancePlan#Contact", IsNestedType=true)]
+    [FhirType("InsurancePlan#Contact")]
     [BackboneType("InsurancePlan.contact")]
     public partial class ContactComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -296,7 +296,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("InsurancePlan#Coverage", IsNestedType=true)]
+    [FhirType("InsurancePlan#Coverage")]
     [BackboneType("InsurancePlan.coverage")]
     public partial class CoverageComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -477,7 +477,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("InsurancePlan#CoverageBenefit", IsNestedType=true)]
+    [FhirType("InsurancePlan#CoverageBenefit")]
     [BackboneType("InsurancePlan.coverage.benefit")]
     public partial class CoverageBenefitComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -673,7 +673,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("InsurancePlan#Limit", IsNestedType=true)]
+    [FhirType("InsurancePlan#Limit")]
     [BackboneType("InsurancePlan.coverage.benefit.limit")]
     public partial class LimitComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -824,7 +824,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("InsurancePlan#Plan", IsNestedType=true)]
+    [FhirType("InsurancePlan#Plan")]
     [BackboneType("InsurancePlan.plan")]
     public partial class PlanComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1084,7 +1084,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("InsurancePlan#GeneralCost", IsNestedType=true)]
+    [FhirType("InsurancePlan#GeneralCost")]
     [BackboneType("InsurancePlan.plan.generalCost")]
     public partial class GeneralCostComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1321,7 +1321,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("InsurancePlan#SpecificCost", IsNestedType=true)]
+    [FhirType("InsurancePlan#SpecificCost")]
     [BackboneType("InsurancePlan.plan.specificCost")]
     public partial class SpecificCostComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1474,7 +1474,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("InsurancePlan#PlanBenefit", IsNestedType=true)]
+    [FhirType("InsurancePlan#PlanBenefit")]
     [BackboneType("InsurancePlan.plan.specificCost.benefit")]
     public partial class PlanBenefitComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1627,7 +1627,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("InsurancePlan#Cost", IsNestedType=true)]
+    [FhirType("InsurancePlan#Cost")]
     [BackboneType("InsurancePlan.plan.specificCost.benefit.cost")]
     public partial class CostComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Invoice.cs b/src/Hl7.Fhir.R4B/Model/Generated/Invoice.cs
index 7c41ae7b39..6d47e8b1eb 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/Invoice.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/Invoice.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Invoice","http://hl7.org/fhir/StructureDefinition/Invoice", IsResource=true)]
+  [FhirType("Invoice","http://hl7.org/fhir/StructureDefinition/Invoice")]
   public partial class Invoice : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -107,7 +107,7 @@ public enum InvoiceStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Invoice#Participant", IsNestedType=true)]
+    [FhirType("Invoice#Participant")]
     [BackboneType("Invoice.participant")]
     public partial class ParticipantComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -261,7 +261,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Invoice#LineItem", IsNestedType=true)]
+    [FhirType("Invoice#LineItem")]
     [BackboneType("Invoice.lineItem")]
     public partial class LineItemComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -460,7 +460,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Invoice#PriceComponent", IsNestedType=true)]
+    [FhirType("Invoice#PriceComponent")]
     [BackboneType("Invoice.lineItem.priceComponent")]
     public partial class PriceComponentComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Library.cs b/src/Hl7.Fhir.R4B/Model/Generated/Library.cs
index 39e6da393a..c25a491377 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/Library.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/Library.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Library","http://hl7.org/fhir/StructureDefinition/Library", IsResource=true)]
+  [FhirType("Library","http://hl7.org/fhir/StructureDefinition/Library")]
   public partial class Library : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Linkage.cs b/src/Hl7.Fhir.R4B/Model/Generated/Linkage.cs
index 6a73c70cad..ba898a5551 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/Linkage.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/Linkage.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Linkage","http://hl7.org/fhir/StructureDefinition/Linkage", IsResource=true)]
+  [FhirType("Linkage","http://hl7.org/fhir/StructureDefinition/Linkage")]
   public partial class Linkage : Hl7.Fhir.Model.DomainResource
   {
     /// <summary>
@@ -95,7 +95,7 @@ public enum LinkageType
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Linkage#Item", IsNestedType=true)]
+    [FhirType("Linkage#Item")]
     [BackboneType("Linkage.item")]
     public partial class ItemComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/List.cs b/src/Hl7.Fhir.R4B/Model/Generated/List.cs
index 1dfedfe997..6a9ccd5e70 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/List.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/List.cs
@@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model
   /// </summary>
   [Serializable]
   [DataContract]
-  [FhirType("List","http://hl7.org/fhir/StructureDefinition/List", IsResource=true)]
+  [FhirType("List","http://hl7.org/fhir/StructureDefinition/List")]
   public partial class List : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -93,7 +93,7 @@ public enum ListStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("List#Entry", IsNestedType=true)]
+    [FhirType("List#Entry")]
     [BackboneType("List.entry")]
     public partial class EntryComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Location.cs b/src/Hl7.Fhir.R4B/Model/Generated/Location.cs
index 8dd95ab273..1c76ad1cb8 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/Location.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/Location.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Location","http://hl7.org/fhir/StructureDefinition/Location", IsResource=true)]
+  [FhirType("Location","http://hl7.org/fhir/StructureDefinition/Location")]
   public partial class Location : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -117,7 +117,7 @@ public enum LocationMode
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Location#Position", IsNestedType=true)]
+    [FhirType("Location#Position")]
     [BackboneType("Location.position")]
     public partial class PositionComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -350,7 +350,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Location#HoursOfOperation", IsNestedType=true)]
+    [FhirType("Location#HoursOfOperation")]
     [BackboneType("Location.hoursOfOperation")]
     public partial class HoursOfOperationComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/ManufacturedItemDefinition.cs b/src/Hl7.Fhir.R4B/Model/Generated/ManufacturedItemDefinition.cs
index 9f09404555..276a352afd 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/ManufacturedItemDefinition.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/ManufacturedItemDefinition.cs
@@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model
   /// </summary>
   [Serializable]
   [DataContract]
-  [FhirType("ManufacturedItemDefinition","http://hl7.org/fhir/StructureDefinition/ManufacturedItemDefinition", IsResource=true)]
+  [FhirType("ManufacturedItemDefinition","http://hl7.org/fhir/StructureDefinition/ManufacturedItemDefinition")]
   public partial class ManufacturedItemDefinition : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -61,7 +61,7 @@ public partial class ManufacturedItemDefinition : Hl7.Fhir.Model.DomainResource,
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("ManufacturedItemDefinition#Property", IsNestedType=true)]
+    [FhirType("ManufacturedItemDefinition#Property")]
     [BackboneType("ManufacturedItemDefinition.property")]
     public partial class PropertyComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Measure.cs b/src/Hl7.Fhir.R4B/Model/Generated/Measure.cs
index 8ae6bec83f..a3491f11da 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/Measure.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/Measure.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Measure","http://hl7.org/fhir/StructureDefinition/Measure", IsResource=true)]
+  [FhirType("Measure","http://hl7.org/fhir/StructureDefinition/Measure")]
   public partial class Measure : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -67,7 +67,7 @@ public partial class Measure : Hl7.Fhir.Model.DomainResource, IIdentifiable<List
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Measure#Group", IsNestedType=true)]
+    [FhirType("Measure#Group")]
     [BackboneType("Measure.group")]
     public partial class GroupComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -289,7 +289,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Measure#Population", IsNestedType=true)]
+    [FhirType("Measure#Population")]
     [BackboneType("Measure.group.population")]
     public partial class PopulationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -485,7 +485,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Measure#Stratifier", IsNestedType=true)]
+    [FhirType("Measure#Stratifier")]
     [BackboneType("Measure.group.stratifier")]
     public partial class StratifierComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -707,7 +707,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Measure#Component", IsNestedType=true)]
+    [FhirType("Measure#Component")]
     [BackboneType("Measure.group.stratifier.component")]
     public partial class ComponentComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -904,7 +904,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Measure#SupplementalData", IsNestedType=true)]
+    [FhirType("Measure#SupplementalData")]
     [BackboneType("Measure.supplementalData")]
     public partial class SupplementalDataComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/MeasureReport.cs b/src/Hl7.Fhir.R4B/Model/Generated/MeasureReport.cs
index 51bfa88c08..aa6752f52f 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/MeasureReport.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/MeasureReport.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("MeasureReport","http://hl7.org/fhir/StructureDefinition/MeasureReport", IsResource=true)]
+  [FhirType("MeasureReport","http://hl7.org/fhir/StructureDefinition/MeasureReport")]
   public partial class MeasureReport : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -129,7 +129,7 @@ public enum MeasureReportType
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MeasureReport#Group", IsNestedType=true)]
+    [FhirType("MeasureReport#Group")]
     [BackboneType("MeasureReport.group")]
     public partial class GroupComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -333,7 +333,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MeasureReport#Population", IsNestedType=true)]
+    [FhirType("MeasureReport#Population")]
     [BackboneType("MeasureReport.group.population")]
     public partial class PopulationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -530,7 +530,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MeasureReport#Stratifier", IsNestedType=true)]
+    [FhirType("MeasureReport#Stratifier")]
     [BackboneType("MeasureReport.group.stratifier")]
     public partial class StratifierComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -684,7 +684,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MeasureReport#StratifierGroup", IsNestedType=true)]
+    [FhirType("MeasureReport#StratifierGroup")]
     [BackboneType("MeasureReport.group.stratifier.stratum")]
     public partial class StratifierGroupComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -888,7 +888,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MeasureReport#Component", IsNestedType=true)]
+    [FhirType("MeasureReport#Component")]
     [BackboneType("MeasureReport.group.stratifier.stratum.component")]
     public partial class ComponentComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1043,7 +1043,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MeasureReport#StratifierGroupPopulation", IsNestedType=true)]
+    [FhirType("MeasureReport#StratifierGroupPopulation")]
     [BackboneType("MeasureReport.group.stratifier.stratum.population")]
     public partial class StratifierGroupPopulationComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Media.cs b/src/Hl7.Fhir.R4B/Model/Generated/Media.cs
index 48695c3b81..a02bb88dca 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/Media.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/Media.cs
@@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model
   /// </summary>
   [Serializable]
   [DataContract]
-  [FhirType("Media","http://hl7.org/fhir/StructureDefinition/Media", IsResource=true)]
+  [FhirType("Media","http://hl7.org/fhir/StructureDefinition/Media")]
   public partial class Media : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Medication.cs b/src/Hl7.Fhir.R4B/Model/Generated/Medication.cs
index 2926e4d2e9..7b0c0d5026 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/Medication.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/Medication.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Medication","http://hl7.org/fhir/StructureDefinition/Medication", IsResource=true)]
+  [FhirType("Medication","http://hl7.org/fhir/StructureDefinition/Medication")]
   public partial class Medication : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -96,7 +96,7 @@ public enum MedicationStatusCodes
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Medication#Ingredient", IsNestedType=true)]
+    [FhirType("Medication#Ingredient")]
     [BackboneType("Medication.ingredient")]
     public partial class IngredientComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -294,7 +294,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Medication#Batch", IsNestedType=true)]
+    [FhirType("Medication#Batch")]
     [BackboneType("Medication.batch")]
     public partial class BatchComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/MedicationAdministration.cs b/src/Hl7.Fhir.R4B/Model/Generated/MedicationAdministration.cs
index 5f2f34f134..811ca58dbc 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/MedicationAdministration.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/MedicationAdministration.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("MedicationAdministration","http://hl7.org/fhir/StructureDefinition/MedicationAdministration", IsResource=true)]
+  [FhirType("MedicationAdministration","http://hl7.org/fhir/StructureDefinition/MedicationAdministration")]
   public partial class MedicationAdministration : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -119,7 +119,7 @@ public enum MedicationAdministrationStatusCodes
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationAdministration#Performer", IsNestedType=true)]
+    [FhirType("MedicationAdministration#Performer")]
     [BackboneType("MedicationAdministration.performer")]
     public partial class PerformerComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -274,7 +274,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationAdministration#Dosage", IsNestedType=true)]
+    [FhirType("MedicationAdministration#Dosage")]
     [BackboneType("MedicationAdministration.dosage")]
     public partial class DosageComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/MedicationDispense.cs b/src/Hl7.Fhir.R4B/Model/Generated/MedicationDispense.cs
index 9394e76c2e..aefa1e8607 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/MedicationDispense.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/MedicationDispense.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("MedicationDispense","http://hl7.org/fhir/StructureDefinition/MedicationDispense", IsResource=true)]
+  [FhirType("MedicationDispense","http://hl7.org/fhir/StructureDefinition/MedicationDispense")]
   public partial class MedicationDispense : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -131,7 +131,7 @@ public enum MedicationDispenseStatusCodes
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationDispense#Performer", IsNestedType=true)]
+    [FhirType("MedicationDispense#Performer")]
     [BackboneType("MedicationDispense.performer")]
     public partial class PerformerComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -286,7 +286,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationDispense#Substitution", IsNestedType=true)]
+    [FhirType("MedicationDispense#Substitution")]
     [BackboneType("MedicationDispense.substitution")]
     public partial class SubstitutionComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/MedicationKnowledge.cs b/src/Hl7.Fhir.R4B/Model/Generated/MedicationKnowledge.cs
index 35dc05046f..56738665fb 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/MedicationKnowledge.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/MedicationKnowledge.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("MedicationKnowledge","http://hl7.org/fhir/StructureDefinition/MedicationKnowledge", IsResource=true)]
+  [FhirType("MedicationKnowledge","http://hl7.org/fhir/StructureDefinition/MedicationKnowledge")]
   public partial class MedicationKnowledge : Hl7.Fhir.Model.DomainResource
   {
     /// <summary>
@@ -95,7 +95,7 @@ public enum MedicationKnowledgeStatusCodes
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationKnowledge#RelatedMedicationKnowledge", IsNestedType=true)]
+    [FhirType("MedicationKnowledge#RelatedMedicationKnowledge")]
     [BackboneType("MedicationKnowledge.relatedMedicationKnowledge")]
     public partial class RelatedMedicationKnowledgeComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -247,7 +247,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationKnowledge#Monograph", IsNestedType=true)]
+    [FhirType("MedicationKnowledge#Monograph")]
     [BackboneType("MedicationKnowledge.monograph")]
     public partial class MonographComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -400,7 +400,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationKnowledge#Ingredient", IsNestedType=true)]
+    [FhirType("MedicationKnowledge#Ingredient")]
     [BackboneType("MedicationKnowledge.ingredient")]
     public partial class IngredientComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -598,7 +598,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationKnowledge#Cost", IsNestedType=true)]
+    [FhirType("MedicationKnowledge#Cost")]
     [BackboneType("MedicationKnowledge.cost")]
     public partial class CostComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -794,7 +794,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationKnowledge#MonitoringProgram", IsNestedType=true)]
+    [FhirType("MedicationKnowledge#MonitoringProgram")]
     [BackboneType("MedicationKnowledge.monitoringProgram")]
     public partial class MonitoringProgramComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -963,7 +963,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationKnowledge#AdministrationGuidelines", IsNestedType=true)]
+    [FhirType("MedicationKnowledge#AdministrationGuidelines")]
     [BackboneType("MedicationKnowledge.administrationGuidelines")]
     public partial class AdministrationGuidelinesComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1141,7 +1141,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationKnowledge#Dosage", IsNestedType=true)]
+    [FhirType("MedicationKnowledge#Dosage")]
     [BackboneType("MedicationKnowledge.administrationGuidelines.dosage")]
     public partial class DosageComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1294,7 +1294,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationKnowledge#PatientCharacteristics", IsNestedType=true)]
+    [FhirType("MedicationKnowledge#PatientCharacteristics")]
     [BackboneType("MedicationKnowledge.administrationGuidelines.patientCharacteristics")]
     public partial class PatientCharacteristicsComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1464,7 +1464,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationKnowledge#MedicineClassification", IsNestedType=true)]
+    [FhirType("MedicationKnowledge#MedicineClassification")]
     [BackboneType("MedicationKnowledge.medicineClassification")]
     public partial class MedicineClassificationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1617,7 +1617,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationKnowledge#Packaging", IsNestedType=true)]
+    [FhirType("MedicationKnowledge#Packaging")]
     [BackboneType("MedicationKnowledge.packaging")]
     public partial class PackagingComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1769,7 +1769,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationKnowledge#DrugCharacteristic", IsNestedType=true)]
+    [FhirType("MedicationKnowledge#DrugCharacteristic")]
     [BackboneType("MedicationKnowledge.drugCharacteristic")]
     public partial class DrugCharacteristicComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1920,7 +1920,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationKnowledge#Regulatory", IsNestedType=true)]
+    [FhirType("MedicationKnowledge#Regulatory")]
     [BackboneType("MedicationKnowledge.regulatory")]
     public partial class RegulatoryComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2123,7 +2123,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationKnowledge#Substitution", IsNestedType=true)]
+    [FhirType("MedicationKnowledge#Substitution")]
     [BackboneType("MedicationKnowledge.regulatory.substitution")]
     public partial class SubstitutionComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2291,7 +2291,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationKnowledge#Schedule", IsNestedType=true)]
+    [FhirType("MedicationKnowledge#Schedule")]
     [BackboneType("MedicationKnowledge.regulatory.schedule")]
     public partial class ScheduleComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2415,7 +2415,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationKnowledge#MaxDispense", IsNestedType=true)]
+    [FhirType("MedicationKnowledge#MaxDispense")]
     [BackboneType("MedicationKnowledge.regulatory.maxDispense")]
     public partial class MaxDispenseComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2564,7 +2564,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationKnowledge#Kinetics", IsNestedType=true)]
+    [FhirType("MedicationKnowledge#Kinetics")]
     [BackboneType("MedicationKnowledge.kinetics")]
     public partial class KineticsComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/MedicationRequest.cs b/src/Hl7.Fhir.R4B/Model/Generated/MedicationRequest.cs
index e1db458a25..a2fe5c275f 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/MedicationRequest.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/MedicationRequest.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("MedicationRequest","http://hl7.org/fhir/StructureDefinition/MedicationRequest", IsResource=true)]
+  [FhirType("MedicationRequest","http://hl7.org/fhir/StructureDefinition/MedicationRequest")]
   public partial class MedicationRequest : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -183,7 +183,7 @@ public enum MedicationRequestIntent
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationRequest#DispenseRequest", IsNestedType=true)]
+    [FhirType("MedicationRequest#DispenseRequest")]
     [BackboneType("MedicationRequest.dispenseRequest")]
     public partial class DispenseRequestComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -480,7 +480,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationRequest#InitialFill", IsNestedType=true)]
+    [FhirType("MedicationRequest#InitialFill")]
     [BackboneType("MedicationRequest.dispenseRequest.initialFill")]
     public partial class InitialFillComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -631,7 +631,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationRequest#Substitution", IsNestedType=true)]
+    [FhirType("MedicationRequest#Substitution")]
     [BackboneType("MedicationRequest.substitution")]
     public partial class SubstitutionComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/MedicationStatement.cs b/src/Hl7.Fhir.R4B/Model/Generated/MedicationStatement.cs
index 6c095be1ab..d61e52c32c 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/MedicationStatement.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/MedicationStatement.cs
@@ -62,7 +62,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("MedicationStatement","http://hl7.org/fhir/StructureDefinition/MedicationStatement", IsResource=true)]
+  [FhirType("MedicationStatement","http://hl7.org/fhir/StructureDefinition/MedicationStatement")]
   public partial class MedicationStatement : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/MedicinalProductDefinition.cs b/src/Hl7.Fhir.R4B/Model/Generated/MedicinalProductDefinition.cs
index d4ba0a2bdc..f3e668db81 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/MedicinalProductDefinition.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/MedicinalProductDefinition.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("MedicinalProductDefinition","http://hl7.org/fhir/StructureDefinition/MedicinalProductDefinition", IsResource=true)]
+  [FhirType("MedicinalProductDefinition","http://hl7.org/fhir/StructureDefinition/MedicinalProductDefinition")]
   public partial class MedicinalProductDefinition : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -64,7 +64,7 @@ public partial class MedicinalProductDefinition : Hl7.Fhir.Model.DomainResource,
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("MedicinalProductDefinition#Contact", IsNestedType=true)]
+    [FhirType("MedicinalProductDefinition#Contact")]
     [BackboneType("MedicinalProductDefinition.contact")]
     public partial class ContactComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -216,7 +216,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("MedicinalProductDefinition#Name", IsNestedType=true)]
+    [FhirType("MedicinalProductDefinition#Name")]
     [BackboneType("MedicinalProductDefinition.name")]
     public partial class NameComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -436,7 +436,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("MedicinalProductDefinition#NamePart", IsNestedType=true)]
+    [FhirType("MedicinalProductDefinition#NamePart")]
     [BackboneType("MedicinalProductDefinition.name.namePart")]
     public partial class NamePartComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -608,7 +608,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MedicinalProductDefinition#CountryLanguage", IsNestedType=true)]
+    [FhirType("MedicinalProductDefinition#CountryLanguage")]
     [BackboneType("MedicinalProductDefinition.name.countryLanguage")]
     public partial class CountryLanguageComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -789,7 +789,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MedicinalProductDefinition#CrossReference", IsNestedType=true)]
+    [FhirType("MedicinalProductDefinition#CrossReference")]
     [BackboneType("MedicinalProductDefinition.crossReference")]
     public partial class CrossReferenceComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -942,7 +942,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MedicinalProductDefinition#Operation", IsNestedType=true)]
+    [FhirType("MedicinalProductDefinition#Operation")]
     [BackboneType("MedicinalProductDefinition.operation")]
     public partial class OperationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1147,7 +1147,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MedicinalProductDefinition#Characteristic", IsNestedType=true)]
+    [FhirType("MedicinalProductDefinition#Characteristic")]
     [BackboneType("MedicinalProductDefinition.characteristic")]
     public partial class CharacteristicComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/MessageDefinition.cs b/src/Hl7.Fhir.R4B/Model/Generated/MessageDefinition.cs
index b0842490f4..4f8c95b046 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/MessageDefinition.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/MessageDefinition.cs
@@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("MessageDefinition","http://hl7.org/fhir/StructureDefinition/MessageDefinition", IsResource=true)]
+  [FhirType("MessageDefinition","http://hl7.org/fhir/StructureDefinition/MessageDefinition")]
   public partial class MessageDefinition : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -96,7 +96,7 @@ public enum MessageSignificanceCategory
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MessageDefinition#Focus", IsNestedType=true)]
+    [FhirType("MessageDefinition#Focus")]
     [BackboneType("MessageDefinition.focus")]
     public partial class FocusComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -374,7 +374,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MessageDefinition#AllowedResponse", IsNestedType=true)]
+    [FhirType("MessageDefinition#AllowedResponse")]
     [BackboneType("MessageDefinition.allowedResponse")]
     public partial class AllowedResponseComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/MessageHeader.cs b/src/Hl7.Fhir.R4B/Model/Generated/MessageHeader.cs
index 48ef36634b..0d56b4b8cf 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/MessageHeader.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/MessageHeader.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("MessageHeader","http://hl7.org/fhir/StructureDefinition/MessageHeader", IsResource=true)]
+  [FhirType("MessageHeader","http://hl7.org/fhir/StructureDefinition/MessageHeader")]
   public partial class MessageHeader : Hl7.Fhir.Model.DomainResource
   {
     /// <summary>
@@ -96,7 +96,7 @@ public enum ResponseType
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MessageHeader#MessageDestination", IsNestedType=true)]
+    [FhirType("MessageHeader#MessageDestination")]
     [BackboneType("MessageHeader.destination")]
     public partial class MessageDestinationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -338,7 +338,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MessageHeader#MessageSource", IsNestedType=true)]
+    [FhirType("MessageHeader#MessageSource")]
     [BackboneType("MessageHeader.source")]
     public partial class MessageSourceComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -637,7 +637,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MessageHeader#Response", IsNestedType=true)]
+    [FhirType("MessageHeader#Response")]
     [BackboneType("MessageHeader.response")]
     public partial class ResponseComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/MolecularSequence.cs b/src/Hl7.Fhir.R4B/Model/Generated/MolecularSequence.cs
index 19908293a1..dec2b25b79 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/MolecularSequence.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/MolecularSequence.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("MolecularSequence","http://hl7.org/fhir/StructureDefinition/MolecularSequence", IsResource=true)]
+  [FhirType("MolecularSequence","http://hl7.org/fhir/StructureDefinition/MolecularSequence")]
   public partial class MolecularSequence : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -207,7 +207,7 @@ public enum RepositoryType
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MolecularSequence#ReferenceSeq", IsNestedType=true)]
+    [FhirType("MolecularSequence#ReferenceSeq")]
     [BackboneType("MolecularSequence.referenceSeq")]
     public partial class ReferenceSeqComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -649,7 +649,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MolecularSequence#Variant", IsNestedType=true)]
+    [FhirType("MolecularSequence#Variant")]
     [BackboneType("MolecularSequence.variant")]
     public partial class VariantComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -992,7 +992,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MolecularSequence#Quality", IsNestedType=true)]
+    [FhirType("MolecularSequence#Quality")]
     [BackboneType("MolecularSequence.quality")]
     public partial class QualityComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1671,7 +1671,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MolecularSequence#Roc", IsNestedType=true)]
+    [FhirType("MolecularSequence#Roc")]
     [BackboneType("MolecularSequence.quality.roc")]
     public partial class RocComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2080,7 +2080,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MolecularSequence#Repository", IsNestedType=true)]
+    [FhirType("MolecularSequence#Repository")]
     [BackboneType("MolecularSequence.repository")]
     public partial class RepositoryComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2442,7 +2442,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MolecularSequence#StructureVariant", IsNestedType=true)]
+    [FhirType("MolecularSequence#StructureVariant")]
     [BackboneType("MolecularSequence.structureVariant")]
     public partial class StructureVariantComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2702,7 +2702,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("MolecularSequence#Outer", IsNestedType=true)]
+    [FhirType("MolecularSequence#Outer")]
     [BackboneType("MolecularSequence.structureVariant.outer")]
     public partial class OuterComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2886,7 +2886,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("MolecularSequence#Inner", IsNestedType=true)]
+    [FhirType("MolecularSequence#Inner")]
     [BackboneType("MolecularSequence.structureVariant.inner")]
     public partial class InnerComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/NamingSystem.cs b/src/Hl7.Fhir.R4B/Model/Generated/NamingSystem.cs
index 67f7cb02ee..04e9acb4bc 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/NamingSystem.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/NamingSystem.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("NamingSystem","http://hl7.org/fhir/StructureDefinition/NamingSystem", IsResource=true)]
+  [FhirType("NamingSystem","http://hl7.org/fhir/StructureDefinition/NamingSystem")]
   public partial class NamingSystem : Hl7.Fhir.Model.DomainResource
   {
     /// <summary>
@@ -130,7 +130,7 @@ public enum NamingSystemIdentifierType
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("NamingSystem#UniqueId", IsNestedType=true)]
+    [FhirType("NamingSystem#UniqueId")]
     [BackboneType("NamingSystem.uniqueId")]
     public partial class UniqueIdComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/NutritionOrder.cs b/src/Hl7.Fhir.R4B/Model/Generated/NutritionOrder.cs
index 75480cf8b8..4fdbf53138 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/NutritionOrder.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/NutritionOrder.cs
@@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("NutritionOrder","http://hl7.org/fhir/StructureDefinition/NutritionOrder", IsResource=true)]
+  [FhirType("NutritionOrder","http://hl7.org/fhir/StructureDefinition/NutritionOrder")]
   public partial class NutritionOrder : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -68,7 +68,7 @@ public partial class NutritionOrder : Hl7.Fhir.Model.DomainResource, IIdentifiab
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("NutritionOrder#OralDiet", IsNestedType=true)]
+    [FhirType("NutritionOrder#OralDiet")]
     [BackboneType("NutritionOrder.oralDiet")]
     public partial class OralDietComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -344,7 +344,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("NutritionOrder#Nutrient", IsNestedType=true)]
+    [FhirType("NutritionOrder#Nutrient")]
     [BackboneType("NutritionOrder.oralDiet.nutrient")]
     public partial class NutrientComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -496,7 +496,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("NutritionOrder#Texture", IsNestedType=true)]
+    [FhirType("NutritionOrder#Texture")]
     [BackboneType("NutritionOrder.oralDiet.texture")]
     public partial class TextureComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -649,7 +649,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("NutritionOrder#Supplement", IsNestedType=true)]
+    [FhirType("NutritionOrder#Supplement")]
     [BackboneType("NutritionOrder.supplement")]
     public partial class SupplementComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -913,7 +913,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("NutritionOrder#EnteralFormula", IsNestedType=true)]
+    [FhirType("NutritionOrder#EnteralFormula")]
     [BackboneType("NutritionOrder.enteralFormula")]
     public partial class EnteralFormulaComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1298,7 +1298,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("NutritionOrder#Administration", IsNestedType=true)]
+    [FhirType("NutritionOrder#Administration")]
     [BackboneType("NutritionOrder.enteralFormula.administration")]
     public partial class AdministrationComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/NutritionProduct.cs b/src/Hl7.Fhir.R4B/Model/Generated/NutritionProduct.cs
index a2272a9f36..aada51c3fc 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/NutritionProduct.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/NutritionProduct.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("NutritionProduct","http://hl7.org/fhir/StructureDefinition/NutritionProduct", IsResource=true)]
+  [FhirType("NutritionProduct","http://hl7.org/fhir/StructureDefinition/NutritionProduct")]
   public partial class NutritionProduct : Hl7.Fhir.Model.DomainResource
   {
     /// <summary>
@@ -95,7 +95,7 @@ public enum NutritionProductStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("NutritionProduct#Nutrient", IsNestedType=true)]
+    [FhirType("NutritionProduct#Nutrient")]
     [BackboneType("NutritionProduct.nutrient")]
     public partial class NutrientComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -245,7 +245,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("NutritionProduct#Ingredient", IsNestedType=true)]
+    [FhirType("NutritionProduct#Ingredient")]
     [BackboneType("NutritionProduct.ingredient")]
     public partial class IngredientComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -395,7 +395,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("NutritionProduct#ProductCharacteristic", IsNestedType=true)]
+    [FhirType("NutritionProduct#ProductCharacteristic")]
     [BackboneType("NutritionProduct.productCharacteristic")]
     public partial class ProductCharacteristicComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -551,7 +551,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("NutritionProduct#Instance", IsNestedType=true)]
+    [FhirType("NutritionProduct#Instance")]
     [BackboneType("NutritionProduct.instance")]
     public partial class InstanceComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Observation.cs b/src/Hl7.Fhir.R4B/Model/Generated/Observation.cs
index b404275fff..e9e8457abe 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/Observation.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/Observation.cs
@@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Observation","http://hl7.org/fhir/StructureDefinition/Observation", IsResource=true)]
+  [FhirType("Observation","http://hl7.org/fhir/StructureDefinition/Observation")]
   public partial class Observation : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -69,7 +69,7 @@ public partial class Observation : Hl7.Fhir.Model.DomainResource, IIdentifiable<
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Observation#ReferenceRange", IsNestedType=true)]
+    [FhirType("Observation#ReferenceRange")]
     [BackboneType("Observation.referenceRange")]
     public partial class ReferenceRangeComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -342,7 +342,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Observation#Component", IsNestedType=true)]
+    [FhirType("Observation#Component")]
     [BackboneType("Observation.component")]
     public partial class ComponentComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/ObservationDefinition.cs b/src/Hl7.Fhir.R4B/Model/Generated/ObservationDefinition.cs
index 22f5b773ec..52d4fef900 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/ObservationDefinition.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/ObservationDefinition.cs
@@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("ObservationDefinition","http://hl7.org/fhir/StructureDefinition/ObservationDefinition", IsResource=true)]
+  [FhirType("ObservationDefinition","http://hl7.org/fhir/StructureDefinition/ObservationDefinition")]
   public partial class ObservationDefinition : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -172,7 +172,7 @@ public enum ObservationRangeCategory
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ObservationDefinition#QuantitativeDetails", IsNestedType=true)]
+    [FhirType("ObservationDefinition#QuantitativeDetails")]
     [BackboneType("ObservationDefinition.quantitativeDetails")]
     public partial class QuantitativeDetailsComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -411,7 +411,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ObservationDefinition#QualifiedInterval", IsNestedType=true)]
+    [FhirType("ObservationDefinition#QualifiedInterval")]
     [BackboneType("ObservationDefinition.qualifiedInterval")]
     public partial class QualifiedIntervalComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/OperationDefinition.cs b/src/Hl7.Fhir.R4B/Model/Generated/OperationDefinition.cs
index 63a636406b..9efb83fd33 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/OperationDefinition.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/OperationDefinition.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("OperationDefinition","http://hl7.org/fhir/StructureDefinition/OperationDefinition", IsResource=true)]
+  [FhirType("OperationDefinition","http://hl7.org/fhir/StructureDefinition/OperationDefinition")]
   public partial class OperationDefinition : Hl7.Fhir.Model.DomainResource
   {
     /// <summary>
@@ -90,7 +90,7 @@ public enum OperationKind
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("OperationDefinition#Parameter", IsNestedType=true)]
+    [FhirType("OperationDefinition#Parameter")]
     [BackboneType("OperationDefinition.parameter")]
     public partial class ParameterComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -623,7 +623,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("OperationDefinition#Binding", IsNestedType=true)]
+    [FhirType("OperationDefinition#Binding")]
     [BackboneType("OperationDefinition.parameter.binding")]
     public partial class BindingComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -815,7 +815,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("OperationDefinition#ReferencedFrom", IsNestedType=true)]
+    [FhirType("OperationDefinition#ReferencedFrom")]
     [BackboneType("OperationDefinition.parameter.referencedFrom")]
     public partial class ReferencedFromComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1004,7 +1004,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("OperationDefinition#Overload", IsNestedType=true)]
+    [FhirType("OperationDefinition#Overload")]
     [BackboneType("OperationDefinition.overload")]
     public partial class OverloadComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Organization.cs b/src/Hl7.Fhir.R4B/Model/Generated/Organization.cs
index 743dcf4d08..1b2e81769d 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/Organization.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/Organization.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Organization","http://hl7.org/fhir/StructureDefinition/Organization", IsResource=true)]
+  [FhirType("Organization","http://hl7.org/fhir/StructureDefinition/Organization")]
   public partial class Organization : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -67,7 +67,7 @@ public partial class Organization : Hl7.Fhir.Model.DomainResource, IIdentifiable
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Organization#Contact", IsNestedType=true)]
+    [FhirType("Organization#Contact")]
     [BackboneType("Organization.contact")]
     public partial class ContactComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/OrganizationAffiliation.cs b/src/Hl7.Fhir.R4B/Model/Generated/OrganizationAffiliation.cs
index 4e34fa0b4e..1b86f6ce02 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/OrganizationAffiliation.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/OrganizationAffiliation.cs
@@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model
   /// </summary>
   [Serializable]
   [DataContract]
-  [FhirType("OrganizationAffiliation","http://hl7.org/fhir/StructureDefinition/OrganizationAffiliation", IsResource=true)]
+  [FhirType("OrganizationAffiliation","http://hl7.org/fhir/StructureDefinition/OrganizationAffiliation")]
   public partial class OrganizationAffiliation : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/PackagedProductDefinition.cs b/src/Hl7.Fhir.R4B/Model/Generated/PackagedProductDefinition.cs
index f9dc515281..05092e4261 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/PackagedProductDefinition.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/PackagedProductDefinition.cs
@@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model
   /// </summary>
   [Serializable]
   [DataContract]
-  [FhirType("PackagedProductDefinition","http://hl7.org/fhir/StructureDefinition/PackagedProductDefinition", IsResource=true)]
+  [FhirType("PackagedProductDefinition","http://hl7.org/fhir/StructureDefinition/PackagedProductDefinition")]
   public partial class PackagedProductDefinition : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -61,7 +61,7 @@ public partial class PackagedProductDefinition : Hl7.Fhir.Model.DomainResource,
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("PackagedProductDefinition#LegalStatusOfSupply", IsNestedType=true)]
+    [FhirType("PackagedProductDefinition#LegalStatusOfSupply")]
     [BackboneType("PackagedProductDefinition.legalStatusOfSupply")]
     public partial class LegalStatusOfSupplyComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -214,7 +214,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("PackagedProductDefinition#Package", IsNestedType=true)]
+    [FhirType("PackagedProductDefinition#Package")]
     [BackboneType("PackagedProductDefinition.package")]
     public partial class PackageComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -593,7 +593,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("PackagedProductDefinition#ShelfLifeStorage", IsNestedType=true)]
+    [FhirType("PackagedProductDefinition#ShelfLifeStorage")]
     [BackboneType("PackagedProductDefinition.package.shelfLifeStorage")]
     public partial class ShelfLifeStorageComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -769,7 +769,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("PackagedProductDefinition#Property", IsNestedType=true)]
+    [FhirType("PackagedProductDefinition#Property")]
     [BackboneType("PackagedProductDefinition.package.property")]
     public partial class PropertyComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -921,7 +921,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("PackagedProductDefinition#ContainedItem", IsNestedType=true)]
+    [FhirType("PackagedProductDefinition#ContainedItem")]
     [BackboneType("PackagedProductDefinition.package.containedItem")]
     public partial class ContainedItemComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Patient.cs b/src/Hl7.Fhir.R4B/Model/Generated/Patient.cs
index 9e1808ff29..a6244b2560 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/Patient.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/Patient.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Patient","http://hl7.org/fhir/StructureDefinition/Patient", IsResource=true)]
+  [FhirType("Patient","http://hl7.org/fhir/StructureDefinition/Patient")]
   public partial class Patient : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -101,7 +101,7 @@ public enum LinkType
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Patient#Contact", IsNestedType=true)]
+    [FhirType("Patient#Contact")]
     [BackboneType("Patient.contact")]
     public partial class ContactComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -402,7 +402,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Patient#Communication", IsNestedType=true)]
+    [FhirType("Patient#Communication")]
     [BackboneType("Patient.communication")]
     public partial class CommunicationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -574,7 +574,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Patient#Link", IsNestedType=true)]
+    [FhirType("Patient#Link")]
     [BackboneType("Patient.link")]
     public partial class LinkComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/PaymentNotice.cs b/src/Hl7.Fhir.R4B/Model/Generated/PaymentNotice.cs
index 2e4d8829b4..6fbd3ba0c6 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/PaymentNotice.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/PaymentNotice.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("PaymentNotice","http://hl7.org/fhir/StructureDefinition/PaymentNotice", IsResource=true)]
+  [FhirType("PaymentNotice","http://hl7.org/fhir/StructureDefinition/PaymentNotice")]
   public partial class PaymentNotice : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/PaymentReconciliation.cs b/src/Hl7.Fhir.R4B/Model/Generated/PaymentReconciliation.cs
index c211a82df6..145b9784c9 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/PaymentReconciliation.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/PaymentReconciliation.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("PaymentReconciliation","http://hl7.org/fhir/StructureDefinition/PaymentReconciliation", IsResource=true)]
+  [FhirType("PaymentReconciliation","http://hl7.org/fhir/StructureDefinition/PaymentReconciliation")]
   public partial class PaymentReconciliation : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -67,7 +67,7 @@ public partial class PaymentReconciliation : Hl7.Fhir.Model.DomainResource, IIde
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("PaymentReconciliation#Details", IsNestedType=true)]
+    [FhirType("PaymentReconciliation#Details")]
     [BackboneType("PaymentReconciliation.detail")]
     public partial class DetailsComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -448,7 +448,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("PaymentReconciliation#Notes", IsNestedType=true)]
+    [FhirType("PaymentReconciliation#Notes")]
     [BackboneType("PaymentReconciliation.processNote")]
     public partial class NotesComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Person.cs b/src/Hl7.Fhir.R4B/Model/Generated/Person.cs
index 4a1376b455..da6cad356e 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/Person.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/Person.cs
@@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Person","http://hl7.org/fhir/StructureDefinition/Person", IsResource=true)]
+  [FhirType("Person","http://hl7.org/fhir/StructureDefinition/Person")]
   public partial class Person : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -99,7 +99,7 @@ public enum IdentityAssuranceLevel
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Person#Link", IsNestedType=true)]
+    [FhirType("Person#Link")]
     [BackboneType("Person.link")]
     public partial class LinkComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/PlanDefinition.cs b/src/Hl7.Fhir.R4B/Model/Generated/PlanDefinition.cs
index 4731bad4aa..94fa0ae68d 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/PlanDefinition.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/PlanDefinition.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("PlanDefinition","http://hl7.org/fhir/StructureDefinition/PlanDefinition", IsResource=true)]
+  [FhirType("PlanDefinition","http://hl7.org/fhir/StructureDefinition/PlanDefinition")]
   public partial class PlanDefinition : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -67,7 +67,7 @@ public partial class PlanDefinition : Hl7.Fhir.Model.DomainResource, IIdentifiab
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("PlanDefinition#Goal", IsNestedType=true)]
+    [FhirType("PlanDefinition#Goal")]
     [BackboneType("PlanDefinition.goal")]
     public partial class GoalComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -352,7 +352,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("PlanDefinition#Target", IsNestedType=true)]
+    [FhirType("PlanDefinition#Target")]
     [BackboneType("PlanDefinition.goal.target")]
     public partial class TargetComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -532,7 +532,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("PlanDefinition#Action", IsNestedType=true)]
+    [FhirType("PlanDefinition#Action")]
     [BackboneType("PlanDefinition.action")]
     public partial class ActionComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1560,7 +1560,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("PlanDefinition#Condition", IsNestedType=true)]
+    [FhirType("PlanDefinition#Condition")]
     [BackboneType("PlanDefinition.action.condition")]
     public partial class ConditionComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1733,7 +1733,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("PlanDefinition#RelatedAction", IsNestedType=true)]
+    [FhirType("PlanDefinition#RelatedAction")]
     [BackboneType("PlanDefinition.action.relatedAction")]
     public partial class RelatedActionComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1951,7 +1951,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("PlanDefinition#Participant", IsNestedType=true)]
+    [FhirType("PlanDefinition#Participant")]
     [BackboneType("PlanDefinition.action.participant")]
     public partial class ParticipantComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2125,7 +2125,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("PlanDefinition#DynamicValue", IsNestedType=true)]
+    [FhirType("PlanDefinition#DynamicValue")]
     [BackboneType("PlanDefinition.action.dynamicValue")]
     public partial class DynamicValueComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Practitioner.cs b/src/Hl7.Fhir.R4B/Model/Generated/Practitioner.cs
index c3076baa23..14c6674ba3 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/Practitioner.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/Practitioner.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Practitioner","http://hl7.org/fhir/StructureDefinition/Practitioner", IsResource=true)]
+  [FhirType("Practitioner","http://hl7.org/fhir/StructureDefinition/Practitioner")]
   public partial class Practitioner : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -67,7 +67,7 @@ public partial class Practitioner : Hl7.Fhir.Model.DomainResource, IIdentifiable
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Practitioner#Qualification", IsNestedType=true)]
+    [FhirType("Practitioner#Qualification")]
     [BackboneType("Practitioner.qualification")]
     public partial class QualificationComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/PractitionerRole.cs b/src/Hl7.Fhir.R4B/Model/Generated/PractitionerRole.cs
index aeccb3643b..98bdb3c732 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/PractitionerRole.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/PractitionerRole.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("PractitionerRole","http://hl7.org/fhir/StructureDefinition/PractitionerRole", IsResource=true)]
+  [FhirType("PractitionerRole","http://hl7.org/fhir/StructureDefinition/PractitionerRole")]
   public partial class PractitionerRole : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -68,7 +68,7 @@ public partial class PractitionerRole : Hl7.Fhir.Model.DomainResource, IIdentifi
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("PractitionerRole#AvailableTime", IsNestedType=true)]
+    [FhirType("PractitionerRole#AvailableTime")]
     [BackboneType("PractitionerRole.availableTime")]
     public partial class AvailableTimeComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -344,7 +344,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("PractitionerRole#NotAvailable", IsNestedType=true)]
+    [FhirType("PractitionerRole#NotAvailable")]
     [BackboneType("PractitionerRole.notAvailable")]
     public partial class NotAvailableComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Procedure.cs b/src/Hl7.Fhir.R4B/Model/Generated/Procedure.cs
index 7a6741434e..d880be5547 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/Procedure.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/Procedure.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Procedure","http://hl7.org/fhir/StructureDefinition/Procedure", IsResource=true)]
+  [FhirType("Procedure","http://hl7.org/fhir/StructureDefinition/Procedure")]
   public partial class Procedure : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -67,7 +67,7 @@ public partial class Procedure : Hl7.Fhir.Model.DomainResource, IIdentifiable<Li
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Procedure#Performer", IsNestedType=true)]
+    [FhirType("Procedure#Performer")]
     [BackboneType("Procedure.performer")]
     public partial class PerformerComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -249,7 +249,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Procedure#FocalDevice", IsNestedType=true)]
+    [FhirType("Procedure#FocalDevice")]
     [BackboneType("Procedure.focalDevice")]
     public partial class FocalDeviceComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Provenance.cs b/src/Hl7.Fhir.R4B/Model/Generated/Provenance.cs
index 76a6508317..88c97e1e85 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/Provenance.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/Provenance.cs
@@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Provenance","http://hl7.org/fhir/StructureDefinition/Provenance", IsResource=true)]
+  [FhirType("Provenance","http://hl7.org/fhir/StructureDefinition/Provenance")]
   public partial class Provenance : Hl7.Fhir.Model.DomainResource
   {
     /// <summary>
@@ -109,7 +109,7 @@ public enum ProvenanceEntityRole
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Provenance#Agent", IsNestedType=true)]
+    [FhirType("Provenance#Agent")]
     [BackboneType("Provenance.agent")]
     public partial class AgentComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -315,7 +315,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Provenance#Entity", IsNestedType=true)]
+    [FhirType("Provenance#Entity")]
     [BackboneType("Provenance.entity")]
     public partial class EntityComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Questionnaire.cs b/src/Hl7.Fhir.R4B/Model/Generated/Questionnaire.cs
index 01ec18ede6..2ee25204cf 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/Questionnaire.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/Questionnaire.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Questionnaire","http://hl7.org/fhir/StructureDefinition/Questionnaire", IsResource=true)]
+  [FhirType("Questionnaire","http://hl7.org/fhir/StructureDefinition/Questionnaire")]
   public partial class Questionnaire : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -254,7 +254,7 @@ public enum QuestionnaireItemOperator
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Questionnaire#Item", IsNestedType=true)]
+    [FhirType("Questionnaire#Item")]
     [BackboneType("Questionnaire.item")]
     public partial class ItemComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -966,7 +966,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Questionnaire#EnableWhen", IsNestedType=true)]
+    [FhirType("Questionnaire#EnableWhen")]
     [BackboneType("Questionnaire.item.enableWhen")]
     public partial class EnableWhenComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1188,7 +1188,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Questionnaire#AnswerOption", IsNestedType=true)]
+    [FhirType("Questionnaire#AnswerOption")]
     [BackboneType("Questionnaire.item.answerOption")]
     public partial class AnswerOptionComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1363,7 +1363,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Questionnaire#Initial", IsNestedType=true)]
+    [FhirType("Questionnaire#Initial")]
     [BackboneType("Questionnaire.item.initial")]
     public partial class InitialComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/QuestionnaireResponse.cs b/src/Hl7.Fhir.R4B/Model/Generated/QuestionnaireResponse.cs
index 58205e09fc..acbcd16c36 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/QuestionnaireResponse.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/QuestionnaireResponse.cs
@@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("QuestionnaireResponse","http://hl7.org/fhir/StructureDefinition/QuestionnaireResponse", IsResource=true)]
+  [FhirType("QuestionnaireResponse","http://hl7.org/fhir/StructureDefinition/QuestionnaireResponse")]
   public partial class QuestionnaireResponse : Hl7.Fhir.Model.DomainResource, IIdentifiable<Identifier>
   {
     /// <summary>
@@ -109,7 +109,7 @@ public enum QuestionnaireResponseStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("QuestionnaireResponse#Item", IsNestedType=true)]
+    [FhirType("QuestionnaireResponse#Item")]
     [BackboneType("QuestionnaireResponse.item")]
     public partial class ItemComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -393,7 +393,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("QuestionnaireResponse#Answer", IsNestedType=true)]
+    [FhirType("QuestionnaireResponse#Answer")]
     [BackboneType("QuestionnaireResponse.item.answer")]
     public partial class AnswerComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/RegulatedAuthorization.cs b/src/Hl7.Fhir.R4B/Model/Generated/RegulatedAuthorization.cs
index 6a7cad8f8e..f958a98d8a 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/RegulatedAuthorization.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/RegulatedAuthorization.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("RegulatedAuthorization","http://hl7.org/fhir/StructureDefinition/RegulatedAuthorization", IsResource=true)]
+  [FhirType("RegulatedAuthorization","http://hl7.org/fhir/StructureDefinition/RegulatedAuthorization")]
   public partial class RegulatedAuthorization : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -67,7 +67,7 @@ public partial class RegulatedAuthorization : Hl7.Fhir.Model.DomainResource, IId
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("RegulatedAuthorization#Case", IsNestedType=true)]
+    [FhirType("RegulatedAuthorization#Case")]
     [BackboneType("RegulatedAuthorization.case")]
     public partial class CaseComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/RelatedPerson.cs b/src/Hl7.Fhir.R4B/Model/Generated/RelatedPerson.cs
index 87cc970ce3..286b10d95e 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/RelatedPerson.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/RelatedPerson.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("RelatedPerson","http://hl7.org/fhir/StructureDefinition/RelatedPerson", IsResource=true)]
+  [FhirType("RelatedPerson","http://hl7.org/fhir/StructureDefinition/RelatedPerson")]
   public partial class RelatedPerson : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -67,7 +67,7 @@ public partial class RelatedPerson : Hl7.Fhir.Model.DomainResource, IIdentifiabl
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("RelatedPerson#Communication", IsNestedType=true)]
+    [FhirType("RelatedPerson#Communication")]
     [BackboneType("RelatedPerson.communication")]
     public partial class CommunicationComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/RequestGroup.cs b/src/Hl7.Fhir.R4B/Model/Generated/RequestGroup.cs
index 31a1c95eb8..ba8bfb9009 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/RequestGroup.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/RequestGroup.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("RequestGroup","http://hl7.org/fhir/StructureDefinition/RequestGroup", IsResource=true)]
+  [FhirType("RequestGroup","http://hl7.org/fhir/StructureDefinition/RequestGroup")]
   public partial class RequestGroup : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -67,7 +67,7 @@ public partial class RequestGroup : Hl7.Fhir.Model.DomainResource, IIdentifiable
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("RequestGroup#Action", IsNestedType=true)]
+    [FhirType("RequestGroup#Action")]
     [BackboneType("RequestGroup.action")]
     public partial class ActionComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -849,7 +849,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("RequestGroup#Condition", IsNestedType=true)]
+    [FhirType("RequestGroup#Condition")]
     [BackboneType("RequestGroup.action.condition")]
     public partial class ConditionComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1021,7 +1021,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("RequestGroup#RelatedAction", IsNestedType=true)]
+    [FhirType("RequestGroup#RelatedAction")]
     [BackboneType("RequestGroup.action.relatedAction")]
     public partial class RelatedActionComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/ResearchDefinition.cs b/src/Hl7.Fhir.R4B/Model/Generated/ResearchDefinition.cs
index b27c881622..f05c9ac6fb 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/ResearchDefinition.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/ResearchDefinition.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("ResearchDefinition","http://hl7.org/fhir/StructureDefinition/ResearchDefinition", IsResource=true)]
+  [FhirType("ResearchDefinition","http://hl7.org/fhir/StructureDefinition/ResearchDefinition")]
   public partial class ResearchDefinition : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/ResearchElementDefinition.cs b/src/Hl7.Fhir.R4B/Model/Generated/ResearchElementDefinition.cs
index 0eb9a34bc2..b1066e4294 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/ResearchElementDefinition.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/ResearchElementDefinition.cs
@@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("ResearchElementDefinition","http://hl7.org/fhir/StructureDefinition/ResearchElementDefinition", IsResource=true)]
+  [FhirType("ResearchElementDefinition","http://hl7.org/fhir/StructureDefinition/ResearchElementDefinition")]
   public partial class ResearchElementDefinition : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -125,7 +125,7 @@ public enum VariableTypeCode
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ResearchElementDefinition#Characteristic", IsNestedType=true)]
+    [FhirType("ResearchElementDefinition#Characteristic")]
     [BackboneType("ResearchElementDefinition.characteristic")]
     public partial class CharacteristicComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/ResearchStudy.cs b/src/Hl7.Fhir.R4B/Model/Generated/ResearchStudy.cs
index 2d0dc8d029..b7045a9e98 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/ResearchStudy.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/ResearchStudy.cs
@@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("ResearchStudy","http://hl7.org/fhir/StructureDefinition/ResearchStudy", IsResource=true)]
+  [FhirType("ResearchStudy","http://hl7.org/fhir/StructureDefinition/ResearchStudy")]
   public partial class ResearchStudy : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -144,7 +144,7 @@ public enum ResearchStudyStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ResearchStudy#Arm", IsNestedType=true)]
+    [FhirType("ResearchStudy#Arm")]
     [BackboneType("ResearchStudy.arm")]
     public partial class ArmComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -357,7 +357,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ResearchStudy#Objective", IsNestedType=true)]
+    [FhirType("ResearchStudy#Objective")]
     [BackboneType("ResearchStudy.objective")]
     public partial class ObjectiveComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/ResearchSubject.cs b/src/Hl7.Fhir.R4B/Model/Generated/ResearchSubject.cs
index b41f3495a1..16d10b5dc5 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/ResearchSubject.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/ResearchSubject.cs
@@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("ResearchSubject","http://hl7.org/fhir/StructureDefinition/ResearchSubject", IsResource=true)]
+  [FhirType("ResearchSubject","http://hl7.org/fhir/StructureDefinition/ResearchSubject")]
   public partial class ResearchSubject : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/RiskAssessment.cs b/src/Hl7.Fhir.R4B/Model/Generated/RiskAssessment.cs
index 31ac230bae..41f00ec664 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/RiskAssessment.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/RiskAssessment.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("RiskAssessment","http://hl7.org/fhir/StructureDefinition/RiskAssessment", IsResource=true)]
+  [FhirType("RiskAssessment","http://hl7.org/fhir/StructureDefinition/RiskAssessment")]
   public partial class RiskAssessment : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -68,7 +68,7 @@ public partial class RiskAssessment : Hl7.Fhir.Model.DomainResource, IIdentifiab
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("RiskAssessment#Prediction", IsNestedType=true)]
+    [FhirType("RiskAssessment#Prediction")]
     [BackboneType("RiskAssessment.prediction")]
     public partial class PredictionComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Schedule.cs b/src/Hl7.Fhir.R4B/Model/Generated/Schedule.cs
index fa1b7ac8ea..20d03c7ab1 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/Schedule.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/Schedule.cs
@@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model
   /// </summary>
   [Serializable]
   [DataContract]
-  [FhirType("Schedule","http://hl7.org/fhir/StructureDefinition/Schedule", IsResource=true)]
+  [FhirType("Schedule","http://hl7.org/fhir/StructureDefinition/Schedule")]
   public partial class Schedule : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/SearchParameter.cs b/src/Hl7.Fhir.R4B/Model/Generated/SearchParameter.cs
index b061f65f9a..ca2f24e104 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/SearchParameter.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/SearchParameter.cs
@@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("SearchParameter","http://hl7.org/fhir/StructureDefinition/SearchParameter", IsResource=true)]
+  [FhirType("SearchParameter","http://hl7.org/fhir/StructureDefinition/SearchParameter")]
   public partial class SearchParameter : Hl7.Fhir.Model.DomainResource
   {
     /// <summary>
@@ -254,7 +254,7 @@ public enum SearchModifierCode
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("SearchParameter#Component", IsNestedType=true)]
+    [FhirType("SearchParameter#Component")]
     [BackboneType("SearchParameter.component")]
     public partial class ComponentComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/ServiceRequest.cs b/src/Hl7.Fhir.R4B/Model/Generated/ServiceRequest.cs
index 4618527e66..a7e1d4f61d 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/ServiceRequest.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/ServiceRequest.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("ServiceRequest","http://hl7.org/fhir/StructureDefinition/ServiceRequest", IsResource=true)]
+  [FhirType("ServiceRequest","http://hl7.org/fhir/StructureDefinition/ServiceRequest")]
   public partial class ServiceRequest : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Slot.cs b/src/Hl7.Fhir.R4B/Model/Generated/Slot.cs
index 87311a61d4..c271d1fb42 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/Slot.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/Slot.cs
@@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model
   /// </summary>
   [Serializable]
   [DataContract]
-  [FhirType("Slot","http://hl7.org/fhir/StructureDefinition/Slot", IsResource=true)]
+  [FhirType("Slot","http://hl7.org/fhir/StructureDefinition/Slot")]
   public partial class Slot : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Specimen.cs b/src/Hl7.Fhir.R4B/Model/Generated/Specimen.cs
index 5609b3baa7..ce3b4b70f6 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/Specimen.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/Specimen.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Specimen","http://hl7.org/fhir/StructureDefinition/Specimen", IsResource=true)]
+  [FhirType("Specimen","http://hl7.org/fhir/StructureDefinition/Specimen")]
   public partial class Specimen : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -101,7 +101,7 @@ public enum SpecimenStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Specimen#Collection", IsNestedType=true)]
+    [FhirType("Specimen#Collection")]
     [BackboneType("Specimen.collection")]
     public partial class CollectionComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -386,7 +386,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Specimen#Processing", IsNestedType=true)]
+    [FhirType("Specimen#Processing")]
     [BackboneType("Specimen.processing")]
     public partial class ProcessingComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -611,7 +611,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Specimen#Container", IsNestedType=true)]
+    [FhirType("Specimen#Container")]
     [BackboneType("Specimen.container")]
     public partial class ContainerComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/SpecimenDefinition.cs b/src/Hl7.Fhir.R4B/Model/Generated/SpecimenDefinition.cs
index 50a260aff8..5d3a98c84e 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/SpecimenDefinition.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/SpecimenDefinition.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("SpecimenDefinition","http://hl7.org/fhir/StructureDefinition/SpecimenDefinition", IsResource=true)]
+  [FhirType("SpecimenDefinition","http://hl7.org/fhir/StructureDefinition/SpecimenDefinition")]
   public partial class SpecimenDefinition : Hl7.Fhir.Model.DomainResource, IIdentifiable<Identifier>
   {
     /// <summary>
@@ -89,7 +89,7 @@ public enum SpecimenContainedPreference
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("SpecimenDefinition#TypeTested", IsNestedType=true)]
+    [FhirType("SpecimenDefinition#TypeTested")]
     [BackboneType("SpecimenDefinition.typeTested")]
     public partial class TypeTestedComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -448,7 +448,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SpecimenDefinition#Container", IsNestedType=true)]
+    [FhirType("SpecimenDefinition#Container")]
     [BackboneType("SpecimenDefinition.typeTested.container")]
     public partial class ContainerComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -791,7 +791,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("SpecimenDefinition#Additive", IsNestedType=true)]
+    [FhirType("SpecimenDefinition#Additive")]
     [BackboneType("SpecimenDefinition.typeTested.container.additive")]
     public partial class AdditiveComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -922,7 +922,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("SpecimenDefinition#Handling", IsNestedType=true)]
+    [FhirType("SpecimenDefinition#Handling")]
     [BackboneType("SpecimenDefinition.typeTested.handling")]
     public partial class HandlingComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/StructureMap.cs b/src/Hl7.Fhir.R4B/Model/Generated/StructureMap.cs
index 743796fd16..f3d2c14142 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/StructureMap.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/StructureMap.cs
@@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model
   /// </summary>
   [Serializable]
   [DataContract]
-  [FhirType("StructureMap","http://hl7.org/fhir/StructureDefinition/StructureMap", IsResource=true)]
+  [FhirType("StructureMap","http://hl7.org/fhir/StructureDefinition/StructureMap")]
   public partial class StructureMap : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -357,7 +357,7 @@ public enum StructureMapTransform
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("StructureMap#Structure", IsNestedType=true)]
+    [FhirType("StructureMap#Structure")]
     [BackboneType("StructureMap.structure")]
     public partial class StructureComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -634,7 +634,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("StructureMap#Group", IsNestedType=true)]
+    [FhirType("StructureMap#Group")]
     [BackboneType("StructureMap.group")]
     public partial class GroupComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -964,7 +964,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("StructureMap#Input", IsNestedType=true)]
+    [FhirType("StructureMap#Input")]
     [BackboneType("StructureMap.group.input")]
     public partial class InputComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1238,7 +1238,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("StructureMap#Rule", IsNestedType=true)]
+    [FhirType("StructureMap#Rule")]
     [BackboneType("StructureMap.group.rule")]
     public partial class RuleComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1527,7 +1527,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("StructureMap#Source", IsNestedType=true)]
+    [FhirType("StructureMap#Source")]
     [BackboneType("StructureMap.group.rule.source")]
     public partial class SourceComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2085,7 +2085,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("StructureMap#Target", IsNestedType=true)]
+    [FhirType("StructureMap#Target")]
     [BackboneType("StructureMap.group.rule.target")]
     public partial class TargetComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2517,7 +2517,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("StructureMap#Parameter", IsNestedType=true)]
+    [FhirType("StructureMap#Parameter")]
     [BackboneType("StructureMap.group.rule.target.parameter")]
     public partial class ParameterComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2643,7 +2643,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("StructureMap#Dependent", IsNestedType=true)]
+    [FhirType("StructureMap#Dependent")]
     [BackboneType("StructureMap.group.rule.dependent")]
     public partial class DependentComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Subscription.cs b/src/Hl7.Fhir.R4B/Model/Generated/Subscription.cs
index 60dedb0d4e..bc8a887958 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/Subscription.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/Subscription.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Subscription","http://hl7.org/fhir/StructureDefinition/Subscription", IsResource=true)]
+  [FhirType("Subscription","http://hl7.org/fhir/StructureDefinition/Subscription")]
   public partial class Subscription : Hl7.Fhir.Model.DomainResource
   {
     /// <summary>
@@ -107,7 +107,7 @@ public enum SubscriptionChannelType
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Subscription#Channel", IsNestedType=true)]
+    [FhirType("Subscription#Channel")]
     [BackboneType("Subscription.channel")]
     public partial class ChannelComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/SubscriptionStatus.cs b/src/Hl7.Fhir.R4B/Model/Generated/SubscriptionStatus.cs
index e68e588d21..f6640920ad 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/SubscriptionStatus.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/SubscriptionStatus.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("SubscriptionStatus","http://hl7.org/fhir/StructureDefinition/SubscriptionStatus", IsResource=true)]
+  [FhirType("SubscriptionStatus","http://hl7.org/fhir/StructureDefinition/SubscriptionStatus")]
   public partial class SubscriptionStatus : Hl7.Fhir.Model.DomainResource
   {
     /// <summary>
@@ -107,7 +107,7 @@ public enum SubscriptionNotificationType
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("SubscriptionStatus#NotificationEvent", IsNestedType=true)]
+    [FhirType("SubscriptionStatus#NotificationEvent")]
     [BackboneType("SubscriptionStatus.notificationEvent")]
     public partial class NotificationEventComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/SubscriptionTopic.cs b/src/Hl7.Fhir.R4B/Model/Generated/SubscriptionTopic.cs
index 84d1e057f9..38a86c89c0 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/SubscriptionTopic.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/SubscriptionTopic.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("SubscriptionTopic","http://hl7.org/fhir/StructureDefinition/SubscriptionTopic", IsResource=true)]
+  [FhirType("SubscriptionTopic","http://hl7.org/fhir/StructureDefinition/SubscriptionTopic")]
   public partial class SubscriptionTopic : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -217,7 +217,7 @@ public enum SubscriptionSearchModifier
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("SubscriptionTopic#ResourceTrigger", IsNestedType=true)]
+    [FhirType("SubscriptionTopic#ResourceTrigger")]
     [BackboneType("SubscriptionTopic.resourceTrigger")]
     public partial class ResourceTriggerComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -520,7 +520,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("SubscriptionTopic#QueryCriteria", IsNestedType=true)]
+    [FhirType("SubscriptionTopic#QueryCriteria")]
     [BackboneType("SubscriptionTopic.resourceTrigger.queryCriteria")]
     public partial class QueryCriteriaComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -840,7 +840,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("SubscriptionTopic#EventTrigger", IsNestedType=true)]
+    [FhirType("SubscriptionTopic#EventTrigger")]
     [BackboneType("SubscriptionTopic.eventTrigger")]
     public partial class EventTriggerComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1056,7 +1056,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("SubscriptionTopic#CanFilterBy", IsNestedType=true)]
+    [FhirType("SubscriptionTopic#CanFilterBy")]
     [BackboneType("SubscriptionTopic.canFilterBy")]
     public partial class CanFilterByComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1377,7 +1377,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("SubscriptionTopic#NotificationShape", IsNestedType=true)]
+    [FhirType("SubscriptionTopic#NotificationShape")]
     [BackboneType("SubscriptionTopic.notificationShape")]
     public partial class NotificationShapeComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Substance.cs b/src/Hl7.Fhir.R4B/Model/Generated/Substance.cs
index f7c5e28c21..60539ede0a 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/Substance.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/Substance.cs
@@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model
   /// </summary>
   [Serializable]
   [DataContract]
-  [FhirType("Substance","http://hl7.org/fhir/StructureDefinition/Substance", IsResource=true)]
+  [FhirType("Substance","http://hl7.org/fhir/StructureDefinition/Substance")]
   public partial class Substance : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -92,7 +92,7 @@ public enum FHIRSubstanceStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Substance#Instance", IsNestedType=true)]
+    [FhirType("Substance#Instance")]
     [BackboneType("Substance.instance")]
     public partial class InstanceComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -286,7 +286,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Substance#Ingredient", IsNestedType=true)]
+    [FhirType("Substance#Ingredient")]
     [BackboneType("Substance.ingredient")]
     public partial class IngredientComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/SubstanceDefinition.cs b/src/Hl7.Fhir.R4B/Model/Generated/SubstanceDefinition.cs
index e4a396cee3..62f55d1baa 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/SubstanceDefinition.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/SubstanceDefinition.cs
@@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model
   /// </summary>
   [Serializable]
   [DataContract]
-  [FhirType("SubstanceDefinition","http://hl7.org/fhir/StructureDefinition/SubstanceDefinition", IsResource=true)]
+  [FhirType("SubstanceDefinition","http://hl7.org/fhir/StructureDefinition/SubstanceDefinition")]
   public partial class SubstanceDefinition : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -61,7 +61,7 @@ public partial class SubstanceDefinition : Hl7.Fhir.Model.DomainResource, IIdent
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SubstanceDefinition#Moiety", IsNestedType=true)]
+    [FhirType("SubstanceDefinition#Moiety")]
     [BackboneType("SubstanceDefinition.moiety")]
     public partial class MoietyComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -400,7 +400,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SubstanceDefinition#Property", IsNestedType=true)]
+    [FhirType("SubstanceDefinition#Property")]
     [BackboneType("SubstanceDefinition.property")]
     public partial class PropertyComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -555,7 +555,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("SubstanceDefinition#MolecularWeight", IsNestedType=true)]
+    [FhirType("SubstanceDefinition#MolecularWeight")]
     [BackboneType("SubstanceDefinition.molecularWeight")]
     public partial class MolecularWeightComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -731,7 +731,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SubstanceDefinition#Structure", IsNestedType=true)]
+    [FhirType("SubstanceDefinition#Structure")]
     [BackboneType("SubstanceDefinition.structure")]
     public partial class StructureComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1073,7 +1073,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SubstanceDefinition#Representation", IsNestedType=true)]
+    [FhirType("SubstanceDefinition#Representation")]
     [BackboneType("SubstanceDefinition.structure.representation")]
     public partial class RepresentationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1293,7 +1293,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SubstanceDefinition#Code", IsNestedType=true)]
+    [FhirType("SubstanceDefinition#Code")]
     [BackboneType("SubstanceDefinition.code")]
     public partial class CodeComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1539,7 +1539,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SubstanceDefinition#Name", IsNestedType=true)]
+    [FhirType("SubstanceDefinition#Name")]
     [BackboneType("SubstanceDefinition.name")]
     public partial class NameComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1963,7 +1963,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SubstanceDefinition#Official", IsNestedType=true)]
+    [FhirType("SubstanceDefinition#Official")]
     [BackboneType("SubstanceDefinition.name.official")]
     public partial class OfficialComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2159,7 +2159,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("SubstanceDefinition#Relationship", IsNestedType=true)]
+    [FhirType("SubstanceDefinition#Relationship")]
     [BackboneType("SubstanceDefinition.relationship")]
     public partial class RelationshipComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2464,7 +2464,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("SubstanceDefinition#SourceMaterial", IsNestedType=true)]
+    [FhirType("SubstanceDefinition#SourceMaterial")]
     [BackboneType("SubstanceDefinition.sourceMaterial")]
     public partial class SourceMaterialComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/SupplyDelivery.cs b/src/Hl7.Fhir.R4B/Model/Generated/SupplyDelivery.cs
index 834bbf411d..7697334b86 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/SupplyDelivery.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/SupplyDelivery.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("SupplyDelivery","http://hl7.org/fhir/StructureDefinition/SupplyDelivery", IsResource=true)]
+  [FhirType("SupplyDelivery","http://hl7.org/fhir/StructureDefinition/SupplyDelivery")]
   public partial class SupplyDelivery : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -123,7 +123,7 @@ public enum SupplyItemType
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("SupplyDelivery#SuppliedItem", IsNestedType=true)]
+    [FhirType("SupplyDelivery#SuppliedItem")]
     [BackboneType("SupplyDelivery.suppliedItem")]
     public partial class SuppliedItemComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/SupplyRequest.cs b/src/Hl7.Fhir.R4B/Model/Generated/SupplyRequest.cs
index 82f00fd2af..5297902ca9 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/SupplyRequest.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/SupplyRequest.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("SupplyRequest","http://hl7.org/fhir/StructureDefinition/SupplyRequest", IsResource=true)]
+  [FhirType("SupplyRequest","http://hl7.org/fhir/StructureDefinition/SupplyRequest")]
   public partial class SupplyRequest : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -119,7 +119,7 @@ public enum SupplyRequestStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("SupplyRequest#Parameter", IsNestedType=true)]
+    [FhirType("SupplyRequest#Parameter")]
     [BackboneType("SupplyRequest.parameter")]
     public partial class ParameterComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Task.cs b/src/Hl7.Fhir.R4B/Model/Generated/Task.cs
index e60f380173..cf5d6b5576 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/Task.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/Task.cs
@@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model
   /// </summary>
   [Serializable]
   [DataContract]
-  [FhirType("Task","http://hl7.org/fhir/StructureDefinition/Task", IsResource=true)]
+  [FhirType("Task","http://hl7.org/fhir/StructureDefinition/Task")]
   public partial class Task : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -210,7 +210,7 @@ public enum TaskIntent
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Task#Restriction", IsNestedType=true)]
+    [FhirType("Task#Restriction")]
     [BackboneType("Task.restriction")]
     public partial class RestrictionComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -407,7 +407,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Task#Parameter", IsNestedType=true)]
+    [FhirType("Task#Parameter")]
     [BackboneType("Task.input")]
     public partial class ParameterComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -563,7 +563,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Task#Output", IsNestedType=true)]
+    [FhirType("Task#Output")]
     [BackboneType("Task.output")]
     public partial class OutputComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/TerminologyCapabilities.cs b/src/Hl7.Fhir.R4B/Model/Generated/TerminologyCapabilities.cs
index 35de459836..3cbb7ca80e 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/TerminologyCapabilities.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/TerminologyCapabilities.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("TerminologyCapabilities","http://hl7.org/fhir/StructureDefinition/TerminologyCapabilities", IsResource=true)]
+  [FhirType("TerminologyCapabilities","http://hl7.org/fhir/StructureDefinition/TerminologyCapabilities")]
   public partial class TerminologyCapabilities : Hl7.Fhir.Model.DomainResource
   {
     /// <summary>
@@ -89,7 +89,7 @@ public enum CodeSearchSupport
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TerminologyCapabilities#Software", IsNestedType=true)]
+    [FhirType("TerminologyCapabilities#Software")]
     [BackboneType("TerminologyCapabilities.software")]
     public partial class SoftwareComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -277,7 +277,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TerminologyCapabilities#Implementation", IsNestedType=true)]
+    [FhirType("TerminologyCapabilities#Implementation")]
     [BackboneType("TerminologyCapabilities.implementation")]
     public partial class ImplementationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -466,7 +466,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TerminologyCapabilities#CodeSystem", IsNestedType=true)]
+    [FhirType("TerminologyCapabilities#CodeSystem")]
     [BackboneType("TerminologyCapabilities.codeSystem")]
     public partial class CodeSystemComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -680,7 +680,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TerminologyCapabilities#Version", IsNestedType=true)]
+    [FhirType("TerminologyCapabilities#Version")]
     [BackboneType("TerminologyCapabilities.codeSystem.version")]
     public partial class VersionComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1021,7 +1021,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("TerminologyCapabilities#Filter", IsNestedType=true)]
+    [FhirType("TerminologyCapabilities#Filter")]
     [BackboneType("TerminologyCapabilities.codeSystem.version.filter")]
     public partial class FilterComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1207,7 +1207,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("TerminologyCapabilities#Expansion", IsNestedType=true)]
+    [FhirType("TerminologyCapabilities#Expansion")]
     [BackboneType("TerminologyCapabilities.expansion")]
     public partial class ExpansionComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1503,7 +1503,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("TerminologyCapabilities#Parameter", IsNestedType=true)]
+    [FhirType("TerminologyCapabilities#Parameter")]
     [BackboneType("TerminologyCapabilities.expansion.parameter")]
     public partial class ParameterComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1688,7 +1688,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("TerminologyCapabilities#ValidateCode", IsNestedType=true)]
+    [FhirType("TerminologyCapabilities#ValidateCode")]
     [BackboneType("TerminologyCapabilities.validateCode")]
     public partial class ValidateCodeComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1830,7 +1830,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("TerminologyCapabilities#Translation", IsNestedType=true)]
+    [FhirType("TerminologyCapabilities#Translation")]
     [BackboneType("TerminologyCapabilities.translation")]
     public partial class TranslationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1975,7 +1975,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TerminologyCapabilities#Closure", IsNestedType=true)]
+    [FhirType("TerminologyCapabilities#Closure")]
     [BackboneType("TerminologyCapabilities.closure")]
     public partial class ClosureComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/TestReport.cs b/src/Hl7.Fhir.R4B/Model/Generated/TestReport.cs
index 874dd68bc9..ff8f9479ea 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/TestReport.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/TestReport.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("TestReport","http://hl7.org/fhir/StructureDefinition/TestReport", IsResource=true)]
+  [FhirType("TestReport","http://hl7.org/fhir/StructureDefinition/TestReport")]
   public partial class TestReport : Hl7.Fhir.Model.DomainResource, IIdentifiable<Identifier>
   {
     /// <summary>
@@ -200,7 +200,7 @@ public enum TestReportActionResult
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("TestReport#Participant", IsNestedType=true)]
+    [FhirType("TestReport#Participant")]
     [BackboneType("TestReport.participant")]
     public partial class ParticipantComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -431,7 +431,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("TestReport#Setup", IsNestedType=true)]
+    [FhirType("TestReport#Setup")]
     [BackboneType("TestReport.setup")]
     public partial class SetupComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -559,7 +559,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestReport#SetupAction", IsNestedType=true)]
+    [FhirType("TestReport#SetupAction")]
     [BackboneType("TestReport.setup.action")]
     public partial class SetupActionComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -710,7 +710,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestReport#Operation", IsNestedType=true)]
+    [FhirType("TestReport#Operation")]
     [BackboneType("TestReport.setup.action.operation")]
     public partial class OperationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -943,7 +943,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestReport#Assert", IsNestedType=true)]
+    [FhirType("TestReport#Assert")]
     [BackboneType("TestReport.setup.action.assert")]
     public partial class AssertComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1173,7 +1173,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("TestReport#Test", IsNestedType=true)]
+    [FhirType("TestReport#Test")]
     [BackboneType("TestReport.test")]
     public partial class TestComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1387,7 +1387,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestReport#TestAction", IsNestedType=true)]
+    [FhirType("TestReport#TestAction")]
     [BackboneType("TestReport.test.action")]
     public partial class TestActionComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1538,7 +1538,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestReport#Teardown", IsNestedType=true)]
+    [FhirType("TestReport#Teardown")]
     [BackboneType("TestReport.teardown")]
     public partial class TeardownComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1666,7 +1666,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestReport#TeardownAction", IsNestedType=true)]
+    [FhirType("TestReport#TeardownAction")]
     [BackboneType("TestReport.teardown.action")]
     public partial class TeardownActionComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/TestScript.cs b/src/Hl7.Fhir.R4B/Model/Generated/TestScript.cs
index db61973e15..70a39965ad 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/TestScript.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/TestScript.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("TestScript","http://hl7.org/fhir/StructureDefinition/TestScript", IsResource=true)]
+  [FhirType("TestScript","http://hl7.org/fhir/StructureDefinition/TestScript")]
   public partial class TestScript : Hl7.Fhir.Model.DomainResource, IIdentifiable<Identifier>
   {
     /// <summary>
@@ -300,7 +300,7 @@ public enum AssertionResponseTypes
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#Origin", IsNestedType=true)]
+    [FhirType("TestScript#Origin")]
     [BackboneType("TestScript.origin")]
     public partial class OriginComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -473,7 +473,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#Destination", IsNestedType=true)]
+    [FhirType("TestScript#Destination")]
     [BackboneType("TestScript.destination")]
     public partial class DestinationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -645,7 +645,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#Metadata", IsNestedType=true)]
+    [FhirType("TestScript#Metadata")]
     [BackboneType("TestScript.metadata")]
     public partial class MetadataComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -798,7 +798,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#Link", IsNestedType=true)]
+    [FhirType("TestScript#Link")]
     [BackboneType("TestScript.metadata.link")]
     public partial class LinkComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -987,7 +987,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#Capability", IsNestedType=true)]
+    [FhirType("TestScript#Capability")]
     [BackboneType("TestScript.metadata.capability")]
     public partial class CapabilityComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1394,7 +1394,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#Fixture", IsNestedType=true)]
+    [FhirType("TestScript#Fixture")]
     [BackboneType("TestScript.fixture")]
     public partial class FixtureComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1611,7 +1611,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#Variable", IsNestedType=true)]
+    [FhirType("TestScript#Variable")]
     [BackboneType("TestScript.variable")]
     public partial class VariableComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2054,7 +2054,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#Setup", IsNestedType=true)]
+    [FhirType("TestScript#Setup")]
     [BackboneType("TestScript.setup")]
     public partial class SetupComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2182,7 +2182,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#SetupAction", IsNestedType=true)]
+    [FhirType("TestScript#SetupAction")]
     [BackboneType("TestScript.setup.action")]
     public partial class SetupActionComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2333,7 +2333,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#Operation", IsNestedType=true)]
+    [FhirType("TestScript#Operation")]
     [BackboneType("TestScript.setup.action.operation")]
     public partial class OperationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -3139,7 +3139,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#RequestHeader", IsNestedType=true)]
+    [FhirType("TestScript#RequestHeader")]
     [BackboneType("TestScript.setup.action.operation.requestHeader")]
     public partial class RequestHeaderComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -3329,7 +3329,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#Assert", IsNestedType=true)]
+    [FhirType("TestScript#Assert")]
     [BackboneType("TestScript.setup.action.assert")]
     public partial class AssertComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -4385,7 +4385,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#Test", IsNestedType=true)]
+    [FhirType("TestScript#Test")]
     [BackboneType("TestScript.test")]
     public partial class TestComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -4599,7 +4599,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#TestAction", IsNestedType=true)]
+    [FhirType("TestScript#TestAction")]
     [BackboneType("TestScript.test.action")]
     public partial class TestActionComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -4750,7 +4750,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#Teardown", IsNestedType=true)]
+    [FhirType("TestScript#Teardown")]
     [BackboneType("TestScript.teardown")]
     public partial class TeardownComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -4878,7 +4878,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#TeardownAction", IsNestedType=true)]
+    [FhirType("TestScript#TeardownAction")]
     [BackboneType("TestScript.teardown.action")]
     public partial class TeardownActionComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Timing.cs b/src/Hl7.Fhir.R4B/Model/Generated/Timing.cs
index 67a143ad88..c2da5044de 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/Timing.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/Timing.cs
@@ -287,7 +287,7 @@ public enum EventTiming
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Timing#Repeat", IsNestedType=true)]
+    [FhirType("Timing#Repeat")]
     [BackboneType("Timing.repeat")]
     public partial class RepeatComponent : Hl7.Fhir.Model.Element
     {
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/VerificationResult.cs b/src/Hl7.Fhir.R4B/Model/Generated/VerificationResult.cs
index 8d4116263c..5faade4f52 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/VerificationResult.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/VerificationResult.cs
@@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model
   /// </summary>
   [Serializable]
   [DataContract]
-  [FhirType("VerificationResult","http://hl7.org/fhir/StructureDefinition/VerificationResult", IsResource=true)]
+  [FhirType("VerificationResult","http://hl7.org/fhir/StructureDefinition/VerificationResult")]
   public partial class VerificationResult : Hl7.Fhir.Model.DomainResource
   {
     /// <summary>
@@ -107,7 +107,7 @@ public enum StatusCode
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("VerificationResult#PrimarySource", IsNestedType=true)]
+    [FhirType("VerificationResult#PrimarySource")]
     [BackboneType("VerificationResult.primarySource")]
     public partial class PrimarySourceComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -408,7 +408,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("VerificationResult#Attestation", IsNestedType=true)]
+    [FhirType("VerificationResult#Attestation")]
     [BackboneType("VerificationResult.attestation")]
     public partial class AttestationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -765,7 +765,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("VerificationResult#Validator", IsNestedType=true)]
+    [FhirType("VerificationResult#Validator")]
     [BackboneType("VerificationResult.validator")]
     public partial class ValidatorComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/VisionPrescription.cs b/src/Hl7.Fhir.R4B/Model/Generated/VisionPrescription.cs
index 567d27a4fc..c54e9636f3 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/VisionPrescription.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/VisionPrescription.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("VisionPrescription","http://hl7.org/fhir/StructureDefinition/VisionPrescription", IsResource=true)]
+  [FhirType("VisionPrescription","http://hl7.org/fhir/StructureDefinition/VisionPrescription")]
   public partial class VisionPrescription : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -123,7 +123,7 @@ public enum VisionBase
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("VisionPrescription#LensSpecification", IsNestedType=true)]
+    [FhirType("VisionPrescription#LensSpecification")]
     [BackboneType("VisionPrescription.lensSpecification")]
     public partial class LensSpecificationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -761,7 +761,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("VisionPrescription#Prism", IsNestedType=true)]
+    [FhirType("VisionPrescription#Prism")]
     [BackboneType("VisionPrescription.lensSpecification.prism")]
     public partial class PrismComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.R5/Model/Generated/Account.cs b/src/Hl7.Fhir.R5/Model/Generated/Account.cs
index 6d958f1877..fceee09945 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/Account.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/Account.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Account","http://hl7.org/fhir/StructureDefinition/Account", IsResource=true)]
+  [FhirType("Account","http://hl7.org/fhir/StructureDefinition/Account")]
   public partial class Account : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -109,7 +109,7 @@ public enum AccountStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Account#Coverage", IsNestedType=true)]
+    [FhirType("Account#Coverage")]
     [BackboneType("Account.coverage")]
     public partial class CoverageComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -248,6 +248,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "coverage":
+            Coverage = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          case "priority":
+            PriorityElement = (Hl7.Fhir.Model.PositiveInt)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -265,7 +281,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Account#Guarantor", IsNestedType=true)]
+    [FhirType("Account#Guarantor")]
     [BackboneType("Account.guarantor")]
     public partial class GuarantorComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -425,6 +441,25 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "party":
+            Party = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          case "onHold":
+            OnHoldElement = (Hl7.Fhir.Model.FhirBoolean)value;
+            return this;
+          case "period":
+            Period = (Hl7.Fhir.Model.Period)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -443,7 +478,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Account#Diagnosis", IsNestedType=true)]
+    [FhirType("Account#Diagnosis")]
     [BackboneType("Account.diagnosis")]
     public partial class DiagnosisComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -705,6 +740,34 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "sequence":
+            SequenceElement = (Hl7.Fhir.Model.PositiveInt)value;
+            return this;
+          case "condition":
+            Condition = (Hl7.Fhir.Model.CodeableReference)value;
+            return this;
+          case "dateOfDiagnosis":
+            DateOfDiagnosisElement = (Hl7.Fhir.Model.FhirDateTime)value;
+            return this;
+          case "type":
+            Type = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+            return this;
+          case "onAdmission":
+            OnAdmissionElement = (Hl7.Fhir.Model.FhirBoolean)value;
+            return this;
+          case "packageCode":
+            PackageCode = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -726,7 +789,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Account#Procedure", IsNestedType=true)]
+    [FhirType("Account#Procedure")]
     [BackboneType("Account.procedure")]
     public partial class ProcedureComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -972,6 +1035,34 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "sequence":
+            SequenceElement = (Hl7.Fhir.Model.PositiveInt)value;
+            return this;
+          case "code":
+            Code = (Hl7.Fhir.Model.CodeableReference)value;
+            return this;
+          case "dateOfService":
+            DateOfServiceElement = (Hl7.Fhir.Model.FhirDateTime)value;
+            return this;
+          case "type":
+            Type = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+            return this;
+          case "packageCode":
+            PackageCode = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+            return this;
+          case "device":
+            Device = (List<Hl7.Fhir.Model.ResourceReference>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -990,7 +1081,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Account#RelatedAccount", IsNestedType=true)]
+    [FhirType("Account#RelatedAccount")]
     [BackboneType("Account.relatedAccount")]
     public partial class RelatedAccountComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1112,6 +1203,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "relationship":
+            Relationship = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "account":
+            Account = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1130,7 +1237,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Account#Balance", IsNestedType=true)]
+    [FhirType("Account#Balance")]
     [BackboneType("Account.balance")]
     public partial class BalanceComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1311,6 +1418,28 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "aggregate":
+            Aggregate = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "term":
+            Term = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "estimate":
+            EstimateElement = (Hl7.Fhir.Model.FhirBoolean)value;
+            return this;
+          case "amount":
+            Amount = (Hl7.Fhir.Model.Money)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1838,6 +1967,67 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "status":
+          StatusElement = (Code<Hl7.Fhir.Model.Account.AccountStatus>)value;
+          return this;
+        case "billingStatus":
+          BillingStatus = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "type":
+          Type = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "name":
+          NameElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "subject":
+          Subject = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "servicePeriod":
+          ServicePeriod = (Hl7.Fhir.Model.Period)value;
+          return this;
+        case "coverage":
+          Coverage = (List<Hl7.Fhir.Model.Account.CoverageComponent>)value;
+          return this;
+        case "owner":
+          Owner = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "description":
+          DescriptionElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        case "guarantor":
+          Guarantor = (List<Hl7.Fhir.Model.Account.GuarantorComponent>)value;
+          return this;
+        case "diagnosis":
+          Diagnosis = (List<Hl7.Fhir.Model.Account.DiagnosisComponent>)value;
+          return this;
+        case "procedure":
+          Procedure = (List<Hl7.Fhir.Model.Account.ProcedureComponent>)value;
+          return this;
+        case "relatedAccount":
+          RelatedAccount = (List<Hl7.Fhir.Model.Account.RelatedAccountComponent>)value;
+          return this;
+        case "currency":
+          Currency = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "balance":
+          Balance = (List<Hl7.Fhir.Model.Account.BalanceComponent>)value;
+          return this;
+        case "calculatedAt":
+          CalculatedAtElement = (Hl7.Fhir.Model.Instant)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/ActivityDefinition.cs b/src/Hl7.Fhir.R5/Model/Generated/ActivityDefinition.cs
index 8c2fed7eb3..7f64ecaa13 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/ActivityDefinition.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/ActivityDefinition.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("ActivityDefinition","http://hl7.org/fhir/StructureDefinition/ActivityDefinition", IsResource=true)]
+  [FhirType("ActivityDefinition","http://hl7.org/fhir/StructureDefinition/ActivityDefinition")]
   public partial class ActivityDefinition : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -179,7 +179,7 @@ public enum RequestResourceTypes
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ActivityDefinition#Participant", IsNestedType=true)]
+    [FhirType("ActivityDefinition#Participant")]
     [BackboneType("ActivityDefinition.participant")]
     public partial class ParticipantComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -402,6 +402,31 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "type":
+            TypeElement = (Code<Hl7.Fhir.Model.ActionParticipantType>)value;
+            return this;
+          case "typeCanonical":
+            TypeCanonicalElement = (Hl7.Fhir.Model.Canonical)value;
+            return this;
+          case "typeReference":
+            TypeReference = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          case "role":
+            Role = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "function":
+            Function = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -423,7 +448,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ActivityDefinition#DynamicValue", IsNestedType=true)]
+    [FhirType("ActivityDefinition#DynamicValue")]
     [BackboneType("ActivityDefinition.dynamicValue")]
     public partial class DynamicValueComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -561,6 +586,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "path":
+            PathElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "expression":
+            Expression = (Hl7.Fhir.Model.Expression)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -2182,6 +2223,163 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "url":
+          UrlElement = (Hl7.Fhir.Model.FhirUri)value;
+          return this;
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "version":
+          VersionElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "versionAlgorithm":
+          VersionAlgorithm = (Hl7.Fhir.Model.DataType)value;
+          return this;
+        case "name":
+          NameElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "title":
+          TitleElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "subtitle":
+          SubtitleElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "status":
+          StatusElement = (Code<Hl7.Fhir.Model.PublicationStatus>)value;
+          return this;
+        case "experimental":
+          ExperimentalElement = (Hl7.Fhir.Model.FhirBoolean)value;
+          return this;
+        case "subject":
+          Subject = (Hl7.Fhir.Model.DataType)value;
+          return this;
+        case "date":
+          DateElement = (Hl7.Fhir.Model.FhirDateTime)value;
+          return this;
+        case "publisher":
+          PublisherElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "contact":
+          Contact = (List<Hl7.Fhir.Model.ContactDetail>)value;
+          return this;
+        case "description":
+          DescriptionElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        case "useContext":
+          UseContext = (List<Hl7.Fhir.Model.UsageContext>)value;
+          return this;
+        case "jurisdiction":
+          Jurisdiction = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "purpose":
+          PurposeElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        case "usage":
+          UsageElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        case "copyright":
+          CopyrightElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        case "copyrightLabel":
+          CopyrightLabelElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "approvalDate":
+          ApprovalDateElement = (Hl7.Fhir.Model.Date)value;
+          return this;
+        case "lastReviewDate":
+          LastReviewDateElement = (Hl7.Fhir.Model.Date)value;
+          return this;
+        case "effectivePeriod":
+          EffectivePeriod = (Hl7.Fhir.Model.Period)value;
+          return this;
+        case "topic":
+          Topic = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "author":
+          Author = (List<Hl7.Fhir.Model.ContactDetail>)value;
+          return this;
+        case "editor":
+          Editor = (List<Hl7.Fhir.Model.ContactDetail>)value;
+          return this;
+        case "reviewer":
+          Reviewer = (List<Hl7.Fhir.Model.ContactDetail>)value;
+          return this;
+        case "endorser":
+          Endorser = (List<Hl7.Fhir.Model.ContactDetail>)value;
+          return this;
+        case "relatedArtifact":
+          RelatedArtifact = (List<Hl7.Fhir.Model.RelatedArtifact>)value;
+          return this;
+        case "library":
+          LibraryElement = (List<Hl7.Fhir.Model.Canonical>)value;
+          return this;
+        case "kind":
+          KindElement = (Code<Hl7.Fhir.Model.ActivityDefinition.RequestResourceTypes>)value;
+          return this;
+        case "profile":
+          ProfileElement = (Hl7.Fhir.Model.Canonical)value;
+          return this;
+        case "code":
+          Code = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "intent":
+          IntentElement = (Code<Hl7.Fhir.Model.RequestIntent>)value;
+          return this;
+        case "priority":
+          PriorityElement = (Code<Hl7.Fhir.Model.RequestPriority>)value;
+          return this;
+        case "doNotPerform":
+          DoNotPerformElement = (Hl7.Fhir.Model.FhirBoolean)value;
+          return this;
+        case "timing":
+          Timing = (Hl7.Fhir.Model.DataType)value;
+          return this;
+        case "asNeeded":
+          AsNeeded = (Hl7.Fhir.Model.DataType)value;
+          return this;
+        case "location":
+          Location = (Hl7.Fhir.Model.CodeableReference)value;
+          return this;
+        case "participant":
+          Participant = (List<Hl7.Fhir.Model.ActivityDefinition.ParticipantComponent>)value;
+          return this;
+        case "product":
+          Product = (Hl7.Fhir.Model.DataType)value;
+          return this;
+        case "quantity":
+          Quantity = (Hl7.Fhir.Model.Quantity)value;
+          return this;
+        case "dosage":
+          Dosage = (List<Hl7.Fhir.Model.Dosage>)value;
+          return this;
+        case "bodySite":
+          BodySite = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "specimenRequirement":
+          SpecimenRequirementElement = (List<Hl7.Fhir.Model.Canonical>)value;
+          return this;
+        case "observationRequirement":
+          ObservationRequirementElement = (List<Hl7.Fhir.Model.Canonical>)value;
+          return this;
+        case "observationResultRequirement":
+          ObservationResultRequirementElement = (List<Hl7.Fhir.Model.Canonical>)value;
+          return this;
+        case "transform":
+          TransformElement = (Hl7.Fhir.Model.Canonical)value;
+          return this;
+        case "dynamicValue":
+          DynamicValue = (List<Hl7.Fhir.Model.ActivityDefinition.DynamicValueComponent>)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/ActorDefinition.cs b/src/Hl7.Fhir.R5/Model/Generated/ActorDefinition.cs
index 88cce8331a..3294b10b90 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/ActorDefinition.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/ActorDefinition.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("ActorDefinition","http://hl7.org/fhir/StructureDefinition/ActorDefinition", IsResource=true)]
+  [FhirType("ActorDefinition","http://hl7.org/fhir/StructureDefinition/ActorDefinition")]
   public partial class ActorDefinition : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -912,6 +912,82 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "url":
+          UrlElement = (Hl7.Fhir.Model.FhirUri)value;
+          return this;
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "version":
+          VersionElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "versionAlgorithm":
+          VersionAlgorithm = (Hl7.Fhir.Model.DataType)value;
+          return this;
+        case "name":
+          NameElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "title":
+          TitleElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "status":
+          StatusElement = (Code<Hl7.Fhir.Model.PublicationStatus>)value;
+          return this;
+        case "experimental":
+          ExperimentalElement = (Hl7.Fhir.Model.FhirBoolean)value;
+          return this;
+        case "date":
+          DateElement = (Hl7.Fhir.Model.FhirDateTime)value;
+          return this;
+        case "publisher":
+          PublisherElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "contact":
+          Contact = (List<Hl7.Fhir.Model.ContactDetail>)value;
+          return this;
+        case "description":
+          DescriptionElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        case "useContext":
+          UseContext = (List<Hl7.Fhir.Model.UsageContext>)value;
+          return this;
+        case "jurisdiction":
+          Jurisdiction = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "purpose":
+          PurposeElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        case "copyright":
+          CopyrightElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        case "copyrightLabel":
+          CopyrightLabelElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "type":
+          TypeElement = (Code<Hl7.Fhir.Model.ExampleScenarioActorType>)value;
+          return this;
+        case "documentation":
+          DocumentationElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        case "reference":
+          ReferenceElement = (List<Hl7.Fhir.Model.FhirUrl>)value;
+          return this;
+        case "capabilities":
+          CapabilitiesElement = (Hl7.Fhir.Model.Canonical)value;
+          return this;
+        case "derivedFrom":
+          DerivedFromElement = (List<Hl7.Fhir.Model.Canonical>)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/Address.cs b/src/Hl7.Fhir.R5/Model/Generated/Address.cs
index 31fc5f8d47..6ecb133d27 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/Address.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/Address.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -573,6 +573,46 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "use":
+          UseElement = (Code<Hl7.Fhir.Model.Address.AddressUse>)value;
+          return this;
+        case "type":
+          TypeElement = (Code<Hl7.Fhir.Model.Address.AddressType>)value;
+          return this;
+        case "text":
+          TextElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "line":
+          LineElement = (List<Hl7.Fhir.Model.FhirString>)value;
+          return this;
+        case "city":
+          CityElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "district":
+          DistrictElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "state":
+          StateElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "postalCode":
+          PostalCodeElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "country":
+          CountryElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "period":
+          Period = (Hl7.Fhir.Model.Period)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/AdministrableProductDefinition.cs b/src/Hl7.Fhir.R5/Model/Generated/AdministrableProductDefinition.cs
index f78802a152..1887e38a3c 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/AdministrableProductDefinition.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/AdministrableProductDefinition.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("AdministrableProductDefinition","http://hl7.org/fhir/StructureDefinition/AdministrableProductDefinition", IsResource=true)]
+  [FhirType("AdministrableProductDefinition","http://hl7.org/fhir/StructureDefinition/AdministrableProductDefinition")]
   public partial class AdministrableProductDefinition : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -64,7 +64,7 @@ public partial class AdministrableProductDefinition : Hl7.Fhir.Model.DomainResou
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("AdministrableProductDefinition#Property", IsNestedType=true)]
+    [FhirType("AdministrableProductDefinition#Property")]
     [BackboneType("AdministrableProductDefinition.property")]
     public partial class PropertyComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -209,6 +209,25 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "type":
+            Type = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "value":
+            Value = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          case "status":
+            Status = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -227,7 +246,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("AdministrableProductDefinition#RouteOfAdministration", IsNestedType=true)]
+    [FhirType("AdministrableProductDefinition#RouteOfAdministration")]
     [BackboneType("AdministrableProductDefinition.routeOfAdministration")]
     public partial class RouteOfAdministrationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -453,6 +472,37 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "code":
+            Code = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "firstDose":
+            FirstDose = (Hl7.Fhir.Model.Quantity)value;
+            return this;
+          case "maxSingleDose":
+            MaxSingleDose = (Hl7.Fhir.Model.Quantity)value;
+            return this;
+          case "maxDosePerDay":
+            MaxDosePerDay = (Hl7.Fhir.Model.Quantity)value;
+            return this;
+          case "maxDosePerTreatmentPeriod":
+            MaxDosePerTreatmentPeriod = (Hl7.Fhir.Model.Ratio)value;
+            return this;
+          case "maxTreatmentPeriod":
+            MaxTreatmentPeriod = (Hl7.Fhir.Model.Duration)value;
+            return this;
+          case "targetSpecies":
+            TargetSpecies = (List<Hl7.Fhir.Model.AdministrableProductDefinition.TargetSpeciesComponent>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -472,7 +522,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("AdministrableProductDefinition#TargetSpecies", IsNestedType=true)]
+    [FhirType("AdministrableProductDefinition#TargetSpecies")]
     [BackboneType("AdministrableProductDefinition.routeOfAdministration.targetSpecies")]
     public partial class TargetSpeciesComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -593,6 +643,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "code":
+            Code = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "withdrawalPeriod":
+            WithdrawalPeriod = (List<Hl7.Fhir.Model.AdministrableProductDefinition.WithdrawalPeriodComponent>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -607,7 +673,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("AdministrableProductDefinition#WithdrawalPeriod", IsNestedType=true)]
+    [FhirType("AdministrableProductDefinition#WithdrawalPeriod")]
     [BackboneType("AdministrableProductDefinition.routeOfAdministration.targetSpecies.withdrawalPeriod")]
     public partial class WithdrawalPeriodComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -767,6 +833,25 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "tissue":
+            Tissue = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "value":
+            Value = (Hl7.Fhir.Model.Quantity)value;
+            return this;
+          case "supportingInformation":
+            SupportingInformationElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1131,6 +1216,49 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "status":
+          StatusElement = (Code<Hl7.Fhir.Model.PublicationStatus>)value;
+          return this;
+        case "formOf":
+          FormOf = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "administrableDoseForm":
+          AdministrableDoseForm = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "unitOfPresentation":
+          UnitOfPresentation = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "producedFrom":
+          ProducedFrom = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "ingredient":
+          Ingredient = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "device":
+          Device = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "description":
+          DescriptionElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        case "property":
+          Property = (List<Hl7.Fhir.Model.AdministrableProductDefinition.PropertyComponent>)value;
+          return this;
+        case "routeOfAdministration":
+          RouteOfAdministration = (List<Hl7.Fhir.Model.AdministrableProductDefinition.RouteOfAdministrationComponent>)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/AdverseEvent.cs b/src/Hl7.Fhir.R5/Model/Generated/AdverseEvent.cs
index 8cd4f3dc71..9d62ac7bba 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/AdverseEvent.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/AdverseEvent.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("AdverseEvent","http://hl7.org/fhir/StructureDefinition/AdverseEvent", IsResource=true)]
+  [FhirType("AdverseEvent","http://hl7.org/fhir/StructureDefinition/AdverseEvent")]
   public partial class AdverseEvent : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -123,7 +123,7 @@ public enum AdverseEventActuality
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("AdverseEvent#Participant", IsNestedType=true)]
+    [FhirType("AdverseEvent#Participant")]
     [BackboneType("AdverseEvent.participant")]
     public partial class ParticipantComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -245,6 +245,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "function":
+            Function = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "actor":
+            Actor = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -262,7 +278,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("AdverseEvent#SuspectEntity", IsNestedType=true)]
+    [FhirType("AdverseEvent#SuspectEntity")]
     [BackboneType("AdverseEvent.suspectEntity")]
     public partial class SuspectEntityComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -384,6 +400,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "instance":
+            Instance = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          case "causality":
+            Causality = (Hl7.Fhir.Model.AdverseEvent.CausalityComponent)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -398,7 +430,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("AdverseEvent#Causality", IsNestedType=true)]
+    [FhirType("AdverseEvent#Causality")]
     [BackboneType("AdverseEvent.suspectEntity.causality")]
     public partial class CausalityComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -541,6 +573,25 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "assessmentMethod":
+            AssessmentMethod = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "entityRelatedness":
+            EntityRelatedness = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "author":
+            Author = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -559,7 +610,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("AdverseEvent#ContributingFactor", IsNestedType=true)]
+    [FhirType("AdverseEvent#ContributingFactor")]
     [BackboneType("AdverseEvent.contributingFactor")]
     public partial class ContributingFactorComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -661,6 +712,19 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "item":
+            Item = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -674,7 +738,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("AdverseEvent#PreventiveAction", IsNestedType=true)]
+    [FhirType("AdverseEvent#PreventiveAction")]
     [BackboneType("AdverseEvent.preventiveAction")]
     public partial class PreventiveActionComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -776,6 +840,19 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "item":
+            Item = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -792,7 +869,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("AdverseEvent#MitigatingAction", IsNestedType=true)]
+    [FhirType("AdverseEvent#MitigatingAction")]
     [BackboneType("AdverseEvent.mitigatingAction")]
     public partial class MitigatingActionComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -894,6 +971,19 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "item":
+            Item = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -907,7 +997,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("AdverseEvent#SupportingInfo", IsNestedType=true)]
+    [FhirType("AdverseEvent#SupportingInfo")]
     [BackboneType("AdverseEvent.supportingInfo")]
     public partial class SupportingInfoComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1009,6 +1099,19 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "item":
+            Item = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1717,6 +1820,88 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "status":
+          StatusElement = (Code<Hl7.Fhir.Model.AdverseEvent.AdverseEventStatus>)value;
+          return this;
+        case "actuality":
+          ActualityElement = (Code<Hl7.Fhir.Model.AdverseEvent.AdverseEventActuality>)value;
+          return this;
+        case "category":
+          Category = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "code":
+          Code = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "subject":
+          Subject = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "encounter":
+          Encounter = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "occurrence":
+          Occurrence = (Hl7.Fhir.Model.DataType)value;
+          return this;
+        case "detected":
+          DetectedElement = (Hl7.Fhir.Model.FhirDateTime)value;
+          return this;
+        case "recordedDate":
+          RecordedDateElement = (Hl7.Fhir.Model.FhirDateTime)value;
+          return this;
+        case "resultingEffect":
+          ResultingEffect = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "location":
+          Location = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "seriousness":
+          Seriousness = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "outcome":
+          Outcome = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "recorder":
+          Recorder = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "participant":
+          Participant = (List<Hl7.Fhir.Model.AdverseEvent.ParticipantComponent>)value;
+          return this;
+        case "study":
+          Study = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "expectedInResearchStudy":
+          ExpectedInResearchStudyElement = (Hl7.Fhir.Model.FhirBoolean)value;
+          return this;
+        case "suspectEntity":
+          SuspectEntity = (List<Hl7.Fhir.Model.AdverseEvent.SuspectEntityComponent>)value;
+          return this;
+        case "contributingFactor":
+          ContributingFactor = (List<Hl7.Fhir.Model.AdverseEvent.ContributingFactorComponent>)value;
+          return this;
+        case "preventiveAction":
+          PreventiveAction = (List<Hl7.Fhir.Model.AdverseEvent.PreventiveActionComponent>)value;
+          return this;
+        case "mitigatingAction":
+          MitigatingAction = (List<Hl7.Fhir.Model.AdverseEvent.MitigatingActionComponent>)value;
+          return this;
+        case "supportingInfo":
+          SupportingInfo = (List<Hl7.Fhir.Model.AdverseEvent.SupportingInfoComponent>)value;
+          return this;
+        case "note":
+          Note = (List<Hl7.Fhir.Model.Annotation>)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/Age.cs b/src/Hl7.Fhir.R5/Model/Generated/Age.cs
index f2fe37d86c..f735c61e61 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/Age.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/Age.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/AllergyIntolerance.cs b/src/Hl7.Fhir.R5/Model/Generated/AllergyIntolerance.cs
index a045e45f04..a638ea57cd 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/AllergyIntolerance.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/AllergyIntolerance.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("AllergyIntolerance","http://hl7.org/fhir/StructureDefinition/AllergyIntolerance", IsResource=true)]
+  [FhirType("AllergyIntolerance","http://hl7.org/fhir/StructureDefinition/AllergyIntolerance")]
   public partial class AllergyIntolerance : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -226,7 +226,7 @@ public enum AllergyIntoleranceSeverity
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("AllergyIntolerance#Participant", IsNestedType=true)]
+    [FhirType("AllergyIntolerance#Participant")]
     [BackboneType("AllergyIntolerance.participant")]
     public partial class ParticipantComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -348,6 +348,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "function":
+            Function = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "actor":
+            Actor = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -365,7 +381,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("AllergyIntolerance#Reaction", IsNestedType=true)]
+    [FhirType("AllergyIntolerance#Reaction")]
     [BackboneType("AllergyIntolerance.reaction")]
     public partial class ReactionComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -649,6 +665,37 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "substance":
+            Substance = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "manifestation":
+            Manifestation = (List<Hl7.Fhir.Model.CodeableReference>)value;
+            return this;
+          case "description":
+            DescriptionElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "onset":
+            OnsetElement = (Hl7.Fhir.Model.FhirDateTime)value;
+            return this;
+          case "severity":
+            SeverityElement = (Code<Hl7.Fhir.Model.AllergyIntolerance.AllergyIntoleranceSeverity>)value;
+            return this;
+          case "exposureRoute":
+            ExposureRoute = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "note":
+            Note = (List<Hl7.Fhir.Model.Annotation>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1139,6 +1186,61 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "clinicalStatus":
+          ClinicalStatus = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "verificationStatus":
+          VerificationStatus = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "type":
+          Type = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "category":
+          CategoryElement = (List<Code<Hl7.Fhir.Model.AllergyIntolerance.AllergyIntoleranceCategory>>)value;
+          return this;
+        case "criticality":
+          CriticalityElement = (Code<Hl7.Fhir.Model.AllergyIntolerance.AllergyIntoleranceCriticality>)value;
+          return this;
+        case "code":
+          Code = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "patient":
+          Patient = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "encounter":
+          Encounter = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "onset":
+          Onset = (Hl7.Fhir.Model.DataType)value;
+          return this;
+        case "recordedDate":
+          RecordedDateElement = (Hl7.Fhir.Model.FhirDateTime)value;
+          return this;
+        case "participant":
+          Participant = (List<Hl7.Fhir.Model.AllergyIntolerance.ParticipantComponent>)value;
+          return this;
+        case "lastOccurrence":
+          LastOccurrenceElement = (Hl7.Fhir.Model.FhirDateTime)value;
+          return this;
+        case "note":
+          Note = (List<Hl7.Fhir.Model.Annotation>)value;
+          return this;
+        case "reaction":
+          Reaction = (List<Hl7.Fhir.Model.AllergyIntolerance.ReactionComponent>)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/Annotation.cs b/src/Hl7.Fhir.R5/Model/Generated/Annotation.cs
index c2d031a688..0a456a730d 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/Annotation.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/Annotation.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -230,6 +230,25 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "author":
+          Author = (Hl7.Fhir.Model.DataType)value;
+          return this;
+        case "time":
+          TimeElement = (Hl7.Fhir.Model.FhirDateTime)value;
+          return this;
+        case "text":
+          TextElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/Appointment.cs b/src/Hl7.Fhir.R5/Model/Generated/Appointment.cs
index f293b160d6..baf6afebfb 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/Appointment.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/Appointment.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model
   /// </summary>
   [Serializable]
   [DataContract]
-  [FhirType("Appointment","http://hl7.org/fhir/StructureDefinition/Appointment", IsResource=true)]
+  [FhirType("Appointment","http://hl7.org/fhir/StructureDefinition/Appointment")]
   public partial class Appointment : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -3032,7 +3032,7 @@ public enum WeekOfMonth
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Appointment#Participant", IsNestedType=true)]
+    [FhirType("Appointment#Participant")]
     [BackboneType("Appointment.participant")]
     public partial class ParticipantComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -3256,6 +3256,31 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "type":
+            Type = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+            return this;
+          case "period":
+            Period = (Hl7.Fhir.Model.Period)value;
+            return this;
+          case "actor":
+            Actor = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          case "required":
+            RequiredElement = (Hl7.Fhir.Model.FhirBoolean)value;
+            return this;
+          case "status":
+            StatusElement = (Code<Hl7.Fhir.Model.Appointment.ParticipationStatus>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -3276,7 +3301,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Appointment#RecurrenceTemplate", IsNestedType=true)]
+    [FhirType("Appointment#RecurrenceTemplate")]
     [BackboneType("Appointment.recurrenceTemplate")]
     public partial class RecurrenceTemplateComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -3658,6 +3683,46 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "timezone":
+            Timezone = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "recurrenceType":
+            RecurrenceType = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "lastOccurrenceDate":
+            LastOccurrenceDateElement = (Hl7.Fhir.Model.Date)value;
+            return this;
+          case "occurrenceCount":
+            OccurrenceCountElement = (Hl7.Fhir.Model.PositiveInt)value;
+            return this;
+          case "occurrenceDate":
+            OccurrenceDateElement = (List<Hl7.Fhir.Model.Date>)value;
+            return this;
+          case "weeklyTemplate":
+            WeeklyTemplate = (Hl7.Fhir.Model.Appointment.WeeklyTemplateComponent)value;
+            return this;
+          case "monthlyTemplate":
+            MonthlyTemplate = (Hl7.Fhir.Model.Appointment.MonthlyTemplateComponent)value;
+            return this;
+          case "yearlyTemplate":
+            YearlyTemplate = (Hl7.Fhir.Model.Appointment.YearlyTemplateComponent)value;
+            return this;
+          case "excludingDate":
+            ExcludingDateElement = (List<Hl7.Fhir.Model.Date>)value;
+            return this;
+          case "excludingRecurrenceId":
+            ExcludingRecurrenceIdElement = (List<Hl7.Fhir.Model.PositiveInt>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -3680,7 +3745,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Appointment#WeeklyTemplate", IsNestedType=true)]
+    [FhirType("Appointment#WeeklyTemplate")]
     [BackboneType("Appointment.recurrenceTemplate.weeklyTemplate")]
     public partial class WeeklyTemplateComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -4068,6 +4133,40 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "monday":
+            MondayElement = (Hl7.Fhir.Model.FhirBoolean)value;
+            return this;
+          case "tuesday":
+            TuesdayElement = (Hl7.Fhir.Model.FhirBoolean)value;
+            return this;
+          case "wednesday":
+            WednesdayElement = (Hl7.Fhir.Model.FhirBoolean)value;
+            return this;
+          case "thursday":
+            ThursdayElement = (Hl7.Fhir.Model.FhirBoolean)value;
+            return this;
+          case "friday":
+            FridayElement = (Hl7.Fhir.Model.FhirBoolean)value;
+            return this;
+          case "saturday":
+            SaturdayElement = (Hl7.Fhir.Model.FhirBoolean)value;
+            return this;
+          case "sunday":
+            SundayElement = (Hl7.Fhir.Model.FhirBoolean)value;
+            return this;
+          case "weekInterval":
+            WeekIntervalElement = (Hl7.Fhir.Model.PositiveInt)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -4088,7 +4187,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Appointment#MonthlyTemplate", IsNestedType=true)]
+    [FhirType("Appointment#MonthlyTemplate")]
     [BackboneType("Appointment.recurrenceTemplate.monthlyTemplate")]
     public partial class MonthlyTemplateComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -4287,6 +4386,28 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "dayOfMonth":
+            DayOfMonthElement = (Hl7.Fhir.Model.PositiveInt)value;
+            return this;
+          case "nthWeekOfMonth":
+            NthWeekOfMonth = (Hl7.Fhir.Model.Coding)value;
+            return this;
+          case "dayOfWeek":
+            DayOfWeek = (Hl7.Fhir.Model.Coding)value;
+            return this;
+          case "monthInterval":
+            MonthIntervalElement = (Hl7.Fhir.Model.PositiveInt)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -4303,7 +4424,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Appointment#YearlyTemplate", IsNestedType=true)]
+    [FhirType("Appointment#YearlyTemplate")]
     [BackboneType("Appointment.recurrenceTemplate.yearlyTemplate")]
     public partial class YearlyTemplateComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -4419,6 +4540,19 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "yearInterval":
+            YearIntervalElement = (Hl7.Fhir.Model.PositiveInt)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -5374,6 +5508,112 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "status":
+          StatusElement = (Code<Hl7.Fhir.Model.Appointment.AppointmentStatus>)value;
+          return this;
+        case "cancellationReason":
+          CancellationReason = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "class":
+          Class = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "serviceCategory":
+          ServiceCategory = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "serviceType":
+          ServiceType = (List<Hl7.Fhir.Model.CodeableReference>)value;
+          return this;
+        case "specialty":
+          Specialty = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "appointmentType":
+          AppointmentType = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "reason":
+          Reason = (List<Hl7.Fhir.Model.CodeableReference>)value;
+          return this;
+        case "priority":
+          Priority = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "description":
+          DescriptionElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "replaces":
+          Replaces = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "virtualService":
+          VirtualService = (List<Hl7.Fhir.Model.VirtualServiceDetail>)value;
+          return this;
+        case "supportingInformation":
+          SupportingInformation = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "previousAppointment":
+          PreviousAppointment = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "originatingAppointment":
+          OriginatingAppointment = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "start":
+          StartElement = (Hl7.Fhir.Model.Instant)value;
+          return this;
+        case "end":
+          EndElement = (Hl7.Fhir.Model.Instant)value;
+          return this;
+        case "minutesDuration":
+          MinutesDurationElement = (Hl7.Fhir.Model.PositiveInt)value;
+          return this;
+        case "requestedPeriod":
+          RequestedPeriod = (List<Hl7.Fhir.Model.Period>)value;
+          return this;
+        case "slot":
+          Slot = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "account":
+          Account = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "created":
+          CreatedElement = (Hl7.Fhir.Model.FhirDateTime)value;
+          return this;
+        case "cancellationDate":
+          CancellationDateElement = (Hl7.Fhir.Model.FhirDateTime)value;
+          return this;
+        case "note":
+          Note = (List<Hl7.Fhir.Model.Annotation>)value;
+          return this;
+        case "patientInstruction":
+          PatientInstruction = (List<Hl7.Fhir.Model.CodeableReference>)value;
+          return this;
+        case "basedOn":
+          BasedOn = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "subject":
+          Subject = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "participant":
+          Participant = (List<Hl7.Fhir.Model.Appointment.ParticipantComponent>)value;
+          return this;
+        case "recurrenceId":
+          RecurrenceIdElement = (Hl7.Fhir.Model.PositiveInt)value;
+          return this;
+        case "occurrenceChanged":
+          OccurrenceChangedElement = (Hl7.Fhir.Model.FhirBoolean)value;
+          return this;
+        case "recurrenceTemplate":
+          RecurrenceTemplate = (List<Hl7.Fhir.Model.Appointment.RecurrenceTemplateComponent>)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/AppointmentResponse.cs b/src/Hl7.Fhir.R5/Model/Generated/AppointmentResponse.cs
index 97685f7781..cea5320920 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/AppointmentResponse.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/AppointmentResponse.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model
   /// </summary>
   [Serializable]
   [DataContract]
-  [FhirType("AppointmentResponse","http://hl7.org/fhir/StructureDefinition/AppointmentResponse", IsResource=true)]
+  [FhirType("AppointmentResponse","http://hl7.org/fhir/StructureDefinition/AppointmentResponse")]
   public partial class AppointmentResponse : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -572,6 +572,52 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "appointment":
+          Appointment = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "proposedNewTime":
+          ProposedNewTimeElement = (Hl7.Fhir.Model.FhirBoolean)value;
+          return this;
+        case "start":
+          StartElement = (Hl7.Fhir.Model.Instant)value;
+          return this;
+        case "end":
+          EndElement = (Hl7.Fhir.Model.Instant)value;
+          return this;
+        case "participantType":
+          ParticipantType = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "actor":
+          Actor = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "participantStatus":
+          ParticipantStatusElement = (Code<Hl7.Fhir.Model.AppointmentResponse.AppointmentResponseStatus>)value;
+          return this;
+        case "comment":
+          CommentElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        case "recurring":
+          RecurringElement = (Hl7.Fhir.Model.FhirBoolean)value;
+          return this;
+        case "occurrenceDate":
+          OccurrenceDateElement = (Hl7.Fhir.Model.Date)value;
+          return this;
+        case "recurrenceId":
+          RecurrenceIdElement = (Hl7.Fhir.Model.PositiveInt)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/ArtifactAssessment.cs b/src/Hl7.Fhir.R5/Model/Generated/ArtifactAssessment.cs
index 46cb33d1bb..4c547a3230 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/ArtifactAssessment.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/ArtifactAssessment.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("ArtifactAssessment","http://hl7.org/fhir/StructureDefinition/ArtifactAssessment", IsResource=true)]
+  [FhirType("ArtifactAssessment","http://hl7.org/fhir/StructureDefinition/ArtifactAssessment")]
   public partial class ArtifactAssessment : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -223,7 +223,7 @@ public enum ArtifactAssessmentInformationType
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ArtifactAssessment#Content", IsNestedType=true)]
+    [FhirType("ArtifactAssessment#Content")]
     [BackboneType("ArtifactAssessment.content")]
     public partial class ContentComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -591,6 +591,46 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "informationType":
+            InformationTypeElement = (Code<Hl7.Fhir.Model.ArtifactAssessment.ArtifactAssessmentInformationType>)value;
+            return this;
+          case "summary":
+            SummaryElement = (Hl7.Fhir.Model.Markdown)value;
+            return this;
+          case "type":
+            Type = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "classifier":
+            Classifier = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+            return this;
+          case "quantity":
+            Quantity = (Hl7.Fhir.Model.Quantity)value;
+            return this;
+          case "author":
+            Author = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          case "path":
+            PathElement = (List<Hl7.Fhir.Model.FhirUri>)value;
+            return this;
+          case "relatedArtifact":
+            RelatedArtifact = (List<Hl7.Fhir.Model.RelatedArtifact>)value;
+            return this;
+          case "freeToShare":
+            FreeToShareElement = (Hl7.Fhir.Model.FhirBoolean)value;
+            return this;
+          case "component":
+            Component = (List<Hl7.Fhir.Model.ArtifactAssessment.ContentComponent>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1047,6 +1087,49 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "title":
+          TitleElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "citeAs":
+          CiteAs = (Hl7.Fhir.Model.DataType)value;
+          return this;
+        case "date":
+          DateElement = (Hl7.Fhir.Model.FhirDateTime)value;
+          return this;
+        case "copyright":
+          CopyrightElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        case "approvalDate":
+          ApprovalDateElement = (Hl7.Fhir.Model.Date)value;
+          return this;
+        case "lastReviewDate":
+          LastReviewDateElement = (Hl7.Fhir.Model.Date)value;
+          return this;
+        case "artifact":
+          Artifact = (Hl7.Fhir.Model.DataType)value;
+          return this;
+        case "content":
+          Content = (List<Hl7.Fhir.Model.ArtifactAssessment.ContentComponent>)value;
+          return this;
+        case "workflowStatus":
+          WorkflowStatusElement = (Code<Hl7.Fhir.Model.ArtifactAssessment.ArtifactAssessmentWorkflowStatus>)value;
+          return this;
+        case "disposition":
+          DispositionElement = (Code<Hl7.Fhir.Model.ArtifactAssessment.ArtifactAssessmentDisposition>)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/AuditEvent.cs b/src/Hl7.Fhir.R5/Model/Generated/AuditEvent.cs
index 2f05ff59ad..d5537e8222 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/AuditEvent.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/AuditEvent.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("AuditEvent","http://hl7.org/fhir/StructureDefinition/AuditEvent", IsResource=true)]
+  [FhirType("AuditEvent","http://hl7.org/fhir/StructureDefinition/AuditEvent")]
   public partial class AuditEvent : Hl7.Fhir.Model.DomainResource
   {
     /// <summary>
@@ -167,7 +167,7 @@ public enum AuditEventSeverity
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("AuditEvent#Outcome", IsNestedType=true)]
+    [FhirType("AuditEvent#Outcome")]
     [BackboneType("AuditEvent.outcome")]
     public partial class OutcomeComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -289,6 +289,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "code":
+            Code = (Hl7.Fhir.Model.Coding)value;
+            return this;
+          case "detail":
+            Detail = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -309,7 +325,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("AuditEvent#Agent", IsNestedType=true)]
+    [FhirType("AuditEvent#Agent")]
     [BackboneType("AuditEvent.agent")]
     public partial class AgentComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -603,6 +619,40 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "type":
+            Type = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "role":
+            Role = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+            return this;
+          case "who":
+            Who = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          case "requestor":
+            RequestorElement = (Hl7.Fhir.Model.FhirBoolean)value;
+            return this;
+          case "location":
+            Location = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          case "policy":
+            PolicyElement = (List<Hl7.Fhir.Model.FhirUri>)value;
+            return this;
+          case "network":
+            Network = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          case "authorization":
+            Authorization = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -627,7 +677,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("AuditEvent#Source", IsNestedType=true)]
+    [FhirType("AuditEvent#Source")]
     [BackboneType("AuditEvent.source")]
     public partial class SourceComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -773,6 +823,25 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "site":
+            Site = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          case "observer":
+            Observer = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          case "type":
+            Type = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -792,7 +861,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("AuditEvent#Entity", IsNestedType=true)]
+    [FhirType("AuditEvent#Entity")]
     [BackboneType("AuditEvent.entity")]
     public partial class EntityComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1019,6 +1088,34 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "what":
+            What = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          case "role":
+            Role = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "securityLabel":
+            SecurityLabel = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+            return this;
+          case "query":
+            QueryElement = (Hl7.Fhir.Model.Base64Binary)value;
+            return this;
+          case "detail":
+            Detail = (List<Hl7.Fhir.Model.AuditEvent.DetailComponent>)value;
+            return this;
+          case "agent":
+            Agent = (List<Hl7.Fhir.Model.AuditEvent.AgentComponent>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1040,7 +1137,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("AuditEvent#Detail", IsNestedType=true)]
+    [FhirType("AuditEvent#Detail")]
     [BackboneType("AuditEvent.entity.detail")]
     public partial class DetailComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1163,6 +1260,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "type":
+            Type = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "value":
+            Value = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1610,6 +1723,58 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "category":
+          Category = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "code":
+          Code = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "action":
+          ActionElement = (Code<Hl7.Fhir.Model.AuditEvent.AuditEventAction>)value;
+          return this;
+        case "severity":
+          SeverityElement = (Code<Hl7.Fhir.Model.AuditEvent.AuditEventSeverity>)value;
+          return this;
+        case "occurred":
+          Occurred = (Hl7.Fhir.Model.DataType)value;
+          return this;
+        case "recorded":
+          RecordedElement = (Hl7.Fhir.Model.Instant)value;
+          return this;
+        case "outcome":
+          Outcome = (Hl7.Fhir.Model.AuditEvent.OutcomeComponent)value;
+          return this;
+        case "authorization":
+          Authorization = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "basedOn":
+          BasedOn = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "patient":
+          Patient = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "encounter":
+          Encounter = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "agent":
+          Agent = (List<Hl7.Fhir.Model.AuditEvent.AgentComponent>)value;
+          return this;
+        case "source":
+          Source = (Hl7.Fhir.Model.AuditEvent.SourceComponent)value;
+          return this;
+        case "entity":
+          Entity = (List<Hl7.Fhir.Model.AuditEvent.EntityComponent>)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/Availability.cs b/src/Hl7.Fhir.R5/Model/Generated/Availability.cs
index 197e9039f2..e2408f8076 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/Availability.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/Availability.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -61,7 +61,7 @@ public partial class Availability : Hl7.Fhir.Model.DataType
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Availability#AvailableTime", IsNestedType=true)]
+    [FhirType("Availability#AvailableTime")]
     [BackboneType("Availability.availableTime")]
     public partial class AvailableTimeComponent : Hl7.Fhir.Model.Element
     {
@@ -296,6 +296,28 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "daysOfWeek":
+            DaysOfWeekElement = (List<Code<Hl7.Fhir.Model.DaysOfWeek>>)value;
+            return this;
+          case "allDay":
+            AllDayElement = (Hl7.Fhir.Model.FhirBoolean)value;
+            return this;
+          case "availableStartTime":
+            AvailableStartTimeElement = (Hl7.Fhir.Model.Time)value;
+            return this;
+          case "availableEndTime":
+            AvailableEndTimeElement = (Hl7.Fhir.Model.Time)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -312,7 +334,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Availability#NotAvailableTime", IsNestedType=true)]
+    [FhirType("Availability#NotAvailableTime")]
     [BackboneType("Availability.notAvailableTime")]
     public partial class NotAvailableTimeComponent : Hl7.Fhir.Model.Element
     {
@@ -448,6 +470,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "description":
+            DescriptionElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "during":
+            During = (Hl7.Fhir.Model.Period)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -568,6 +606,22 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "availableTime":
+          AvailableTime = (List<Hl7.Fhir.Model.Availability.AvailableTimeComponent>)value;
+          return this;
+        case "notAvailableTime":
+          NotAvailableTime = (List<Hl7.Fhir.Model.Availability.NotAvailableTimeComponent>)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/Basic.cs b/src/Hl7.Fhir.R5/Model/Generated/Basic.cs
index bddb5a7a03..d35a0b9af2 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/Basic.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/Basic.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Basic","http://hl7.org/fhir/StructureDefinition/Basic", IsResource=true)]
+  [FhirType("Basic","http://hl7.org/fhir/StructureDefinition/Basic")]
   public partial class Basic : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -258,6 +258,31 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "code":
+          Code = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "subject":
+          Subject = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "created":
+          CreatedElement = (Hl7.Fhir.Model.FhirDateTime)value;
+          return this;
+        case "author":
+          Author = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/BiologicallyDerivedProduct.cs b/src/Hl7.Fhir.R5/Model/Generated/BiologicallyDerivedProduct.cs
index d9873216ce..719f7d2910 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/BiologicallyDerivedProduct.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/BiologicallyDerivedProduct.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -53,7 +53,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("BiologicallyDerivedProduct","http://hl7.org/fhir/StructureDefinition/BiologicallyDerivedProduct", IsResource=true)]
+  [FhirType("BiologicallyDerivedProduct","http://hl7.org/fhir/StructureDefinition/BiologicallyDerivedProduct")]
   public partial class BiologicallyDerivedProduct : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -66,7 +66,7 @@ public partial class BiologicallyDerivedProduct : Hl7.Fhir.Model.DomainResource,
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("BiologicallyDerivedProduct#Collection", IsNestedType=true)]
+    [FhirType("BiologicallyDerivedProduct#Collection")]
     [BackboneType("BiologicallyDerivedProduct.collection")]
     public partial class CollectionComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -211,6 +211,25 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "collector":
+            Collector = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          case "source":
+            Source = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          case "collected":
+            Collected = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -229,7 +248,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("BiologicallyDerivedProduct#Property", IsNestedType=true)]
+    [FhirType("BiologicallyDerivedProduct#Property")]
     [BackboneType("BiologicallyDerivedProduct.property")]
     public partial class PropertyComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -352,6 +371,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "type":
+            Type = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "value":
+            Value = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -753,6 +788,55 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "productCategory":
+          ProductCategory = (Hl7.Fhir.Model.Coding)value;
+          return this;
+        case "productCode":
+          ProductCode = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "parent":
+          Parent = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "request":
+          Request = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "biologicalSourceEvent":
+          BiologicalSourceEvent = (Hl7.Fhir.Model.Identifier)value;
+          return this;
+        case "processingFacility":
+          ProcessingFacility = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "division":
+          DivisionElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "productStatus":
+          ProductStatus = (Hl7.Fhir.Model.Coding)value;
+          return this;
+        case "expirationDate":
+          ExpirationDateElement = (Hl7.Fhir.Model.FhirDateTime)value;
+          return this;
+        case "collection":
+          Collection = (Hl7.Fhir.Model.BiologicallyDerivedProduct.CollectionComponent)value;
+          return this;
+        case "storageTempRequirements":
+          StorageTempRequirements = (Hl7.Fhir.Model.Range)value;
+          return this;
+        case "property":
+          Property = (List<Hl7.Fhir.Model.BiologicallyDerivedProduct.PropertyComponent>)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/BiologicallyDerivedProductDispense.cs b/src/Hl7.Fhir.R5/Model/Generated/BiologicallyDerivedProductDispense.cs
index 7344796cba..51fd2b9b7f 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/BiologicallyDerivedProductDispense.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/BiologicallyDerivedProductDispense.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("BiologicallyDerivedProductDispense","http://hl7.org/fhir/StructureDefinition/BiologicallyDerivedProductDispense", IsResource=true)]
+  [FhirType("BiologicallyDerivedProductDispense","http://hl7.org/fhir/StructureDefinition/BiologicallyDerivedProductDispense")]
   public partial class BiologicallyDerivedProductDispense : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -122,7 +122,7 @@ public enum BiologicallyDerivedProductDispenseCodes
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("BiologicallyDerivedProductDispense#Performer", IsNestedType=true)]
+    [FhirType("BiologicallyDerivedProductDispense#Performer")]
     [BackboneType("BiologicallyDerivedProductDispense.performer")]
     public partial class PerformerComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -244,6 +244,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "function":
+            Function = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "actor":
+            Actor = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -754,6 +770,64 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "basedOn":
+          BasedOn = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "partOf":
+          PartOf = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "status":
+          StatusElement = (Code<Hl7.Fhir.Model.BiologicallyDerivedProductDispense.BiologicallyDerivedProductDispenseCodes>)value;
+          return this;
+        case "originRelationshipType":
+          OriginRelationshipType = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "product":
+          Product = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "patient":
+          Patient = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "matchStatus":
+          MatchStatus = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "performer":
+          Performer = (List<Hl7.Fhir.Model.BiologicallyDerivedProductDispense.PerformerComponent>)value;
+          return this;
+        case "location":
+          Location = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "quantity":
+          Quantity = (Hl7.Fhir.Model.Quantity)value;
+          return this;
+        case "preparedDate":
+          PreparedDateElement = (Hl7.Fhir.Model.FhirDateTime)value;
+          return this;
+        case "whenHandedOver":
+          WhenHandedOverElement = (Hl7.Fhir.Model.FhirDateTime)value;
+          return this;
+        case "destination":
+          Destination = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "note":
+          Note = (List<Hl7.Fhir.Model.Annotation>)value;
+          return this;
+        case "usageInstruction":
+          UsageInstructionElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/BodyStructure.cs b/src/Hl7.Fhir.R5/Model/Generated/BodyStructure.cs
index 6009d56488..144db9ccc0 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/BodyStructure.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/BodyStructure.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("BodyStructure","http://hl7.org/fhir/StructureDefinition/BodyStructure", IsResource=true)]
+  [FhirType("BodyStructure","http://hl7.org/fhir/StructureDefinition/BodyStructure")]
   public partial class BodyStructure : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -67,7 +67,7 @@ public partial class BodyStructure : Hl7.Fhir.Model.DomainResource, IIdentifiabl
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("BodyStructure#IncludedStructure", IsNestedType=true)]
+    [FhirType("BodyStructure#IncludedStructure")]
     [BackboneType("BodyStructure.includedStructure")]
     public partial class IncludedStructureComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -257,6 +257,31 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "structure":
+            Structure = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "laterality":
+            Laterality = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "bodyLandmarkOrientation":
+            BodyLandmarkOrientation = (List<Hl7.Fhir.Model.BodyStructure.BodyLandmarkOrientationComponent>)value;
+            return this;
+          case "spatialReference":
+            SpatialReference = (List<Hl7.Fhir.Model.ResourceReference>)value;
+            return this;
+          case "qualifier":
+            Qualifier = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -277,7 +302,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("BodyStructure#BodyLandmarkOrientation", IsNestedType=true)]
+    [FhirType("BodyStructure#BodyLandmarkOrientation")]
     [BackboneType("BodyStructure.includedStructure.bodyLandmarkOrientation")]
     public partial class BodyLandmarkOrientationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -444,6 +469,28 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "landmarkDescription":
+            LandmarkDescription = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+            return this;
+          case "clockFacePosition":
+            ClockFacePosition = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+            return this;
+          case "distanceFromLandmark":
+            DistanceFromLandmark = (List<Hl7.Fhir.Model.BodyStructure.DistanceFromLandmarkComponent>)value;
+            return this;
+          case "surfaceOrientation":
+            SurfaceOrientation = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -463,7 +510,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("BodyStructure#DistanceFromLandmark", IsNestedType=true)]
+    [FhirType("BodyStructure#DistanceFromLandmark")]
     [BackboneType("BodyStructure.includedStructure.bodyLandmarkOrientation.distanceFromLandmark")]
     public partial class DistanceFromLandmarkComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -584,6 +631,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "device":
+            Device = (List<Hl7.Fhir.Model.CodeableReference>)value;
+            return this;
+          case "value":
+            Value = (List<Hl7.Fhir.Model.Quantity>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -874,6 +937,40 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "active":
+          ActiveElement = (Hl7.Fhir.Model.FhirBoolean)value;
+          return this;
+        case "morphology":
+          Morphology = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "includedStructure":
+          IncludedStructure = (List<Hl7.Fhir.Model.BodyStructure.IncludedStructureComponent>)value;
+          return this;
+        case "excludedStructure":
+          ExcludedStructure = (List<Hl7.Fhir.Model.BodyStructure.IncludedStructureComponent>)value;
+          return this;
+        case "description":
+          DescriptionElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        case "image":
+          Image = (List<Hl7.Fhir.Model.Attachment>)value;
+          return this;
+        case "patient":
+          Patient = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/CarePlan.cs b/src/Hl7.Fhir.R5/Model/Generated/CarePlan.cs
index adef858f24..5e7ad63097 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/CarePlan.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/CarePlan.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("CarePlan","http://hl7.org/fhir/StructureDefinition/CarePlan", IsResource=true)]
+  [FhirType("CarePlan","http://hl7.org/fhir/StructureDefinition/CarePlan")]
   public partial class CarePlan : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -107,7 +107,7 @@ public enum CarePlanIntent
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CarePlan#Activity", IsNestedType=true)]
+    [FhirType("CarePlan#Activity")]
     [BackboneType("CarePlan.activity")]
     public partial class ActivityComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -251,6 +251,25 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "performedActivity":
+            PerformedActivity = (List<Hl7.Fhir.Model.CodeableReference>)value;
+            return this;
+          case "progress":
+            Progress = (List<Hl7.Fhir.Model.Annotation>)value;
+            return this;
+          case "plannedActivityReference":
+            PlannedActivityReference = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -982,6 +1001,85 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "instantiatesCanonical":
+          InstantiatesCanonicalElement = (List<Hl7.Fhir.Model.Canonical>)value;
+          return this;
+        case "instantiatesUri":
+          InstantiatesUriElement = (List<Hl7.Fhir.Model.FhirUri>)value;
+          return this;
+        case "basedOn":
+          BasedOn = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "replaces":
+          Replaces = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "partOf":
+          PartOf = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "status":
+          StatusElement = (Code<Hl7.Fhir.Model.RequestStatus>)value;
+          return this;
+        case "intent":
+          IntentElement = (Code<Hl7.Fhir.Model.CarePlan.CarePlanIntent>)value;
+          return this;
+        case "category":
+          Category = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "title":
+          TitleElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "description":
+          DescriptionElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "subject":
+          Subject = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "encounter":
+          Encounter = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "period":
+          Period = (Hl7.Fhir.Model.Period)value;
+          return this;
+        case "created":
+          CreatedElement = (Hl7.Fhir.Model.FhirDateTime)value;
+          return this;
+        case "custodian":
+          Custodian = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "contributor":
+          Contributor = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "careTeam":
+          CareTeam = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "addresses":
+          Addresses = (List<Hl7.Fhir.Model.CodeableReference>)value;
+          return this;
+        case "supportingInfo":
+          SupportingInfo = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "goal":
+          Goal = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "activity":
+          Activity = (List<Hl7.Fhir.Model.CarePlan.ActivityComponent>)value;
+          return this;
+        case "note":
+          Note = (List<Hl7.Fhir.Model.Annotation>)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/CareTeam.cs b/src/Hl7.Fhir.R5/Model/Generated/CareTeam.cs
index 12f420d4a0..f7da5ed914 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/CareTeam.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/CareTeam.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("CareTeam","http://hl7.org/fhir/StructureDefinition/CareTeam", IsResource=true)]
+  [FhirType("CareTeam","http://hl7.org/fhir/StructureDefinition/CareTeam")]
   public partial class CareTeam : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -107,7 +107,7 @@ public enum CareTeamStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CareTeam#Participant", IsNestedType=true)]
+    [FhirType("CareTeam#Participant")]
     [BackboneType("CareTeam.participant")]
     public partial class ParticipantComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -274,6 +274,28 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "role":
+            Role = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "member":
+            Member = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          case "onBehalfOf":
+            OnBehalfOf = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          case "coverage":
+            Coverage = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -636,6 +658,49 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "status":
+          StatusElement = (Code<Hl7.Fhir.Model.CareTeam.CareTeamStatus>)value;
+          return this;
+        case "category":
+          Category = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "name":
+          NameElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "subject":
+          Subject = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "period":
+          Period = (Hl7.Fhir.Model.Period)value;
+          return this;
+        case "participant":
+          Participant = (List<Hl7.Fhir.Model.CareTeam.ParticipantComponent>)value;
+          return this;
+        case "reason":
+          Reason = (List<Hl7.Fhir.Model.CodeableReference>)value;
+          return this;
+        case "managingOrganization":
+          ManagingOrganization = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "telecom":
+          Telecom = (List<Hl7.Fhir.Model.ContactPoint>)value;
+          return this;
+        case "note":
+          Note = (List<Hl7.Fhir.Model.Annotation>)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/ChargeItem.cs b/src/Hl7.Fhir.R5/Model/Generated/ChargeItem.cs
index ca73d8b708..dbcae2b832 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/ChargeItem.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/ChargeItem.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("ChargeItem","http://hl7.org/fhir/StructureDefinition/ChargeItem", IsResource=true)]
+  [FhirType("ChargeItem","http://hl7.org/fhir/StructureDefinition/ChargeItem")]
   public partial class ChargeItem : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -119,7 +119,7 @@ public enum ChargeItemStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ChargeItem#Performer", IsNestedType=true)]
+    [FhirType("ChargeItem#Performer")]
     [BackboneType("ChargeItem.performer")]
     public partial class PerformerComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -241,6 +241,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "function":
+            Function = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "actor":
+            Actor = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -979,6 +995,94 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "definitionUri":
+          DefinitionUriElement = (List<Hl7.Fhir.Model.FhirUri>)value;
+          return this;
+        case "definitionCanonical":
+          DefinitionCanonicalElement = (List<Hl7.Fhir.Model.Canonical>)value;
+          return this;
+        case "status":
+          StatusElement = (Code<Hl7.Fhir.Model.ChargeItem.ChargeItemStatus>)value;
+          return this;
+        case "partOf":
+          PartOf = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "code":
+          Code = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "subject":
+          Subject = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "encounter":
+          Encounter = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "occurrence":
+          Occurrence = (Hl7.Fhir.Model.DataType)value;
+          return this;
+        case "performer":
+          Performer = (List<Hl7.Fhir.Model.ChargeItem.PerformerComponent>)value;
+          return this;
+        case "performingOrganization":
+          PerformingOrganization = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "requestingOrganization":
+          RequestingOrganization = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "costCenter":
+          CostCenter = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "quantity":
+          Quantity = (Hl7.Fhir.Model.Quantity)value;
+          return this;
+        case "bodysite":
+          Bodysite = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "unitPriceComponent":
+          UnitPriceComponent = (Hl7.Fhir.Model.MonetaryComponent)value;
+          return this;
+        case "totalPriceComponent":
+          TotalPriceComponent = (Hl7.Fhir.Model.MonetaryComponent)value;
+          return this;
+        case "overrideReason":
+          OverrideReason = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "enterer":
+          Enterer = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "enteredDate":
+          EnteredDateElement = (Hl7.Fhir.Model.FhirDateTime)value;
+          return this;
+        case "reason":
+          Reason = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "service":
+          Service = (List<Hl7.Fhir.Model.CodeableReference>)value;
+          return this;
+        case "product":
+          Product = (List<Hl7.Fhir.Model.CodeableReference>)value;
+          return this;
+        case "account":
+          Account = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "note":
+          Note = (List<Hl7.Fhir.Model.Annotation>)value;
+          return this;
+        case "supportingInformation":
+          SupportingInformation = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/ChargeItemDefinition.cs b/src/Hl7.Fhir.R5/Model/Generated/ChargeItemDefinition.cs
index 4a1ccfbdc3..ae79d4d890 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/ChargeItemDefinition.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/ChargeItemDefinition.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("ChargeItemDefinition","http://hl7.org/fhir/StructureDefinition/ChargeItemDefinition", IsResource=true)]
+  [FhirType("ChargeItemDefinition","http://hl7.org/fhir/StructureDefinition/ChargeItemDefinition")]
   public partial class ChargeItemDefinition : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -68,7 +68,7 @@ public partial class ChargeItemDefinition : Hl7.Fhir.Model.DomainResource, IIden
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ChargeItemDefinition#Applicability", IsNestedType=true)]
+    [FhirType("ChargeItemDefinition#Applicability")]
     [BackboneType("ChargeItemDefinition.applicability")]
     public partial class ApplicabilityComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -207,6 +207,25 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "condition":
+            Condition = (Hl7.Fhir.Model.Expression)value;
+            return this;
+          case "effectivePeriod":
+            EffectivePeriod = (Hl7.Fhir.Model.Period)value;
+            return this;
+          case "relatedArtifact":
+            RelatedArtifact = (Hl7.Fhir.Model.RelatedArtifact)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -225,7 +244,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ChargeItemDefinition#PropertyGroup", IsNestedType=true)]
+    [FhirType("ChargeItemDefinition#PropertyGroup")]
     [BackboneType("ChargeItemDefinition.propertyGroup")]
     public partial class PropertyGroupComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -345,6 +364,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "applicability":
+            Applicability = (List<Hl7.Fhir.Model.ChargeItemDefinition.ApplicabilityComponent>)value;
+            return this;
+          case "priceComponent":
+            PriceComponent = (List<Hl7.Fhir.Model.MonetaryComponent>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1294,6 +1329,94 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "url":
+          UrlElement = (Hl7.Fhir.Model.FhirUri)value;
+          return this;
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "version":
+          VersionElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "versionAlgorithm":
+          VersionAlgorithm = (Hl7.Fhir.Model.DataType)value;
+          return this;
+        case "name":
+          NameElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "title":
+          TitleElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "derivedFromUri":
+          DerivedFromUriElement = (List<Hl7.Fhir.Model.FhirUri>)value;
+          return this;
+        case "partOf":
+          PartOfElement = (List<Hl7.Fhir.Model.Canonical>)value;
+          return this;
+        case "replaces":
+          ReplacesElement = (List<Hl7.Fhir.Model.Canonical>)value;
+          return this;
+        case "status":
+          StatusElement = (Code<Hl7.Fhir.Model.PublicationStatus>)value;
+          return this;
+        case "experimental":
+          ExperimentalElement = (Hl7.Fhir.Model.FhirBoolean)value;
+          return this;
+        case "date":
+          DateElement = (Hl7.Fhir.Model.FhirDateTime)value;
+          return this;
+        case "publisher":
+          PublisherElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "contact":
+          Contact = (List<Hl7.Fhir.Model.ContactDetail>)value;
+          return this;
+        case "description":
+          DescriptionElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        case "useContext":
+          UseContext = (List<Hl7.Fhir.Model.UsageContext>)value;
+          return this;
+        case "jurisdiction":
+          Jurisdiction = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "purpose":
+          PurposeElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        case "copyright":
+          CopyrightElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        case "copyrightLabel":
+          CopyrightLabelElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "approvalDate":
+          ApprovalDateElement = (Hl7.Fhir.Model.Date)value;
+          return this;
+        case "lastReviewDate":
+          LastReviewDateElement = (Hl7.Fhir.Model.Date)value;
+          return this;
+        case "code":
+          Code = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "instance":
+          Instance = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "applicability":
+          Applicability = (List<Hl7.Fhir.Model.ChargeItemDefinition.ApplicabilityComponent>)value;
+          return this;
+        case "propertyGroup":
+          PropertyGroup = (List<Hl7.Fhir.Model.ChargeItemDefinition.PropertyGroupComponent>)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/Citation.cs b/src/Hl7.Fhir.R5/Model/Generated/Citation.cs
index 28619ab2e6..76ec8bf1f1 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/Citation.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/Citation.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Citation","http://hl7.org/fhir/StructureDefinition/Citation", IsResource=true)]
+  [FhirType("Citation","http://hl7.org/fhir/StructureDefinition/Citation")]
   public partial class Citation : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -302,7 +302,7 @@ public enum RelatedArtifactTypeExpanded
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Citation#Summary", IsNestedType=true)]
+    [FhirType("Citation#Summary")]
     [BackboneType("Citation.summary")]
     public partial class SummaryComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -440,6 +440,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "style":
+            Style = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "text":
+            TextElement = (Hl7.Fhir.Model.Markdown)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -457,7 +473,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Citation#Classification", IsNestedType=true)]
+    [FhirType("Citation#Classification")]
     [BackboneType("Citation.classification")]
     public partial class ClassificationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -578,6 +594,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "type":
+            Type = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "classifier":
+            Classifier = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -596,7 +628,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Citation#StatusDate", IsNestedType=true)]
+    [FhirType("Citation#StatusDate")]
     [BackboneType("Citation.statusDate")]
     public partial class StatusDateComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -756,6 +788,25 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "activity":
+            Activity = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "actual":
+            ActualElement = (Hl7.Fhir.Model.FhirBoolean)value;
+            return this;
+          case "period":
+            Period = (Hl7.Fhir.Model.Period)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -771,7 +822,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Citation#CitedArtifact", IsNestedType=true)]
+    [FhirType("Citation#CitedArtifact")]
     [BackboneType("Citation.citedArtifact")]
     public partial class CitedArtifactComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1192,6 +1243,61 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "identifier":
+            Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+            return this;
+          case "relatedIdentifier":
+            RelatedIdentifier = (List<Hl7.Fhir.Model.Identifier>)value;
+            return this;
+          case "dateAccessed":
+            DateAccessedElement = (Hl7.Fhir.Model.FhirDateTime)value;
+            return this;
+          case "version":
+            Version = (Hl7.Fhir.Model.Citation.CitedArtifactVersionComponent)value;
+            return this;
+          case "currentState":
+            CurrentState = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+            return this;
+          case "statusDate":
+            StatusDate = (List<Hl7.Fhir.Model.Citation.CitedArtifactStatusDateComponent>)value;
+            return this;
+          case "title":
+            Title = (List<Hl7.Fhir.Model.Citation.CitedArtifactTitleComponent>)value;
+            return this;
+          case "abstract":
+            Abstract = (List<Hl7.Fhir.Model.Citation.CitedArtifactAbstractComponent>)value;
+            return this;
+          case "part":
+            Part = (Hl7.Fhir.Model.Citation.CitedArtifactPartComponent)value;
+            return this;
+          case "relatesTo":
+            RelatesTo = (List<Hl7.Fhir.Model.Citation.CitedArtifactRelatesToComponent>)value;
+            return this;
+          case "publicationForm":
+            PublicationForm = (List<Hl7.Fhir.Model.Citation.CitedArtifactPublicationFormComponent>)value;
+            return this;
+          case "webLocation":
+            WebLocation = (List<Hl7.Fhir.Model.Citation.CitedArtifactWebLocationComponent>)value;
+            return this;
+          case "classification":
+            Classification = (List<Hl7.Fhir.Model.Citation.CitedArtifactClassificationComponent>)value;
+            return this;
+          case "contributorship":
+            Contributorship = (Hl7.Fhir.Model.Citation.CitedArtifactContributorshipComponent)value;
+            return this;
+          case "note":
+            Note = (List<Hl7.Fhir.Model.Annotation>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1219,7 +1325,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Citation#CitedArtifactVersion", IsNestedType=true)]
+    [FhirType("Citation#CitedArtifactVersion")]
     [BackboneType("Citation.citedArtifact.version")]
     public partial class CitedArtifactVersionComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1358,6 +1464,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "value":
+            ValueElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "baseCitation":
+            BaseCitation = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1375,7 +1497,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Citation#CitedArtifactStatusDate", IsNestedType=true)]
+    [FhirType("Citation#CitedArtifactStatusDate")]
     [BackboneType("Citation.citedArtifact.statusDate")]
     public partial class CitedArtifactStatusDateComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1535,6 +1657,25 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "activity":
+            Activity = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "actual":
+            ActualElement = (Hl7.Fhir.Model.FhirBoolean)value;
+            return this;
+          case "period":
+            Period = (Hl7.Fhir.Model.Period)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1550,7 +1691,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Citation#CitedArtifactTitle", IsNestedType=true)]
+    [FhirType("Citation#CitedArtifactTitle")]
     [BackboneType("Citation.citedArtifact.title")]
     public partial class CitedArtifactTitleComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1711,6 +1852,25 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "type":
+            Type = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+            return this;
+          case "language":
+            Language = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "text":
+            TextElement = (Hl7.Fhir.Model.Markdown)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1729,7 +1889,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Citation#CitedArtifactAbstract", IsNestedType=true)]
+    [FhirType("Citation#CitedArtifactAbstract")]
     [BackboneType("Citation.citedArtifact.abstract")]
     public partial class CitedArtifactAbstractComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1928,6 +2088,28 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "type":
+            Type = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "language":
+            Language = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "text":
+            TextElement = (Hl7.Fhir.Model.Markdown)value;
+            return this;
+          case "copyright":
+            CopyrightElement = (Hl7.Fhir.Model.Markdown)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1944,7 +2126,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Citation#CitedArtifactPart", IsNestedType=true)]
+    [FhirType("Citation#CitedArtifactPart")]
     [BackboneType("Citation.citedArtifact.part")]
     public partial class CitedArtifactPartComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2104,6 +2286,25 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "type":
+            Type = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "value":
+            ValueElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "baseCitation":
+            BaseCitation = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -2122,7 +2323,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Citation#CitedArtifactRelatesTo", IsNestedType=true)]
+    [FhirType("Citation#CitedArtifactRelatesTo")]
     [BackboneType("Citation.citedArtifact.relatesTo")]
     public partial class CitedArtifactRelatesToComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2461,6 +2662,40 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "type":
+            TypeElement = (Code<Hl7.Fhir.Model.Citation.RelatedArtifactTypeExpanded>)value;
+            return this;
+          case "classifier":
+            Classifier = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+            return this;
+          case "label":
+            LabelElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "display":
+            DisplayElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "citation":
+            CitationElement = (Hl7.Fhir.Model.Markdown)value;
+            return this;
+          case "document":
+            Document = (Hl7.Fhir.Model.Attachment)value;
+            return this;
+          case "resource":
+            ResourceElement = (Hl7.Fhir.Model.Canonical)value;
+            return this;
+          case "resourceReference":
+            ResourceReference = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -2484,7 +2719,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Citation#CitedArtifactPublicationForm", IsNestedType=true)]
+    [FhirType("Citation#CitedArtifactPublicationForm")]
     [BackboneType("Citation.citedArtifact.publicationForm")]
     public partial class CitedArtifactPublicationFormComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -3094,6 +3329,61 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "publishedIn":
+            PublishedIn = (Hl7.Fhir.Model.Citation.CitedArtifactPublicationFormPublishedInComponent)value;
+            return this;
+          case "citedMedium":
+            CitedMedium = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "volume":
+            VolumeElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "issue":
+            IssueElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "articleDate":
+            ArticleDateElement = (Hl7.Fhir.Model.FhirDateTime)value;
+            return this;
+          case "publicationDateText":
+            PublicationDateTextElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "publicationDateSeason":
+            PublicationDateSeasonElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "lastRevisionDate":
+            LastRevisionDateElement = (Hl7.Fhir.Model.FhirDateTime)value;
+            return this;
+          case "language":
+            Language = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+            return this;
+          case "accessionNumber":
+            AccessionNumberElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "pageString":
+            PageStringElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "firstPage":
+            FirstPageElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "lastPage":
+            LastPageElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "pageCount":
+            PageCountElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "copyright":
+            CopyrightElement = (Hl7.Fhir.Model.Markdown)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -3121,7 +3411,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Citation#CitedArtifactPublicationFormPublishedIn", IsNestedType=true)]
+    [FhirType("Citation#CitedArtifactPublicationFormPublishedIn")]
     [BackboneType("Citation.citedArtifact.publicationForm.publishedIn")]
     public partial class CitedArtifactPublicationFormPublishedInComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -3342,6 +3632,31 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "type":
+            Type = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "identifier":
+            Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+            return this;
+          case "title":
+            TitleElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "publisher":
+            Publisher = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          case "publisherLocation":
+            PublisherLocationElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -3359,7 +3674,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Citation#CitedArtifactWebLocation", IsNestedType=true)]
+    [FhirType("Citation#CitedArtifactWebLocation")]
     [BackboneType("Citation.citedArtifact.webLocation")]
     public partial class CitedArtifactWebLocationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -3497,6 +3812,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "classifier":
+            Classifier = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+            return this;
+          case "url":
+            UrlElement = (Hl7.Fhir.Model.FhirUri)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -3511,7 +3842,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Citation#CitedArtifactClassification", IsNestedType=true)]
+    [FhirType("Citation#CitedArtifactClassification")]
     [BackboneType("Citation.citedArtifact.classification")]
     public partial class CitedArtifactClassificationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -3656,6 +3987,25 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "type":
+            Type = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "classifier":
+            Classifier = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+            return this;
+          case "artifactAssessment":
+            ArtifactAssessment = (List<Hl7.Fhir.Model.ResourceReference>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -3674,7 +4024,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Citation#CitedArtifactContributorship", IsNestedType=true)]
+    [FhirType("Citation#CitedArtifactContributorship")]
     [BackboneType("Citation.citedArtifact.contributorship")]
     public partial class CitedArtifactContributorshipComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -3833,6 +4183,25 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "complete":
+            CompleteElement = (Hl7.Fhir.Model.FhirBoolean)value;
+            return this;
+          case "entry":
+            Entry = (List<Hl7.Fhir.Model.Citation.CitedArtifactContributorshipEntryComponent>)value;
+            return this;
+          case "summary":
+            Summary = (List<Hl7.Fhir.Model.Citation.CitedArtifactContributorshipSummaryComponent>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -3852,7 +4221,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Citation#CitedArtifactContributorshipEntry", IsNestedType=true)]
+    [FhirType("Citation#CitedArtifactContributorshipEntry")]
     [BackboneType("Citation.citedArtifact.contributorship.entry")]
     public partial class CitedArtifactContributorshipEntryComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -4160,6 +4529,40 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "contributor":
+            Contributor = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          case "forenameInitials":
+            ForenameInitialsElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "affiliation":
+            Affiliation = (List<Hl7.Fhir.Model.ResourceReference>)value;
+            return this;
+          case "contributionType":
+            ContributionType = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+            return this;
+          case "role":
+            Role = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "contributionInstance":
+            ContributionInstance = (List<Hl7.Fhir.Model.Citation.CitedArtifactContributorshipEntryContributionInstanceComponent>)value;
+            return this;
+          case "correspondingContact":
+            CorrespondingContactElement = (Hl7.Fhir.Model.FhirBoolean)value;
+            return this;
+          case "rankingOrder":
+            RankingOrderElement = (Hl7.Fhir.Model.PositiveInt)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -4180,7 +4583,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Citation#CitedArtifactContributorshipEntryContributionInstance", IsNestedType=true)]
+    [FhirType("Citation#CitedArtifactContributorshipEntryContributionInstance")]
     [BackboneType("Citation.citedArtifact.contributorship.entry.contributionInstance")]
     public partial class CitedArtifactContributorshipEntryContributionInstanceComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -4318,6 +4721,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "type":
+            Type = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "time":
+            TimeElement = (Hl7.Fhir.Model.FhirDateTime)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -4332,7 +4751,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Citation#CitedArtifactContributorshipSummary", IsNestedType=true)]
+    [FhirType("Citation#CitedArtifactContributorshipSummary")]
     [BackboneType("Citation.citedArtifact.contributorship.summary")]
     public partial class CitedArtifactContributorshipSummaryComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -4514,6 +4933,28 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "type":
+            Type = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "style":
+            Style = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "source":
+            Source = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "value":
+            ValueElement = (Hl7.Fhir.Model.Markdown)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -5518,6 +5959,109 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "url":
+          UrlElement = (Hl7.Fhir.Model.FhirUri)value;
+          return this;
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "version":
+          VersionElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "versionAlgorithm":
+          VersionAlgorithm = (Hl7.Fhir.Model.DataType)value;
+          return this;
+        case "name":
+          NameElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "title":
+          TitleElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "status":
+          StatusElement = (Code<Hl7.Fhir.Model.PublicationStatus>)value;
+          return this;
+        case "experimental":
+          ExperimentalElement = (Hl7.Fhir.Model.FhirBoolean)value;
+          return this;
+        case "date":
+          DateElement = (Hl7.Fhir.Model.FhirDateTime)value;
+          return this;
+        case "publisher":
+          PublisherElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "contact":
+          Contact = (List<Hl7.Fhir.Model.ContactDetail>)value;
+          return this;
+        case "description":
+          DescriptionElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        case "useContext":
+          UseContext = (List<Hl7.Fhir.Model.UsageContext>)value;
+          return this;
+        case "jurisdiction":
+          Jurisdiction = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "purpose":
+          PurposeElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        case "copyright":
+          CopyrightElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        case "copyrightLabel":
+          CopyrightLabelElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "approvalDate":
+          ApprovalDateElement = (Hl7.Fhir.Model.Date)value;
+          return this;
+        case "lastReviewDate":
+          LastReviewDateElement = (Hl7.Fhir.Model.Date)value;
+          return this;
+        case "effectivePeriod":
+          EffectivePeriod = (Hl7.Fhir.Model.Period)value;
+          return this;
+        case "author":
+          Author = (List<Hl7.Fhir.Model.ContactDetail>)value;
+          return this;
+        case "editor":
+          Editor = (List<Hl7.Fhir.Model.ContactDetail>)value;
+          return this;
+        case "reviewer":
+          Reviewer = (List<Hl7.Fhir.Model.ContactDetail>)value;
+          return this;
+        case "endorser":
+          Endorser = (List<Hl7.Fhir.Model.ContactDetail>)value;
+          return this;
+        case "summary":
+          Summary = (List<Hl7.Fhir.Model.Citation.SummaryComponent>)value;
+          return this;
+        case "classification":
+          Classification = (List<Hl7.Fhir.Model.Citation.ClassificationComponent>)value;
+          return this;
+        case "note":
+          Note = (List<Hl7.Fhir.Model.Annotation>)value;
+          return this;
+        case "currentState":
+          CurrentState = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "statusDate":
+          StatusDate = (List<Hl7.Fhir.Model.Citation.StatusDateComponent>)value;
+          return this;
+        case "relatedArtifact":
+          RelatedArtifact = (List<Hl7.Fhir.Model.RelatedArtifact>)value;
+          return this;
+        case "citedArtifact":
+          CitedArtifact = (Hl7.Fhir.Model.Citation.CitedArtifactComponent)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/Claim.cs b/src/Hl7.Fhir.R5/Model/Generated/Claim.cs
index d75e9bf42f..f6e793eda8 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/Claim.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/Claim.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Claim","http://hl7.org/fhir/StructureDefinition/Claim", IsResource=true)]
+  [FhirType("Claim","http://hl7.org/fhir/StructureDefinition/Claim")]
   public partial class Claim : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -69,7 +69,7 @@ public partial class Claim : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<I
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Claim#RelatedClaim", IsNestedType=true)]
+    [FhirType("Claim#RelatedClaim")]
     [BackboneType("Claim.related")]
     public partial class RelatedClaimComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -211,6 +211,25 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "claim":
+            Claim = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          case "relationship":
+            Relationship = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "reference":
+            Reference = (Hl7.Fhir.Model.Identifier)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -230,7 +249,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Claim#Payee", IsNestedType=true)]
+    [FhirType("Claim#Payee")]
     [BackboneType("Claim.payee")]
     public partial class PayeeComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -352,6 +371,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "type":
+            Type = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "party":
+            Party = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -369,7 +404,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Claim#Event", IsNestedType=true)]
+    [FhirType("Claim#Event")]
     [BackboneType("Claim.event")]
     public partial class EventComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -492,6 +527,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "type":
+            Type = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "when":
+            When = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -509,7 +560,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Claim#CareTeam", IsNestedType=true)]
+    [FhirType("Claim#CareTeam")]
     [BackboneType("Claim.careTeam")]
     public partial class CareTeamComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -732,6 +783,31 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "sequence":
+            SequenceElement = (Hl7.Fhir.Model.PositiveInt)value;
+            return this;
+          case "provider":
+            Provider = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          case "responsible":
+            ResponsibleElement = (Hl7.Fhir.Model.FhirBoolean)value;
+            return this;
+          case "role":
+            Role = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "specialty":
+            Specialty = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -753,7 +829,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Claim#SupportingInformation", IsNestedType=true)]
+    [FhirType("Claim#SupportingInformation")]
     [BackboneType("Claim.supportingInfo")]
     public partial class SupportingInformationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -983,6 +1059,34 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "sequence":
+            SequenceElement = (Hl7.Fhir.Model.PositiveInt)value;
+            return this;
+          case "category":
+            Category = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "code":
+            Code = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "timing":
+            Timing = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          case "value":
+            Value = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          case "reason":
+            Reason = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1004,7 +1108,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Claim#Diagnosis", IsNestedType=true)]
+    [FhirType("Claim#Diagnosis")]
     [BackboneType("Claim.diagnosis")]
     public partial class DiagnosisComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1191,6 +1295,28 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "sequence":
+            SequenceElement = (Hl7.Fhir.Model.PositiveInt)value;
+            return this;
+          case "diagnosis":
+            Diagnosis = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          case "type":
+            Type = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+            return this;
+          case "onAdmission":
+            OnAdmission = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1210,7 +1336,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Claim#Procedure", IsNestedType=true)]
+    [FhirType("Claim#Procedure")]
     [BackboneType("Claim.procedure")]
     public partial class ProcedureComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1438,6 +1564,31 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "sequence":
+            SequenceElement = (Hl7.Fhir.Model.PositiveInt)value;
+            return this;
+          case "type":
+            Type = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+            return this;
+          case "date":
+            DateElement = (Hl7.Fhir.Model.FhirDateTime)value;
+            return this;
+          case "procedure":
+            Procedure = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          case "udi":
+            Udi = (List<Hl7.Fhir.Model.ResourceReference>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1459,7 +1610,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Claim#Insurance", IsNestedType=true)]
+    [FhirType("Claim#Insurance")]
     [BackboneType("Claim.insurance")]
     public partial class InsuranceComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1762,6 +1913,37 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "sequence":
+            SequenceElement = (Hl7.Fhir.Model.PositiveInt)value;
+            return this;
+          case "focal":
+            FocalElement = (Hl7.Fhir.Model.FhirBoolean)value;
+            return this;
+          case "identifier":
+            Identifier = (Hl7.Fhir.Model.Identifier)value;
+            return this;
+          case "coverage":
+            Coverage = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          case "businessArrangement":
+            BusinessArrangementElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "preAuthRef":
+            PreAuthRefElement = (List<Hl7.Fhir.Model.FhirString>)value;
+            return this;
+          case "claimResponse":
+            ClaimResponse = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1784,7 +1966,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Claim#Accident", IsNestedType=true)]
+    [FhirType("Claim#Accident")]
     [BackboneType("Claim.accident")]
     public partial class AccidentComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1946,6 +2128,25 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "date":
+            DateElement = (Hl7.Fhir.Model.Date)value;
+            return this;
+          case "type":
+            Type = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "location":
+            Location = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1964,7 +2165,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Claim#Item", IsNestedType=true)]
+    [FhirType("Claim#Item")]
     [BackboneType("Claim.item")]
     public partial class ItemComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2704,6 +2905,91 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "sequence":
+            SequenceElement = (Hl7.Fhir.Model.PositiveInt)value;
+            return this;
+          case "traceNumber":
+            TraceNumber = (List<Hl7.Fhir.Model.Identifier>)value;
+            return this;
+          case "careTeamSequence":
+            CareTeamSequenceElement = (List<Hl7.Fhir.Model.PositiveInt>)value;
+            return this;
+          case "diagnosisSequence":
+            DiagnosisSequenceElement = (List<Hl7.Fhir.Model.PositiveInt>)value;
+            return this;
+          case "procedureSequence":
+            ProcedureSequenceElement = (List<Hl7.Fhir.Model.PositiveInt>)value;
+            return this;
+          case "informationSequence":
+            InformationSequenceElement = (List<Hl7.Fhir.Model.PositiveInt>)value;
+            return this;
+          case "revenue":
+            Revenue = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "category":
+            Category = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "productOrService":
+            ProductOrService = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "productOrServiceEnd":
+            ProductOrServiceEnd = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "request":
+            Request = (List<Hl7.Fhir.Model.ResourceReference>)value;
+            return this;
+          case "modifier":
+            Modifier = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+            return this;
+          case "programCode":
+            ProgramCode = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+            return this;
+          case "serviced":
+            Serviced = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          case "location":
+            Location = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          case "patientPaid":
+            PatientPaid = (Hl7.Fhir.Model.Money)value;
+            return this;
+          case "quantity":
+            Quantity = (Hl7.Fhir.Model.Quantity)value;
+            return this;
+          case "unitPrice":
+            UnitPrice = (Hl7.Fhir.Model.Money)value;
+            return this;
+          case "factor":
+            FactorElement = (Hl7.Fhir.Model.FhirDecimal)value;
+            return this;
+          case "tax":
+            Tax = (Hl7.Fhir.Model.Money)value;
+            return this;
+          case "net":
+            Net = (Hl7.Fhir.Model.Money)value;
+            return this;
+          case "udi":
+            Udi = (List<Hl7.Fhir.Model.ResourceReference>)value;
+            return this;
+          case "bodySite":
+            BodySite = (List<Hl7.Fhir.Model.Claim.BodySiteComponent>)value;
+            return this;
+          case "encounter":
+            Encounter = (List<Hl7.Fhir.Model.ResourceReference>)value;
+            return this;
+          case "detail":
+            Detail = (List<Hl7.Fhir.Model.Claim.DetailComponent>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -2744,7 +3030,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Claim#BodySite", IsNestedType=true)]
+    [FhirType("Claim#BodySite")]
     [BackboneType("Claim.item.bodySite")]
     public partial class BodySiteComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2866,6 +3152,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "site":
+            Site = (List<Hl7.Fhir.Model.CodeableReference>)value;
+            return this;
+          case "subSite":
+            SubSite = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -2883,7 +3185,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Claim#Detail", IsNestedType=true)]
+    [FhirType("Claim#Detail")]
     [BackboneType("Claim.item.detail")]
     public partial class DetailComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -3345,6 +3647,64 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "sequence":
+            SequenceElement = (Hl7.Fhir.Model.PositiveInt)value;
+            return this;
+          case "traceNumber":
+            TraceNumber = (List<Hl7.Fhir.Model.Identifier>)value;
+            return this;
+          case "revenue":
+            Revenue = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "category":
+            Category = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "productOrService":
+            ProductOrService = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "productOrServiceEnd":
+            ProductOrServiceEnd = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "modifier":
+            Modifier = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+            return this;
+          case "programCode":
+            ProgramCode = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+            return this;
+          case "patientPaid":
+            PatientPaid = (Hl7.Fhir.Model.Money)value;
+            return this;
+          case "quantity":
+            Quantity = (Hl7.Fhir.Model.Quantity)value;
+            return this;
+          case "unitPrice":
+            UnitPrice = (Hl7.Fhir.Model.Money)value;
+            return this;
+          case "factor":
+            FactorElement = (Hl7.Fhir.Model.FhirDecimal)value;
+            return this;
+          case "tax":
+            Tax = (Hl7.Fhir.Model.Money)value;
+            return this;
+          case "net":
+            Net = (Hl7.Fhir.Model.Money)value;
+            return this;
+          case "udi":
+            Udi = (List<Hl7.Fhir.Model.ResourceReference>)value;
+            return this;
+          case "subDetail":
+            SubDetail = (List<Hl7.Fhir.Model.Claim.SubDetailComponent>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -3376,7 +3736,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Claim#SubDetail", IsNestedType=true)]
+    [FhirType("Claim#SubDetail")]
     [BackboneType("Claim.item.detail.subDetail")]
     public partial class SubDetailComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -3816,6 +4176,61 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "sequence":
+            SequenceElement = (Hl7.Fhir.Model.PositiveInt)value;
+            return this;
+          case "traceNumber":
+            TraceNumber = (List<Hl7.Fhir.Model.Identifier>)value;
+            return this;
+          case "revenue":
+            Revenue = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "category":
+            Category = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "productOrService":
+            ProductOrService = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "productOrServiceEnd":
+            ProductOrServiceEnd = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "modifier":
+            Modifier = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+            return this;
+          case "programCode":
+            ProgramCode = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+            return this;
+          case "patientPaid":
+            PatientPaid = (Hl7.Fhir.Model.Money)value;
+            return this;
+          case "quantity":
+            Quantity = (Hl7.Fhir.Model.Quantity)value;
+            return this;
+          case "unitPrice":
+            UnitPrice = (Hl7.Fhir.Model.Money)value;
+            return this;
+          case "factor":
+            FactorElement = (Hl7.Fhir.Model.FhirDecimal)value;
+            return this;
+          case "tax":
+            Tax = (Hl7.Fhir.Model.Money)value;
+            return this;
+          case "net":
+            Net = (Hl7.Fhir.Model.Money)value;
+            return this;
+          case "udi":
+            Udi = (List<Hl7.Fhir.Model.ResourceReference>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -4676,6 +5091,112 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "traceNumber":
+          TraceNumber = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "status":
+          StatusElement = (Code<Hl7.Fhir.Model.FinancialResourceStatusCodes>)value;
+          return this;
+        case "type":
+          Type = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "subType":
+          SubType = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "use":
+          UseElement = (Code<Hl7.Fhir.Model.ClaimUseCode>)value;
+          return this;
+        case "patient":
+          Patient = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "billablePeriod":
+          BillablePeriod = (Hl7.Fhir.Model.Period)value;
+          return this;
+        case "created":
+          CreatedElement = (Hl7.Fhir.Model.FhirDateTime)value;
+          return this;
+        case "enterer":
+          Enterer = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "insurer":
+          Insurer = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "provider":
+          Provider = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "priority":
+          Priority = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "fundsReserve":
+          FundsReserve = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "related":
+          Related = (List<Hl7.Fhir.Model.Claim.RelatedClaimComponent>)value;
+          return this;
+        case "prescription":
+          Prescription = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "originalPrescription":
+          OriginalPrescription = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "payee":
+          Payee = (Hl7.Fhir.Model.Claim.PayeeComponent)value;
+          return this;
+        case "referral":
+          Referral = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "encounter":
+          Encounter = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "facility":
+          Facility = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "diagnosisRelatedGroup":
+          DiagnosisRelatedGroup = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "event":
+          Event = (List<Hl7.Fhir.Model.Claim.EventComponent>)value;
+          return this;
+        case "careTeam":
+          CareTeam = (List<Hl7.Fhir.Model.Claim.CareTeamComponent>)value;
+          return this;
+        case "supportingInfo":
+          SupportingInfo = (List<Hl7.Fhir.Model.Claim.SupportingInformationComponent>)value;
+          return this;
+        case "diagnosis":
+          Diagnosis = (List<Hl7.Fhir.Model.Claim.DiagnosisComponent>)value;
+          return this;
+        case "procedure":
+          Procedure = (List<Hl7.Fhir.Model.Claim.ProcedureComponent>)value;
+          return this;
+        case "insurance":
+          Insurance = (List<Hl7.Fhir.Model.Claim.InsuranceComponent>)value;
+          return this;
+        case "accident":
+          Accident = (Hl7.Fhir.Model.Claim.AccidentComponent)value;
+          return this;
+        case "patientPaid":
+          PatientPaid = (Hl7.Fhir.Model.Money)value;
+          return this;
+        case "item":
+          Item = (List<Hl7.Fhir.Model.Claim.ItemComponent>)value;
+          return this;
+        case "total":
+          Total = (Hl7.Fhir.Model.Money)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/ClaimResponse.cs b/src/Hl7.Fhir.R5/Model/Generated/ClaimResponse.cs
index 0ebaa941b4..22dac58785 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/ClaimResponse.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/ClaimResponse.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("ClaimResponse","http://hl7.org/fhir/StructureDefinition/ClaimResponse", IsResource=true)]
+  [FhirType("ClaimResponse","http://hl7.org/fhir/StructureDefinition/ClaimResponse")]
   public partial class ClaimResponse : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -67,7 +67,7 @@ public partial class ClaimResponse : Hl7.Fhir.Model.DomainResource, IIdentifiabl
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ClaimResponse#Event", IsNestedType=true)]
+    [FhirType("ClaimResponse#Event")]
     [BackboneType("ClaimResponse.event")]
     public partial class EventComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -190,6 +190,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "type":
+            Type = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "when":
+            When = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -207,7 +223,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ClaimResponse#Item", IsNestedType=true)]
+    [FhirType("ClaimResponse#Item")]
     [BackboneType("ClaimResponse.item")]
     public partial class ItemComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -450,6 +466,34 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "itemSequence":
+            ItemSequenceElement = (Hl7.Fhir.Model.PositiveInt)value;
+            return this;
+          case "traceNumber":
+            TraceNumber = (List<Hl7.Fhir.Model.Identifier>)value;
+            return this;
+          case "noteNumber":
+            NoteNumberElement = (List<Hl7.Fhir.Model.PositiveInt>)value;
+            return this;
+          case "reviewOutcome":
+            ReviewOutcome = (Hl7.Fhir.Model.ClaimResponse.ReviewOutcomeComponent)value;
+            return this;
+          case "adjudication":
+            Adjudication = (List<Hl7.Fhir.Model.ClaimResponse.AdjudicationComponent>)value;
+            return this;
+          case "detail":
+            Detail = (List<Hl7.Fhir.Model.ClaimResponse.ItemDetailComponent>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -471,7 +515,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ClaimResponse#ReviewOutcome", IsNestedType=true)]
+    [FhirType("ClaimResponse#ReviewOutcome")]
     [BackboneType("ClaimResponse.item.reviewOutcome")]
     public partial class ReviewOutcomeComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -652,6 +696,28 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "decision":
+            Decision = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "reason":
+            Reason = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+            return this;
+          case "preAuthRef":
+            PreAuthRefElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "preAuthPeriod":
+            PreAuthPeriod = (Hl7.Fhir.Model.Period)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -671,7 +737,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ClaimResponse#Adjudication", IsNestedType=true)]
+    [FhirType("ClaimResponse#Adjudication")]
     [BackboneType("ClaimResponse.item.adjudication")]
     public partial class AdjudicationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -834,6 +900,28 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "category":
+            Category = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "reason":
+            Reason = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "amount":
+            Amount = (Hl7.Fhir.Model.Money)value;
+            return this;
+          case "quantity":
+            Quantity = (Hl7.Fhir.Model.Quantity)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -853,7 +941,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ClaimResponse#ItemDetail", IsNestedType=true)]
+    [FhirType("ClaimResponse#ItemDetail")]
     [BackboneType("ClaimResponse.item.detail")]
     public partial class ItemDetailComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1096,6 +1184,34 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "detailSequence":
+            DetailSequenceElement = (Hl7.Fhir.Model.PositiveInt)value;
+            return this;
+          case "traceNumber":
+            TraceNumber = (List<Hl7.Fhir.Model.Identifier>)value;
+            return this;
+          case "noteNumber":
+            NoteNumberElement = (List<Hl7.Fhir.Model.PositiveInt>)value;
+            return this;
+          case "reviewOutcome":
+            ReviewOutcome = (Hl7.Fhir.Model.ClaimResponse.ReviewOutcomeComponent)value;
+            return this;
+          case "adjudication":
+            Adjudication = (List<Hl7.Fhir.Model.ClaimResponse.AdjudicationComponent>)value;
+            return this;
+          case "subDetail":
+            SubDetail = (List<Hl7.Fhir.Model.ClaimResponse.SubDetailComponent>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1117,7 +1233,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ClaimResponse#SubDetail", IsNestedType=true)]
+    [FhirType("ClaimResponse#SubDetail")]
     [BackboneType("ClaimResponse.item.detail.subDetail")]
     public partial class SubDetailComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1338,6 +1454,31 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "subDetailSequence":
+            SubDetailSequenceElement = (Hl7.Fhir.Model.PositiveInt)value;
+            return this;
+          case "traceNumber":
+            TraceNumber = (List<Hl7.Fhir.Model.Identifier>)value;
+            return this;
+          case "noteNumber":
+            NoteNumberElement = (List<Hl7.Fhir.Model.PositiveInt>)value;
+            return this;
+          case "reviewOutcome":
+            ReviewOutcome = (Hl7.Fhir.Model.ClaimResponse.ReviewOutcomeComponent)value;
+            return this;
+          case "adjudication":
+            Adjudication = (List<Hl7.Fhir.Model.ClaimResponse.AdjudicationComponent>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1358,7 +1499,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ClaimResponse#AddedItem", IsNestedType=true)]
+    [FhirType("ClaimResponse#AddedItem")]
     [BackboneType("ClaimResponse.addItem")]
     public partial class AddedItemComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2034,6 +2175,85 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "itemSequence":
+            ItemSequenceElement = (List<Hl7.Fhir.Model.PositiveInt>)value;
+            return this;
+          case "detailSequence":
+            DetailSequenceElement = (List<Hl7.Fhir.Model.PositiveInt>)value;
+            return this;
+          case "subdetailSequence":
+            SubdetailSequenceElement = (List<Hl7.Fhir.Model.PositiveInt>)value;
+            return this;
+          case "traceNumber":
+            TraceNumber = (List<Hl7.Fhir.Model.Identifier>)value;
+            return this;
+          case "provider":
+            Provider = (List<Hl7.Fhir.Model.ResourceReference>)value;
+            return this;
+          case "revenue":
+            Revenue = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "productOrService":
+            ProductOrService = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "productOrServiceEnd":
+            ProductOrServiceEnd = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "request":
+            Request = (List<Hl7.Fhir.Model.ResourceReference>)value;
+            return this;
+          case "modifier":
+            Modifier = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+            return this;
+          case "programCode":
+            ProgramCode = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+            return this;
+          case "serviced":
+            Serviced = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          case "location":
+            Location = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          case "quantity":
+            Quantity = (Hl7.Fhir.Model.Quantity)value;
+            return this;
+          case "unitPrice":
+            UnitPrice = (Hl7.Fhir.Model.Money)value;
+            return this;
+          case "factor":
+            FactorElement = (Hl7.Fhir.Model.FhirDecimal)value;
+            return this;
+          case "tax":
+            Tax = (Hl7.Fhir.Model.Money)value;
+            return this;
+          case "net":
+            Net = (Hl7.Fhir.Model.Money)value;
+            return this;
+          case "bodySite":
+            BodySite = (List<Hl7.Fhir.Model.ClaimResponse.BodySiteComponent>)value;
+            return this;
+          case "noteNumber":
+            NoteNumberElement = (List<Hl7.Fhir.Model.PositiveInt>)value;
+            return this;
+          case "reviewOutcome":
+            ReviewOutcome = (Hl7.Fhir.Model.ClaimResponse.ReviewOutcomeComponent)value;
+            return this;
+          case "adjudication":
+            Adjudication = (List<Hl7.Fhir.Model.ClaimResponse.AdjudicationComponent>)value;
+            return this;
+          case "detail":
+            Detail = (List<Hl7.Fhir.Model.ClaimResponse.AddedItemDetailComponent>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -2072,7 +2292,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ClaimResponse#BodySite", IsNestedType=true)]
+    [FhirType("ClaimResponse#BodySite")]
     [BackboneType("ClaimResponse.addItem.bodySite")]
     public partial class BodySiteComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2194,6 +2414,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "site":
+            Site = (List<Hl7.Fhir.Model.CodeableReference>)value;
+            return this;
+          case "subSite":
+            SubSite = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -2211,7 +2447,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ClaimResponse#AddedItemDetail", IsNestedType=true)]
+    [FhirType("ClaimResponse#AddedItemDetail")]
     [BackboneType("ClaimResponse.addItem.detail")]
     public partial class AddedItemDetailComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2626,6 +2862,58 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "traceNumber":
+            TraceNumber = (List<Hl7.Fhir.Model.Identifier>)value;
+            return this;
+          case "revenue":
+            Revenue = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "productOrService":
+            ProductOrService = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "productOrServiceEnd":
+            ProductOrServiceEnd = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "modifier":
+            Modifier = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+            return this;
+          case "quantity":
+            Quantity = (Hl7.Fhir.Model.Quantity)value;
+            return this;
+          case "unitPrice":
+            UnitPrice = (Hl7.Fhir.Model.Money)value;
+            return this;
+          case "factor":
+            FactorElement = (Hl7.Fhir.Model.FhirDecimal)value;
+            return this;
+          case "tax":
+            Tax = (Hl7.Fhir.Model.Money)value;
+            return this;
+          case "net":
+            Net = (Hl7.Fhir.Model.Money)value;
+            return this;
+          case "noteNumber":
+            NoteNumberElement = (List<Hl7.Fhir.Model.PositiveInt>)value;
+            return this;
+          case "reviewOutcome":
+            ReviewOutcome = (Hl7.Fhir.Model.ClaimResponse.ReviewOutcomeComponent)value;
+            return this;
+          case "adjudication":
+            Adjudication = (List<Hl7.Fhir.Model.ClaimResponse.AdjudicationComponent>)value;
+            return this;
+          case "subDetail":
+            SubDetail = (List<Hl7.Fhir.Model.ClaimResponse.AddedItemSubDetailComponent>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -2655,7 +2943,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ClaimResponse#AddedItemSubDetail", IsNestedType=true)]
+    [FhirType("ClaimResponse#AddedItemSubDetail")]
     [BackboneType("ClaimResponse.addItem.detail.subDetail")]
     public partial class AddedItemSubDetailComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -3048,6 +3336,55 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "traceNumber":
+            TraceNumber = (List<Hl7.Fhir.Model.Identifier>)value;
+            return this;
+          case "revenue":
+            Revenue = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "productOrService":
+            ProductOrService = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "productOrServiceEnd":
+            ProductOrServiceEnd = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "modifier":
+            Modifier = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+            return this;
+          case "quantity":
+            Quantity = (Hl7.Fhir.Model.Quantity)value;
+            return this;
+          case "unitPrice":
+            UnitPrice = (Hl7.Fhir.Model.Money)value;
+            return this;
+          case "factor":
+            FactorElement = (Hl7.Fhir.Model.FhirDecimal)value;
+            return this;
+          case "tax":
+            Tax = (Hl7.Fhir.Model.Money)value;
+            return this;
+          case "net":
+            Net = (Hl7.Fhir.Model.Money)value;
+            return this;
+          case "noteNumber":
+            NoteNumberElement = (List<Hl7.Fhir.Model.PositiveInt>)value;
+            return this;
+          case "reviewOutcome":
+            ReviewOutcome = (Hl7.Fhir.Model.ClaimResponse.ReviewOutcomeComponent)value;
+            return this;
+          case "adjudication":
+            Adjudication = (List<Hl7.Fhir.Model.ClaimResponse.AdjudicationComponent>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -3077,7 +3414,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ClaimResponse#Total", IsNestedType=true)]
+    [FhirType("ClaimResponse#Total")]
     [BackboneType("ClaimResponse.total")]
     public partial class TotalComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -3198,6 +3535,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "category":
+            Category = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "amount":
+            Amount = (Hl7.Fhir.Model.Money)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -3215,7 +3568,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ClaimResponse#Payment", IsNestedType=true)]
+    [FhirType("ClaimResponse#Payment")]
     [BackboneType("ClaimResponse.payment")]
     public partial class PaymentComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -3439,6 +3792,34 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "type":
+            Type = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "adjustment":
+            Adjustment = (Hl7.Fhir.Model.Money)value;
+            return this;
+          case "adjustmentReason":
+            AdjustmentReason = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "date":
+            DateElement = (Hl7.Fhir.Model.Date)value;
+            return this;
+          case "amount":
+            Amount = (Hl7.Fhir.Model.Money)value;
+            return this;
+          case "identifier":
+            Identifier = (Hl7.Fhir.Model.Identifier)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -3460,7 +3841,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ClaimResponse#Note", IsNestedType=true)]
+    [FhirType("ClaimResponse#Note")]
     [BackboneType("ClaimResponse.processNote")]
     public partial class NoteComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -3659,6 +4040,28 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "number":
+            NumberElement = (Hl7.Fhir.Model.PositiveInt)value;
+            return this;
+          case "type":
+            Type = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "text":
+            TextElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "language":
+            Language = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -3679,7 +4082,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ClaimResponse#Insurance", IsNestedType=true)]
+    [FhirType("ClaimResponse#Insurance")]
     [BackboneType("ClaimResponse.insurance")]
     public partial class InsuranceComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -3921,6 +4324,31 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "sequence":
+            SequenceElement = (Hl7.Fhir.Model.PositiveInt)value;
+            return this;
+          case "focal":
+            FocalElement = (Hl7.Fhir.Model.FhirBoolean)value;
+            return this;
+          case "coverage":
+            Coverage = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          case "businessArrangement":
+            BusinessArrangementElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "claimResponse":
+            ClaimResponse = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -3942,7 +4370,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ClaimResponse#Error", IsNestedType=true)]
+    [FhirType("ClaimResponse#Error")]
     [BackboneType("ClaimResponse.error")]
     public partial class ErrorComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -4198,6 +4626,31 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "itemSequence":
+            ItemSequenceElement = (Hl7.Fhir.Model.PositiveInt)value;
+            return this;
+          case "detailSequence":
+            DetailSequenceElement = (Hl7.Fhir.Model.PositiveInt)value;
+            return this;
+          case "subDetailSequence":
+            SubDetailSequenceElement = (Hl7.Fhir.Model.PositiveInt)value;
+            return this;
+          case "code":
+            Code = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "expression":
+            ExpressionElement = (List<Hl7.Fhir.Model.FhirString>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -5102,6 +5555,112 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "traceNumber":
+          TraceNumber = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "status":
+          StatusElement = (Code<Hl7.Fhir.Model.FinancialResourceStatusCodes>)value;
+          return this;
+        case "type":
+          Type = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "subType":
+          SubType = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "use":
+          UseElement = (Code<Hl7.Fhir.Model.ClaimUseCode>)value;
+          return this;
+        case "patient":
+          Patient = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "created":
+          CreatedElement = (Hl7.Fhir.Model.FhirDateTime)value;
+          return this;
+        case "insurer":
+          Insurer = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "requestor":
+          Requestor = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "request":
+          Request = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "outcome":
+          OutcomeElement = (Code<Hl7.Fhir.Model.ClaimProcessingCodes>)value;
+          return this;
+        case "decision":
+          Decision = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "disposition":
+          DispositionElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "preAuthRef":
+          PreAuthRefElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "preAuthPeriod":
+          PreAuthPeriod = (Hl7.Fhir.Model.Period)value;
+          return this;
+        case "event":
+          Event = (List<Hl7.Fhir.Model.ClaimResponse.EventComponent>)value;
+          return this;
+        case "payeeType":
+          PayeeType = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "encounter":
+          Encounter = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "diagnosisRelatedGroup":
+          DiagnosisRelatedGroup = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "item":
+          Item = (List<Hl7.Fhir.Model.ClaimResponse.ItemComponent>)value;
+          return this;
+        case "addItem":
+          AddItem = (List<Hl7.Fhir.Model.ClaimResponse.AddedItemComponent>)value;
+          return this;
+        case "adjudication":
+          Adjudication = (List<Hl7.Fhir.Model.ClaimResponse.AdjudicationComponent>)value;
+          return this;
+        case "total":
+          Total = (List<Hl7.Fhir.Model.ClaimResponse.TotalComponent>)value;
+          return this;
+        case "payment":
+          Payment = (Hl7.Fhir.Model.ClaimResponse.PaymentComponent)value;
+          return this;
+        case "fundsReserve":
+          FundsReserve = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "formCode":
+          FormCode = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "form":
+          Form = (Hl7.Fhir.Model.Attachment)value;
+          return this;
+        case "processNote":
+          ProcessNote = (List<Hl7.Fhir.Model.ClaimResponse.NoteComponent>)value;
+          return this;
+        case "communicationRequest":
+          CommunicationRequest = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "insurance":
+          Insurance = (List<Hl7.Fhir.Model.ClaimResponse.InsuranceComponent>)value;
+          return this;
+        case "error":
+          Error = (List<Hl7.Fhir.Model.ClaimResponse.ErrorComponent>)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/ClinicalImpression.cs b/src/Hl7.Fhir.R5/Model/Generated/ClinicalImpression.cs
index 3afc280dfd..786c87bd1b 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/ClinicalImpression.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/ClinicalImpression.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("ClinicalImpression","http://hl7.org/fhir/StructureDefinition/ClinicalImpression", IsResource=true)]
+  [FhirType("ClinicalImpression","http://hl7.org/fhir/StructureDefinition/ClinicalImpression")]
   public partial class ClinicalImpression : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -67,7 +67,7 @@ public partial class ClinicalImpression : Hl7.Fhir.Model.DomainResource, IIdenti
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ClinicalImpression#Finding", IsNestedType=true)]
+    [FhirType("ClinicalImpression#Finding")]
     [BackboneType("ClinicalImpression.finding")]
     public partial class FindingComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -204,6 +204,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "item":
+            Item = (Hl7.Fhir.Model.CodeableReference)value;
+            return this;
+          case "basis":
+            BasisElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -802,6 +818,73 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "status":
+          StatusElement = (Code<Hl7.Fhir.Model.EventStatus>)value;
+          return this;
+        case "statusReason":
+          StatusReason = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "description":
+          DescriptionElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "subject":
+          Subject = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "encounter":
+          Encounter = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "effective":
+          Effective = (Hl7.Fhir.Model.DataType)value;
+          return this;
+        case "date":
+          DateElement = (Hl7.Fhir.Model.FhirDateTime)value;
+          return this;
+        case "performer":
+          Performer = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "previous":
+          Previous = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "problem":
+          Problem = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "changePattern":
+          ChangePattern = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "protocol":
+          ProtocolElement = (List<Hl7.Fhir.Model.FhirUri>)value;
+          return this;
+        case "summary":
+          SummaryElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "finding":
+          Finding = (List<Hl7.Fhir.Model.ClinicalImpression.FindingComponent>)value;
+          return this;
+        case "prognosisCodeableConcept":
+          PrognosisCodeableConcept = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "prognosisReference":
+          PrognosisReference = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "supportingInfo":
+          SupportingInfo = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "note":
+          Note = (List<Hl7.Fhir.Model.Annotation>)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/ClinicalUseDefinition.cs b/src/Hl7.Fhir.R5/Model/Generated/ClinicalUseDefinition.cs
index 473481770c..3619ad5e49 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/ClinicalUseDefinition.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/ClinicalUseDefinition.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model
   /// </summary>
   [Serializable]
   [DataContract]
-  [FhirType("ClinicalUseDefinition","http://hl7.org/fhir/StructureDefinition/ClinicalUseDefinition", IsResource=true)]
+  [FhirType("ClinicalUseDefinition","http://hl7.org/fhir/StructureDefinition/ClinicalUseDefinition")]
   public partial class ClinicalUseDefinition : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -101,7 +101,7 @@ public enum ClinicalUseDefinitionType
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("ClinicalUseDefinition#Contraindication", IsNestedType=true)]
+    [FhirType("ClinicalUseDefinition#Contraindication")]
     [BackboneType("ClinicalUseDefinition.contraindication")]
     public partial class ContraindicationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -311,6 +311,34 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "diseaseSymptomProcedure":
+            DiseaseSymptomProcedure = (Hl7.Fhir.Model.CodeableReference)value;
+            return this;
+          case "diseaseStatus":
+            DiseaseStatus = (Hl7.Fhir.Model.CodeableReference)value;
+            return this;
+          case "comorbidity":
+            Comorbidity = (List<Hl7.Fhir.Model.CodeableReference>)value;
+            return this;
+          case "indication":
+            Indication = (List<Hl7.Fhir.Model.ResourceReference>)value;
+            return this;
+          case "applicability":
+            Applicability = (Hl7.Fhir.Model.Expression)value;
+            return this;
+          case "otherTherapy":
+            OtherTherapy = (List<Hl7.Fhir.Model.ClinicalUseDefinition.OtherTherapyComponent>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -332,7 +360,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ClinicalUseDefinition#OtherTherapy", IsNestedType=true)]
+    [FhirType("ClinicalUseDefinition#OtherTherapy")]
     [BackboneType("ClinicalUseDefinition.contraindication.otherTherapy")]
     public partial class OtherTherapyComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -454,6 +482,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "relationshipType":
+            RelationshipType = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "treatment":
+            Treatment = (Hl7.Fhir.Model.CodeableReference)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -468,7 +512,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("ClinicalUseDefinition#Indication", IsNestedType=true)]
+    [FhirType("ClinicalUseDefinition#Indication")]
     [BackboneType("ClinicalUseDefinition.indication")]
     public partial class IndicationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -723,6 +767,40 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "diseaseSymptomProcedure":
+            DiseaseSymptomProcedure = (Hl7.Fhir.Model.CodeableReference)value;
+            return this;
+          case "diseaseStatus":
+            DiseaseStatus = (Hl7.Fhir.Model.CodeableReference)value;
+            return this;
+          case "comorbidity":
+            Comorbidity = (List<Hl7.Fhir.Model.CodeableReference>)value;
+            return this;
+          case "intendedEffect":
+            IntendedEffect = (Hl7.Fhir.Model.CodeableReference)value;
+            return this;
+          case "duration":
+            Duration = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          case "undesirableEffect":
+            UndesirableEffect = (List<Hl7.Fhir.Model.ResourceReference>)value;
+            return this;
+          case "applicability":
+            Applicability = (Hl7.Fhir.Model.Expression)value;
+            return this;
+          case "otherTherapy":
+            OtherTherapy = (List<Hl7.Fhir.Model.ClinicalUseDefinition.OtherTherapyComponent>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -743,7 +821,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("ClinicalUseDefinition#Interaction", IsNestedType=true)]
+    [FhirType("ClinicalUseDefinition#Interaction")]
     [BackboneType("ClinicalUseDefinition.interaction")]
     public partial class InteractionComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -930,6 +1008,31 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "interactant":
+            Interactant = (List<Hl7.Fhir.Model.ClinicalUseDefinition.InteractantComponent>)value;
+            return this;
+          case "type":
+            Type = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "effect":
+            Effect = (Hl7.Fhir.Model.CodeableReference)value;
+            return this;
+          case "incidence":
+            Incidence = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "management":
+            Management = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -950,7 +1053,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ClinicalUseDefinition#Interactant", IsNestedType=true)]
+    [FhirType("ClinicalUseDefinition#Interactant")]
     [BackboneType("ClinicalUseDefinition.interaction.interactant")]
     public partial class InteractantComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1052,6 +1155,19 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "item":
+            Item = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1068,7 +1184,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ClinicalUseDefinition#UndesirableEffect", IsNestedType=true)]
+    [FhirType("ClinicalUseDefinition#UndesirableEffect")]
     [BackboneType("ClinicalUseDefinition.undesirableEffect")]
     public partial class UndesirableEffectComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1210,6 +1326,25 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "symptomConditionEffect":
+            SymptomConditionEffect = (Hl7.Fhir.Model.CodeableReference)value;
+            return this;
+          case "classification":
+            Classification = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "frequencyOfOccurrence":
+            FrequencyOfOccurrence = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1228,7 +1363,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ClinicalUseDefinition#Warning", IsNestedType=true)]
+    [FhirType("ClinicalUseDefinition#Warning")]
     [BackboneType("ClinicalUseDefinition.warning")]
     public partial class WarningComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1365,6 +1500,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "description":
+            DescriptionElement = (Hl7.Fhir.Model.Markdown)value;
+            return this;
+          case "code":
+            Code = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1745,6 +1896,52 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "type":
+          TypeElement = (Code<Hl7.Fhir.Model.ClinicalUseDefinition.ClinicalUseDefinitionType>)value;
+          return this;
+        case "category":
+          Category = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "subject":
+          Subject = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "status":
+          Status = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "contraindication":
+          Contraindication = (Hl7.Fhir.Model.ClinicalUseDefinition.ContraindicationComponent)value;
+          return this;
+        case "indication":
+          Indication = (Hl7.Fhir.Model.ClinicalUseDefinition.IndicationComponent)value;
+          return this;
+        case "interaction":
+          Interaction = (Hl7.Fhir.Model.ClinicalUseDefinition.InteractionComponent)value;
+          return this;
+        case "population":
+          Population = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "library":
+          LibraryElement = (List<Hl7.Fhir.Model.Canonical>)value;
+          return this;
+        case "undesirableEffect":
+          UndesirableEffect = (Hl7.Fhir.Model.ClinicalUseDefinition.UndesirableEffectComponent)value;
+          return this;
+        case "warning":
+          Warning = (Hl7.Fhir.Model.ClinicalUseDefinition.WarningComponent)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/Communication.cs b/src/Hl7.Fhir.R5/Model/Generated/Communication.cs
index 7c88530cd0..580da3157d 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/Communication.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/Communication.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Communication","http://hl7.org/fhir/StructureDefinition/Communication", IsResource=true)]
+  [FhirType("Communication","http://hl7.org/fhir/StructureDefinition/Communication")]
   public partial class Communication : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -67,7 +67,7 @@ public partial class Communication : Hl7.Fhir.Model.DomainResource, IIdentifiabl
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Communication#Payload", IsNestedType=true)]
+    [FhirType("Communication#Payload")]
     [BackboneType("Communication.payload")]
     public partial class PayloadComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -168,6 +168,19 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "content":
+            Content = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -854,6 +867,82 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "instantiatesCanonical":
+          InstantiatesCanonicalElement = (List<Hl7.Fhir.Model.Canonical>)value;
+          return this;
+        case "instantiatesUri":
+          InstantiatesUriElement = (List<Hl7.Fhir.Model.FhirUri>)value;
+          return this;
+        case "basedOn":
+          BasedOn = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "partOf":
+          PartOf = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "inResponseTo":
+          InResponseTo = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "status":
+          StatusElement = (Code<Hl7.Fhir.Model.EventStatus>)value;
+          return this;
+        case "statusReason":
+          StatusReason = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "category":
+          Category = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "priority":
+          PriorityElement = (Code<Hl7.Fhir.Model.RequestPriority>)value;
+          return this;
+        case "medium":
+          Medium = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "subject":
+          Subject = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "topic":
+          Topic = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "about":
+          About = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "encounter":
+          Encounter = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "sent":
+          SentElement = (Hl7.Fhir.Model.FhirDateTime)value;
+          return this;
+        case "received":
+          ReceivedElement = (Hl7.Fhir.Model.FhirDateTime)value;
+          return this;
+        case "recipient":
+          Recipient = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "sender":
+          Sender = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "reason":
+          Reason = (List<Hl7.Fhir.Model.CodeableReference>)value;
+          return this;
+        case "payload":
+          Payload = (List<Hl7.Fhir.Model.Communication.PayloadComponent>)value;
+          return this;
+        case "note":
+          Note = (List<Hl7.Fhir.Model.Annotation>)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/CommunicationRequest.cs b/src/Hl7.Fhir.R5/Model/Generated/CommunicationRequest.cs
index 329e3d0fe4..ac57c8d8eb 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/CommunicationRequest.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/CommunicationRequest.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("CommunicationRequest","http://hl7.org/fhir/StructureDefinition/CommunicationRequest", IsResource=true)]
+  [FhirType("CommunicationRequest","http://hl7.org/fhir/StructureDefinition/CommunicationRequest")]
   public partial class CommunicationRequest : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -67,7 +67,7 @@ public partial class CommunicationRequest : Hl7.Fhir.Model.DomainResource, IIden
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CommunicationRequest#Payload", IsNestedType=true)]
+    [FhirType("CommunicationRequest#Payload")]
     [BackboneType("CommunicationRequest.payload")]
     public partial class PayloadComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -168,6 +168,19 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "content":
+            Content = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -838,6 +851,82 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "basedOn":
+          BasedOn = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "replaces":
+          Replaces = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "groupIdentifier":
+          GroupIdentifier = (Hl7.Fhir.Model.Identifier)value;
+          return this;
+        case "status":
+          StatusElement = (Code<Hl7.Fhir.Model.RequestStatus>)value;
+          return this;
+        case "statusReason":
+          StatusReason = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "intent":
+          IntentElement = (Code<Hl7.Fhir.Model.RequestIntent>)value;
+          return this;
+        case "category":
+          Category = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "priority":
+          PriorityElement = (Code<Hl7.Fhir.Model.RequestPriority>)value;
+          return this;
+        case "doNotPerform":
+          DoNotPerformElement = (Hl7.Fhir.Model.FhirBoolean)value;
+          return this;
+        case "medium":
+          Medium = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "subject":
+          Subject = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "about":
+          About = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "encounter":
+          Encounter = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "payload":
+          Payload = (List<Hl7.Fhir.Model.CommunicationRequest.PayloadComponent>)value;
+          return this;
+        case "occurrence":
+          Occurrence = (Hl7.Fhir.Model.DataType)value;
+          return this;
+        case "authoredOn":
+          AuthoredOnElement = (Hl7.Fhir.Model.FhirDateTime)value;
+          return this;
+        case "requester":
+          Requester = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "recipient":
+          Recipient = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "informationProvider":
+          InformationProvider = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "reason":
+          Reason = (List<Hl7.Fhir.Model.CodeableReference>)value;
+          return this;
+        case "note":
+          Note = (List<Hl7.Fhir.Model.Annotation>)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/CompartmentDefinition.cs b/src/Hl7.Fhir.R5/Model/Generated/CompartmentDefinition.cs
index 0738927d2b..6b2e68e77e 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/CompartmentDefinition.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/CompartmentDefinition.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("CompartmentDefinition","http://hl7.org/fhir/StructureDefinition/CompartmentDefinition", IsResource=true)]
+  [FhirType("CompartmentDefinition","http://hl7.org/fhir/StructureDefinition/CompartmentDefinition")]
   public partial class CompartmentDefinition : Hl7.Fhir.Model.DomainResource
   {
     /// <summary>
@@ -68,7 +68,7 @@ public partial class CompartmentDefinition : Hl7.Fhir.Model.DomainResource
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CompartmentDefinition#Resource", IsNestedType=true)]
+    [FhirType("CompartmentDefinition#Resource")]
     [BackboneType("CompartmentDefinition.resource")]
     public partial class ResourceComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -343,6 +343,31 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "code":
+            CodeElement = (Code<Hl7.Fhir.Model.ResourceType>)value;
+            return this;
+          case "param":
+            ParamElement = (List<Hl7.Fhir.Model.FhirString>)value;
+            return this;
+          case "documentation":
+            DocumentationElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "startParam":
+            StartParamElement = (Hl7.Fhir.Model.FhirUri)value;
+            return this;
+          case "endParam":
+            EndParamElement = (Hl7.Fhir.Model.FhirUri)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -988,6 +1013,64 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "url":
+          UrlElement = (Hl7.Fhir.Model.FhirUri)value;
+          return this;
+        case "version":
+          VersionElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "versionAlgorithm":
+          VersionAlgorithm = (Hl7.Fhir.Model.DataType)value;
+          return this;
+        case "name":
+          NameElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "title":
+          TitleElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "status":
+          StatusElement = (Code<Hl7.Fhir.Model.PublicationStatus>)value;
+          return this;
+        case "experimental":
+          ExperimentalElement = (Hl7.Fhir.Model.FhirBoolean)value;
+          return this;
+        case "date":
+          DateElement = (Hl7.Fhir.Model.FhirDateTime)value;
+          return this;
+        case "publisher":
+          PublisherElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "contact":
+          Contact = (List<Hl7.Fhir.Model.ContactDetail>)value;
+          return this;
+        case "description":
+          DescriptionElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        case "useContext":
+          UseContext = (List<Hl7.Fhir.Model.UsageContext>)value;
+          return this;
+        case "purpose":
+          PurposeElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        case "code":
+          CodeElement = (Code<Hl7.Fhir.Model.CompartmentType>)value;
+          return this;
+        case "search":
+          SearchElement = (Hl7.Fhir.Model.FhirBoolean)value;
+          return this;
+        case "resource":
+          Resource = (List<Hl7.Fhir.Model.CompartmentDefinition.ResourceComponent>)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/Composition.cs b/src/Hl7.Fhir.R5/Model/Generated/Composition.cs
index 2ae820f7f1..b13c5d32cb 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/Composition.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/Composition.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Composition","http://hl7.org/fhir/StructureDefinition/Composition", IsResource=true)]
+  [FhirType("Composition","http://hl7.org/fhir/StructureDefinition/Composition")]
   public partial class Composition : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -69,7 +69,7 @@ public partial class Composition : Hl7.Fhir.Model.DomainResource, IIdentifiable<
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Composition#Attester", IsNestedType=true)]
+    [FhirType("Composition#Attester")]
     [BackboneType("Composition.attester")]
     public partial class AttesterComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -230,6 +230,25 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "mode":
+            Mode = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "time":
+            TimeElement = (Hl7.Fhir.Model.FhirDateTime)value;
+            return this;
+          case "party":
+            Party = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -249,7 +268,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Composition#Event", IsNestedType=true)]
+    [FhirType("Composition#Event")]
     [BackboneType("Composition.event")]
     public partial class EventComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -369,6 +388,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "period":
+            Period = (Hl7.Fhir.Model.Period)value;
+            return this;
+          case "detail":
+            Detail = (List<Hl7.Fhir.Model.CodeableReference>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -386,7 +421,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Composition#Section", IsNestedType=true)]
+    [FhirType("Composition#Section")]
     [BackboneType("Composition.section")]
     public partial class SectionComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -681,6 +716,43 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "title":
+            TitleElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "code":
+            Code = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "author":
+            Author = (List<Hl7.Fhir.Model.ResourceReference>)value;
+            return this;
+          case "focus":
+            Focus = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          case "text":
+            Text = (Hl7.Fhir.Model.Narrative)value;
+            return this;
+          case "orderedBy":
+            OrderedBy = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "entry":
+            Entry = (List<Hl7.Fhir.Model.ResourceReference>)value;
+            return this;
+          case "emptyReason":
+            EmptyReason = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "section":
+            Section = (List<Hl7.Fhir.Model.Composition.SectionComponent>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1299,6 +1371,73 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "url":
+          UrlElement = (Hl7.Fhir.Model.FhirUri)value;
+          return this;
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "version":
+          VersionElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "status":
+          StatusElement = (Code<Hl7.Fhir.Model.CompositionStatus>)value;
+          return this;
+        case "type":
+          Type = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "category":
+          Category = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "subject":
+          Subject = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "encounter":
+          Encounter = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "date":
+          DateElement = (Hl7.Fhir.Model.FhirDateTime)value;
+          return this;
+        case "useContext":
+          UseContext = (List<Hl7.Fhir.Model.UsageContext>)value;
+          return this;
+        case "author":
+          Author = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "name":
+          NameElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "title":
+          TitleElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "note":
+          Note = (List<Hl7.Fhir.Model.Annotation>)value;
+          return this;
+        case "attester":
+          Attester = (List<Hl7.Fhir.Model.Composition.AttesterComponent>)value;
+          return this;
+        case "custodian":
+          Custodian = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "relatesTo":
+          RelatesTo = (List<Hl7.Fhir.Model.RelatedArtifact>)value;
+          return this;
+        case "event":
+          Event = (List<Hl7.Fhir.Model.Composition.EventComponent>)value;
+          return this;
+        case "section":
+          Section = (List<Hl7.Fhir.Model.Composition.SectionComponent>)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/ConceptMap.cs b/src/Hl7.Fhir.R5/Model/Generated/ConceptMap.cs
index 760184b384..c2c3b60af0 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/ConceptMap.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/ConceptMap.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("ConceptMap","http://hl7.org/fhir/StructureDefinition/ConceptMap", IsResource=true)]
+  [FhirType("ConceptMap","http://hl7.org/fhir/StructureDefinition/ConceptMap")]
   public partial class ConceptMap : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -228,7 +228,7 @@ public enum ConceptMapGroupUnmappedMode
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ConceptMap#Property", IsNestedType=true)]
+    [FhirType("ConceptMap#Property")]
     [BackboneType("ConceptMap.property")]
     public partial class PropertyComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -503,6 +503,31 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "code":
+            CodeElement = (Hl7.Fhir.Model.Code)value;
+            return this;
+          case "uri":
+            UriElement = (Hl7.Fhir.Model.FhirUri)value;
+            return this;
+          case "description":
+            DescriptionElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "type":
+            TypeElement = (Code<Hl7.Fhir.Model.ConceptMap.ConceptMapPropertyType>)value;
+            return this;
+          case "system":
+            SystemElement = (Hl7.Fhir.Model.Canonical)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -524,7 +549,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ConceptMap#AdditionalAttribute", IsNestedType=true)]
+    [FhirType("ConceptMap#AdditionalAttribute")]
     [BackboneType("ConceptMap.additionalAttribute")]
     public partial class AdditionalAttributeComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -760,6 +785,28 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "code":
+            CodeElement = (Hl7.Fhir.Model.Code)value;
+            return this;
+          case "uri":
+            UriElement = (Hl7.Fhir.Model.FhirUri)value;
+            return this;
+          case "description":
+            DescriptionElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "type":
+            TypeElement = (Code<Hl7.Fhir.Model.ConceptMap.ConceptMapAttributeType>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -779,7 +826,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ConceptMap#Group", IsNestedType=true)]
+    [FhirType("ConceptMap#Group")]
     [BackboneType("ConceptMap.group")]
     public partial class GroupComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -976,6 +1023,28 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "source":
+            SourceElement = (Hl7.Fhir.Model.Canonical)value;
+            return this;
+          case "target":
+            TargetElement = (Hl7.Fhir.Model.Canonical)value;
+            return this;
+          case "element":
+            Element = (List<Hl7.Fhir.Model.ConceptMap.SourceElementComponent>)value;
+            return this;
+          case "unmapped":
+            Unmapped = (Hl7.Fhir.Model.ConceptMap.UnmappedComponent)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -996,7 +1065,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ConceptMap#SourceElement", IsNestedType=true)]
+    [FhirType("ConceptMap#SourceElement")]
     [BackboneType("ConceptMap.group.element")]
     public partial class SourceElementComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1250,6 +1319,31 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "code":
+            CodeElement = (Hl7.Fhir.Model.Code)value;
+            return this;
+          case "display":
+            DisplayElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "valueSet":
+            ValueSetElement = (Hl7.Fhir.Model.Canonical)value;
+            return this;
+          case "noMap":
+            NoMapElement = (Hl7.Fhir.Model.FhirBoolean)value;
+            return this;
+          case "target":
+            Target = (List<Hl7.Fhir.Model.ConceptMap.TargetElementComponent>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1271,7 +1365,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ConceptMap#TargetElement", IsNestedType=true)]
+    [FhirType("ConceptMap#TargetElement")]
     [BackboneType("ConceptMap.group.element.target")]
     public partial class TargetElementComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1611,6 +1705,40 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "code":
+            CodeElement = (Hl7.Fhir.Model.Code)value;
+            return this;
+          case "display":
+            DisplayElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "valueSet":
+            ValueSetElement = (Hl7.Fhir.Model.Canonical)value;
+            return this;
+          case "relationship":
+            RelationshipElement = (Code<Hl7.Fhir.Model.ConceptMap.ConceptMapRelationship>)value;
+            return this;
+          case "comment":
+            CommentElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "property":
+            Property = (List<Hl7.Fhir.Model.ConceptMap.MappingPropertyComponent>)value;
+            return this;
+          case "dependsOn":
+            DependsOn = (List<Hl7.Fhir.Model.ConceptMap.OtherElementComponent>)value;
+            return this;
+          case "product":
+            Product = (List<Hl7.Fhir.Model.ConceptMap.OtherElementComponent>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1634,7 +1762,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ConceptMap#MappingProperty", IsNestedType=true)]
+    [FhirType("ConceptMap#MappingProperty")]
     [BackboneType("ConceptMap.group.element.target.property")]
     public partial class MappingPropertyComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1774,6 +1902,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "code":
+            CodeElement = (Hl7.Fhir.Model.Code)value;
+            return this;
+          case "value":
+            Value = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1791,7 +1935,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ConceptMap#OtherElement", IsNestedType=true)]
+    [FhirType("ConceptMap#OtherElement")]
     [BackboneType("ConceptMap.group.element.target.dependsOn")]
     public partial class OtherElementComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1969,6 +2113,25 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "attribute":
+            AttributeElement = (Hl7.Fhir.Model.Code)value;
+            return this;
+          case "value":
+            Value = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          case "valueSet":
+            ValueSetElement = (Hl7.Fhir.Model.Canonical)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1988,7 +2151,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ConceptMap#Unmapped", IsNestedType=true)]
+    [FhirType("ConceptMap#Unmapped")]
     [BackboneType("ConceptMap.group.unmapped")]
     public partial class UnmappedComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2303,6 +2466,34 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "mode":
+            ModeElement = (Code<Hl7.Fhir.Model.ConceptMap.ConceptMapGroupUnmappedMode>)value;
+            return this;
+          case "code":
+            CodeElement = (Hl7.Fhir.Model.Code)value;
+            return this;
+          case "display":
+            DisplayElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "valueSet":
+            ValueSetElement = (Hl7.Fhir.Model.Canonical)value;
+            return this;
+          case "relationship":
+            RelationshipElement = (Code<Hl7.Fhir.Model.ConceptMap.ConceptMapRelationship>)value;
+            return this;
+          case "otherMap":
+            OtherMapElement = (Hl7.Fhir.Model.Canonical)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -3312,6 +3503,109 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "url":
+          UrlElement = (Hl7.Fhir.Model.FhirUri)value;
+          return this;
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "version":
+          VersionElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "versionAlgorithm":
+          VersionAlgorithm = (Hl7.Fhir.Model.DataType)value;
+          return this;
+        case "name":
+          NameElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "title":
+          TitleElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "status":
+          StatusElement = (Code<Hl7.Fhir.Model.PublicationStatus>)value;
+          return this;
+        case "experimental":
+          ExperimentalElement = (Hl7.Fhir.Model.FhirBoolean)value;
+          return this;
+        case "date":
+          DateElement = (Hl7.Fhir.Model.FhirDateTime)value;
+          return this;
+        case "publisher":
+          PublisherElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "contact":
+          Contact = (List<Hl7.Fhir.Model.ContactDetail>)value;
+          return this;
+        case "description":
+          DescriptionElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        case "useContext":
+          UseContext = (List<Hl7.Fhir.Model.UsageContext>)value;
+          return this;
+        case "jurisdiction":
+          Jurisdiction = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "purpose":
+          PurposeElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        case "copyright":
+          CopyrightElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        case "copyrightLabel":
+          CopyrightLabelElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "approvalDate":
+          ApprovalDateElement = (Hl7.Fhir.Model.Date)value;
+          return this;
+        case "lastReviewDate":
+          LastReviewDateElement = (Hl7.Fhir.Model.Date)value;
+          return this;
+        case "effectivePeriod":
+          EffectivePeriod = (Hl7.Fhir.Model.Period)value;
+          return this;
+        case "topic":
+          Topic = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "author":
+          Author = (List<Hl7.Fhir.Model.ContactDetail>)value;
+          return this;
+        case "editor":
+          Editor = (List<Hl7.Fhir.Model.ContactDetail>)value;
+          return this;
+        case "reviewer":
+          Reviewer = (List<Hl7.Fhir.Model.ContactDetail>)value;
+          return this;
+        case "endorser":
+          Endorser = (List<Hl7.Fhir.Model.ContactDetail>)value;
+          return this;
+        case "relatedArtifact":
+          RelatedArtifact = (List<Hl7.Fhir.Model.RelatedArtifact>)value;
+          return this;
+        case "property":
+          Property = (List<Hl7.Fhir.Model.ConceptMap.PropertyComponent>)value;
+          return this;
+        case "additionalAttribute":
+          AdditionalAttribute = (List<Hl7.Fhir.Model.ConceptMap.AdditionalAttributeComponent>)value;
+          return this;
+        case "sourceScope":
+          SourceScope = (Hl7.Fhir.Model.DataType)value;
+          return this;
+        case "targetScope":
+          TargetScope = (Hl7.Fhir.Model.DataType)value;
+          return this;
+        case "group":
+          Group = (List<Hl7.Fhir.Model.ConceptMap.GroupComponent>)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/Condition.cs b/src/Hl7.Fhir.R5/Model/Generated/Condition.cs
index eb03f2196a..00f5d9d5a9 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/Condition.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/Condition.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Condition","http://hl7.org/fhir/StructureDefinition/Condition", IsResource=true)]
+  [FhirType("Condition","http://hl7.org/fhir/StructureDefinition/Condition")]
   public partial class Condition : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -165,7 +165,7 @@ public enum ConditionVerificationStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Condition#Participant", IsNestedType=true)]
+    [FhirType("Condition#Participant")]
     [BackboneType("Condition.participant")]
     public partial class ParticipantComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -287,6 +287,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "function":
+            Function = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "actor":
+            Actor = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -304,7 +320,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Condition#Stage", IsNestedType=true)]
+    [FhirType("Condition#Stage")]
     [BackboneType("Condition.stage")]
     public partial class StageComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -448,6 +464,25 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "summary":
+            Summary = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "assessment":
+            Assessment = (List<Hl7.Fhir.Model.ResourceReference>)value;
+            return this;
+          case "type":
+            Type = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -905,6 +940,64 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "clinicalStatus":
+          ClinicalStatus = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "verificationStatus":
+          VerificationStatus = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "category":
+          Category = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "severity":
+          Severity = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "code":
+          Code = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "bodySite":
+          BodySite = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "subject":
+          Subject = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "encounter":
+          Encounter = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "onset":
+          Onset = (Hl7.Fhir.Model.DataType)value;
+          return this;
+        case "abatement":
+          Abatement = (Hl7.Fhir.Model.DataType)value;
+          return this;
+        case "recordedDate":
+          RecordedDateElement = (Hl7.Fhir.Model.FhirDateTime)value;
+          return this;
+        case "participant":
+          Participant = (List<Hl7.Fhir.Model.Condition.ParticipantComponent>)value;
+          return this;
+        case "stage":
+          Stage = (List<Hl7.Fhir.Model.Condition.StageComponent>)value;
+          return this;
+        case "evidence":
+          Evidence = (List<Hl7.Fhir.Model.CodeableReference>)value;
+          return this;
+        case "note":
+          Note = (List<Hl7.Fhir.Model.Annotation>)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/ConditionDefinition.cs b/src/Hl7.Fhir.R5/Model/Generated/ConditionDefinition.cs
index 1ce9c242f0..5484dc0077 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/ConditionDefinition.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/ConditionDefinition.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("ConditionDefinition","http://hl7.org/fhir/StructureDefinition/ConditionDefinition", IsResource=true)]
+  [FhirType("ConditionDefinition","http://hl7.org/fhir/StructureDefinition/ConditionDefinition")]
   public partial class ConditionDefinition : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -114,7 +114,7 @@ public enum ConditionQuestionnairePurpose
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("ConditionDefinition#Observation", IsNestedType=true)]
+    [FhirType("ConditionDefinition#Observation")]
     [BackboneType("ConditionDefinition.observation")]
     public partial class ObservationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -234,6 +234,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "category":
+            Category = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "code":
+            Code = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -248,7 +264,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("ConditionDefinition#Medication", IsNestedType=true)]
+    [FhirType("ConditionDefinition#Medication")]
     [BackboneType("ConditionDefinition.medication")]
     public partial class MedicationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -368,6 +384,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "category":
+            Category = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "code":
+            Code = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -385,7 +417,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ConditionDefinition#Precondition", IsNestedType=true)]
+    [FhirType("ConditionDefinition#Precondition")]
     [BackboneType("ConditionDefinition.precondition")]
     public partial class PreconditionComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -549,6 +581,25 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "type":
+            TypeElement = (Code<Hl7.Fhir.Model.ConditionDefinition.ConditionPreconditionType>)value;
+            return this;
+          case "code":
+            Code = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "value":
+            Value = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -564,7 +615,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("ConditionDefinition#Questionnaire", IsNestedType=true)]
+    [FhirType("ConditionDefinition#Questionnaire")]
     [BackboneType("ConditionDefinition.questionnaire")]
     public partial class QuestionnaireComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -706,6 +757,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "purpose":
+            PurposeElement = (Code<Hl7.Fhir.Model.ConditionDefinition.ConditionQuestionnairePurpose>)value;
+            return this;
+          case "reference":
+            Reference = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -720,7 +787,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("ConditionDefinition#Plan", IsNestedType=true)]
+    [FhirType("ConditionDefinition#Plan")]
     [BackboneType("ConditionDefinition.plan")]
     public partial class PlanComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -841,6 +908,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "role":
+            Role = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "reference":
+            Reference = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1804,6 +1887,103 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "url":
+          UrlElement = (Hl7.Fhir.Model.FhirUri)value;
+          return this;
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "version":
+          VersionElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "versionAlgorithm":
+          VersionAlgorithm = (Hl7.Fhir.Model.DataType)value;
+          return this;
+        case "name":
+          NameElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "title":
+          TitleElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "subtitle":
+          SubtitleElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "status":
+          StatusElement = (Code<Hl7.Fhir.Model.PublicationStatus>)value;
+          return this;
+        case "experimental":
+          ExperimentalElement = (Hl7.Fhir.Model.FhirBoolean)value;
+          return this;
+        case "date":
+          DateElement = (Hl7.Fhir.Model.FhirDateTime)value;
+          return this;
+        case "publisher":
+          PublisherElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "contact":
+          Contact = (List<Hl7.Fhir.Model.ContactDetail>)value;
+          return this;
+        case "description":
+          DescriptionElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        case "useContext":
+          UseContext = (List<Hl7.Fhir.Model.UsageContext>)value;
+          return this;
+        case "jurisdiction":
+          Jurisdiction = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "code":
+          Code = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "severity":
+          Severity = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "bodySite":
+          BodySite = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "stage":
+          Stage = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "hasSeverity":
+          HasSeverityElement = (Hl7.Fhir.Model.FhirBoolean)value;
+          return this;
+        case "hasBodySite":
+          HasBodySiteElement = (Hl7.Fhir.Model.FhirBoolean)value;
+          return this;
+        case "hasStage":
+          HasStageElement = (Hl7.Fhir.Model.FhirBoolean)value;
+          return this;
+        case "definition":
+          DefinitionElement = (List<Hl7.Fhir.Model.FhirUri>)value;
+          return this;
+        case "observation":
+          Observation = (List<Hl7.Fhir.Model.ConditionDefinition.ObservationComponent>)value;
+          return this;
+        case "medication":
+          Medication = (List<Hl7.Fhir.Model.ConditionDefinition.MedicationComponent>)value;
+          return this;
+        case "precondition":
+          Precondition = (List<Hl7.Fhir.Model.ConditionDefinition.PreconditionComponent>)value;
+          return this;
+        case "team":
+          Team = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "questionnaire":
+          Questionnaire = (List<Hl7.Fhir.Model.ConditionDefinition.QuestionnaireComponent>)value;
+          return this;
+        case "plan":
+          Plan = (List<Hl7.Fhir.Model.ConditionDefinition.PlanComponent>)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/Consent.cs b/src/Hl7.Fhir.R5/Model/Generated/Consent.cs
index 672c522735..74ff771583 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/Consent.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/Consent.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Consent","http://hl7.org/fhir/StructureDefinition/Consent", IsResource=true)]
+  [FhirType("Consent","http://hl7.org/fhir/StructureDefinition/Consent")]
   public partial class Consent : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -114,7 +114,7 @@ public enum ConsentState
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Consent#PolicyBasis", IsNestedType=true)]
+    [FhirType("Consent#PolicyBasis")]
     [BackboneType("Consent.policyBasis")]
     public partial class PolicyBasisComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -252,6 +252,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "reference":
+            Reference = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          case "url":
+            UrlElement = (Hl7.Fhir.Model.FhirUrl)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -269,7 +285,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Consent#Verification", IsNestedType=true)]
+    [FhirType("Consent#Verification")]
     [BackboneType("Consent.verification")]
     public partial class VerificationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -493,6 +509,31 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "verified":
+            VerifiedElement = (Hl7.Fhir.Model.FhirBoolean)value;
+            return this;
+          case "verificationType":
+            VerificationType = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "verifiedBy":
+            VerifiedBy = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          case "verifiedWith":
+            VerifiedWith = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          case "verificationDate":
+            VerificationDateElement = (List<Hl7.Fhir.Model.FhirDateTime>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -513,7 +554,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Consent#provision", IsNestedType=true)]
+    [FhirType("Consent#provision")]
     [BackboneType("Consent.provision")]
     public partial class provisionComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -856,6 +897,52 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "period":
+            Period = (Hl7.Fhir.Model.Period)value;
+            return this;
+          case "actor":
+            Actor = (List<Hl7.Fhir.Model.Consent.provisionActorComponent>)value;
+            return this;
+          case "action":
+            Action = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+            return this;
+          case "securityLabel":
+            SecurityLabel = (List<Hl7.Fhir.Model.Coding>)value;
+            return this;
+          case "purpose":
+            Purpose = (List<Hl7.Fhir.Model.Coding>)value;
+            return this;
+          case "documentType":
+            DocumentType = (List<Hl7.Fhir.Model.Coding>)value;
+            return this;
+          case "resourceType":
+            ResourceType = (List<Hl7.Fhir.Model.Coding>)value;
+            return this;
+          case "code":
+            Code = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+            return this;
+          case "dataPeriod":
+            DataPeriod = (Hl7.Fhir.Model.Period)value;
+            return this;
+          case "data":
+            Data = (List<Hl7.Fhir.Model.Consent.provisionDataComponent>)value;
+            return this;
+          case "expression":
+            Expression = (Hl7.Fhir.Model.Expression)value;
+            return this;
+          case "provision":
+            Provision = (List<Hl7.Fhir.Model.Consent.provisionComponent>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -883,7 +970,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Consent#provisionActor", IsNestedType=true)]
+    [FhirType("Consent#provisionActor")]
     [BackboneType("Consent.provision.actor")]
     public partial class provisionActorComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1004,6 +1091,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "role":
+            Role = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "reference":
+            Reference = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1021,7 +1124,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Consent#provisionData", IsNestedType=true)]
+    [FhirType("Consent#provisionData")]
     [BackboneType("Consent.provision.data")]
     public partial class provisionDataComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1163,6 +1266,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "meaning":
+            MeaningElement = (Code<Hl7.Fhir.Model.ConsentDataMeaning>)value;
+            return this;
+          case "reference":
+            Reference = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1706,6 +1825,70 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "status":
+          StatusElement = (Code<Hl7.Fhir.Model.Consent.ConsentState>)value;
+          return this;
+        case "category":
+          Category = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "subject":
+          Subject = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "date":
+          DateElement = (Hl7.Fhir.Model.Date)value;
+          return this;
+        case "period":
+          Period = (Hl7.Fhir.Model.Period)value;
+          return this;
+        case "grantor":
+          Grantor = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "grantee":
+          Grantee = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "manager":
+          Manager = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "controller":
+          Controller = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "sourceAttachment":
+          SourceAttachment = (List<Hl7.Fhir.Model.Attachment>)value;
+          return this;
+        case "sourceReference":
+          SourceReference = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "regulatoryBasis":
+          RegulatoryBasis = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "policyBasis":
+          PolicyBasis = (Hl7.Fhir.Model.Consent.PolicyBasisComponent)value;
+          return this;
+        case "policyText":
+          PolicyText = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "verification":
+          Verification = (List<Hl7.Fhir.Model.Consent.VerificationComponent>)value;
+          return this;
+        case "decision":
+          DecisionElement = (Code<Hl7.Fhir.Model.ConsentProvisionType>)value;
+          return this;
+        case "provision":
+          Provision = (List<Hl7.Fhir.Model.Consent.provisionComponent>)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/Contract.cs b/src/Hl7.Fhir.R5/Model/Generated/Contract.cs
index e7bae941a7..d28fa86307 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/Contract.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/Contract.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Contract","http://hl7.org/fhir/StructureDefinition/Contract", IsResource=true)]
+  [FhirType("Contract","http://hl7.org/fhir/StructureDefinition/Contract")]
   public partial class Contract : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -267,7 +267,7 @@ public enum ContractResourcePublicationStatusCodes
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Contract#ContentDefinition", IsNestedType=true)]
+    [FhirType("Contract#ContentDefinition")]
     [BackboneType("Contract.contentDefinition")]
     public partial class ContentDefinitionComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -531,6 +531,34 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "type":
+            Type = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "subType":
+            SubType = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "publisher":
+            Publisher = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          case "publicationDate":
+            PublicationDateElement = (Hl7.Fhir.Model.FhirDateTime)value;
+            return this;
+          case "publicationStatus":
+            PublicationStatusElement = (Code<Hl7.Fhir.Model.Contract.ContractResourcePublicationStatusCodes>)value;
+            return this;
+          case "copyright":
+            CopyrightElement = (Hl7.Fhir.Model.Markdown)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -552,7 +580,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Contract#Term", IsNestedType=true)]
+    [FhirType("Contract#Term")]
     [BackboneType("Contract.term")]
     public partial class TermComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -926,6 +954,52 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "identifier":
+            Identifier = (Hl7.Fhir.Model.Identifier)value;
+            return this;
+          case "issued":
+            IssuedElement = (Hl7.Fhir.Model.FhirDateTime)value;
+            return this;
+          case "applies":
+            Applies = (Hl7.Fhir.Model.Period)value;
+            return this;
+          case "topic":
+            Topic = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          case "type":
+            Type = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "subType":
+            SubType = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "text":
+            TextElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "securityLabel":
+            SecurityLabel = (List<Hl7.Fhir.Model.Contract.SecurityLabelComponent>)value;
+            return this;
+          case "offer":
+            Offer = (Hl7.Fhir.Model.Contract.ContractOfferComponent)value;
+            return this;
+          case "asset":
+            Asset = (List<Hl7.Fhir.Model.Contract.ContractAssetComponent>)value;
+            return this;
+          case "action":
+            Action = (List<Hl7.Fhir.Model.Contract.ActionComponent>)value;
+            return this;
+          case "group":
+            Group = (List<Hl7.Fhir.Model.Contract.TermComponent>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -955,7 +1029,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Contract#SecurityLabel", IsNestedType=true)]
+    [FhirType("Contract#SecurityLabel")]
     [BackboneType("Contract.term.securityLabel")]
     public partial class SecurityLabelComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1140,6 +1214,28 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "number":
+            NumberElement = (List<Hl7.Fhir.Model.UnsignedInt>)value;
+            return this;
+          case "classification":
+            Classification = (Hl7.Fhir.Model.Coding)value;
+            return this;
+          case "category":
+            Category = (List<Hl7.Fhir.Model.Coding>)value;
+            return this;
+          case "control":
+            Control = (List<Hl7.Fhir.Model.Coding>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1159,7 +1255,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Contract#ContractOffer", IsNestedType=true)]
+    [FhirType("Contract#ContractOffer")]
     [BackboneType("Contract.term.offer")]
     public partial class ContractOfferComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1510,6 +1606,46 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "identifier":
+            Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+            return this;
+          case "party":
+            Party = (List<Hl7.Fhir.Model.Contract.ContractPartyComponent>)value;
+            return this;
+          case "topic":
+            Topic = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          case "type":
+            Type = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "decision":
+            Decision = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "decisionMode":
+            DecisionMode = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+            return this;
+          case "answer":
+            Answer = (List<Hl7.Fhir.Model.Contract.AnswerComponent>)value;
+            return this;
+          case "text":
+            TextElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "linkId":
+            LinkIdElement = (List<Hl7.Fhir.Model.FhirString>)value;
+            return this;
+          case "securityLabelNumber":
+            SecurityLabelNumberElement = (List<Hl7.Fhir.Model.UnsignedInt>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1532,7 +1668,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Contract#ContractParty", IsNestedType=true)]
+    [FhirType("Contract#ContractParty")]
     [BackboneType("Contract.term.offer.party")]
     public partial class ContractPartyComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1655,6 +1791,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "reference":
+            Reference = (List<Hl7.Fhir.Model.ResourceReference>)value;
+            return this;
+          case "role":
+            Role = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1669,7 +1821,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Contract#Answer", IsNestedType=true)]
+    [FhirType("Contract#Answer")]
     [BackboneType("Contract.term.offer.answer")]
     public partial class AnswerComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1770,6 +1922,19 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "value":
+            Value = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1783,7 +1948,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Contract#ContractAsset", IsNestedType=true)]
+    [FhirType("Contract#ContractAsset")]
     [BackboneType("Contract.term.asset")]
     public partial class ContractAssetComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2264,6 +2429,61 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "scope":
+            Scope = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "type":
+            Type = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+            return this;
+          case "typeReference":
+            TypeReference = (List<Hl7.Fhir.Model.ResourceReference>)value;
+            return this;
+          case "subtype":
+            Subtype = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+            return this;
+          case "relationship":
+            Relationship = (Hl7.Fhir.Model.Coding)value;
+            return this;
+          case "context":
+            Context = (List<Hl7.Fhir.Model.Contract.AssetContextComponent>)value;
+            return this;
+          case "condition":
+            ConditionElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "periodType":
+            PeriodType = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+            return this;
+          case "period":
+            Period = (List<Hl7.Fhir.Model.Period>)value;
+            return this;
+          case "usePeriod":
+            UsePeriod = (List<Hl7.Fhir.Model.Period>)value;
+            return this;
+          case "text":
+            TextElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "linkId":
+            LinkIdElement = (List<Hl7.Fhir.Model.FhirString>)value;
+            return this;
+          case "answer":
+            Answer = (List<Hl7.Fhir.Model.Contract.AnswerComponent>)value;
+            return this;
+          case "securityLabelNumber":
+            SecurityLabelNumberElement = (List<Hl7.Fhir.Model.UnsignedInt>)value;
+            return this;
+          case "valuedItem":
+            ValuedItem = (List<Hl7.Fhir.Model.Contract.ValuedItemComponent>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -2291,7 +2511,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Contract#AssetContext", IsNestedType=true)]
+    [FhirType("Contract#AssetContext")]
     [BackboneType("Contract.term.asset.context")]
     public partial class AssetContextComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2452,6 +2672,25 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "reference":
+            Reference = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          case "code":
+            Code = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+            return this;
+          case "text":
+            TextElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -2467,7 +2706,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Contract#ValuedItem", IsNestedType=true)]
+    [FhirType("Contract#ValuedItem")]
     [BackboneType("Contract.term.asset.valuedItem")]
     public partial class ValuedItemComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2972,6 +3211,58 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "entity":
+            Entity = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          case "identifier":
+            Identifier = (Hl7.Fhir.Model.Identifier)value;
+            return this;
+          case "effectiveTime":
+            EffectiveTimeElement = (Hl7.Fhir.Model.FhirDateTime)value;
+            return this;
+          case "quantity":
+            Quantity = (Hl7.Fhir.Model.Quantity)value;
+            return this;
+          case "unitPrice":
+            UnitPrice = (Hl7.Fhir.Model.Money)value;
+            return this;
+          case "factor":
+            FactorElement = (Hl7.Fhir.Model.FhirDecimal)value;
+            return this;
+          case "points":
+            PointsElement = (Hl7.Fhir.Model.FhirDecimal)value;
+            return this;
+          case "net":
+            Net = (Hl7.Fhir.Model.Money)value;
+            return this;
+          case "payment":
+            PaymentElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "paymentDate":
+            PaymentDateElement = (Hl7.Fhir.Model.FhirDateTime)value;
+            return this;
+          case "responsible":
+            Responsible = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          case "recipient":
+            Recipient = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          case "linkId":
+            LinkIdElement = (List<Hl7.Fhir.Model.FhirString>)value;
+            return this;
+          case "securityLabelNumber":
+            SecurityLabelNumberElement = (List<Hl7.Fhir.Model.UnsignedInt>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -3003,7 +3294,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Contract#Action", IsNestedType=true)]
+    [FhirType("Contract#Action")]
     [BackboneType("Contract.term.action")]
     public partial class ActionComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -3632,6 +3923,73 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "doNotPerform":
+            DoNotPerformElement = (Hl7.Fhir.Model.FhirBoolean)value;
+            return this;
+          case "type":
+            Type = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "subject":
+            Subject = (List<Hl7.Fhir.Model.Contract.ActionSubjectComponent>)value;
+            return this;
+          case "intent":
+            Intent = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "linkId":
+            LinkIdElement = (List<Hl7.Fhir.Model.FhirString>)value;
+            return this;
+          case "status":
+            Status = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "context":
+            Context = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          case "contextLinkId":
+            ContextLinkIdElement = (List<Hl7.Fhir.Model.FhirString>)value;
+            return this;
+          case "occurrence":
+            Occurrence = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          case "requester":
+            Requester = (List<Hl7.Fhir.Model.ResourceReference>)value;
+            return this;
+          case "requesterLinkId":
+            RequesterLinkIdElement = (List<Hl7.Fhir.Model.FhirString>)value;
+            return this;
+          case "performerType":
+            PerformerType = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+            return this;
+          case "performerRole":
+            PerformerRole = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "performer":
+            Performer = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          case "performerLinkId":
+            PerformerLinkIdElement = (List<Hl7.Fhir.Model.FhirString>)value;
+            return this;
+          case "reason":
+            Reason = (List<Hl7.Fhir.Model.CodeableReference>)value;
+            return this;
+          case "reasonLinkId":
+            ReasonLinkIdElement = (List<Hl7.Fhir.Model.FhirString>)value;
+            return this;
+          case "note":
+            Note = (List<Hl7.Fhir.Model.Annotation>)value;
+            return this;
+          case "securityLabelNumber":
+            SecurityLabelNumberElement = (List<Hl7.Fhir.Model.UnsignedInt>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -3663,7 +4021,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Contract#ActionSubject", IsNestedType=true)]
+    [FhirType("Contract#ActionSubject")]
     [BackboneType("Contract.term.action.subject")]
     public partial class ActionSubjectComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -3785,6 +4143,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "reference":
+            Reference = (List<Hl7.Fhir.Model.ResourceReference>)value;
+            return this;
+          case "role":
+            Role = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -3804,7 +4178,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Contract#Signatory", IsNestedType=true)]
+    [FhirType("Contract#Signatory")]
     [BackboneType("Contract.signer")]
     public partial class SignatoryComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -3949,6 +4323,25 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "type":
+            Type = (Hl7.Fhir.Model.Coding)value;
+            return this;
+          case "party":
+            Party = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          case "signature":
+            Signature = (List<Hl7.Fhir.Model.Signature>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -3967,7 +4360,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Contract#FriendlyLanguage", IsNestedType=true)]
+    [FhirType("Contract#FriendlyLanguage")]
     [BackboneType("Contract.friendly")]
     public partial class FriendlyLanguageComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -4068,6 +4461,19 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "content":
+            Content = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -4084,7 +4490,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Contract#LegalLanguage", IsNestedType=true)]
+    [FhirType("Contract#LegalLanguage")]
     [BackboneType("Contract.legal")]
     public partial class LegalLanguageComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -4185,6 +4591,19 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "content":
+            Content = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -4201,7 +4620,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Contract#ComputableLanguage", IsNestedType=true)]
+    [FhirType("Contract#ComputableLanguage")]
     [BackboneType("Contract.rule")]
     public partial class ComputableLanguageComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -4302,6 +4721,19 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "content":
+            Content = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -5278,6 +5710,115 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "url":
+          UrlElement = (Hl7.Fhir.Model.FhirUri)value;
+          return this;
+        case "version":
+          VersionElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "status":
+          StatusElement = (Code<Hl7.Fhir.Model.Contract.ContractResourceStatusCodes>)value;
+          return this;
+        case "legalState":
+          LegalState = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "instantiatesCanonical":
+          InstantiatesCanonical = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "instantiatesUri":
+          InstantiatesUriElement = (Hl7.Fhir.Model.FhirUri)value;
+          return this;
+        case "contentDerivative":
+          ContentDerivative = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "issued":
+          IssuedElement = (Hl7.Fhir.Model.FhirDateTime)value;
+          return this;
+        case "applies":
+          Applies = (Hl7.Fhir.Model.Period)value;
+          return this;
+        case "expirationType":
+          ExpirationType = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "subject":
+          Subject = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "authority":
+          Authority = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "domain":
+          Domain = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "site":
+          Site = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "name":
+          NameElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "title":
+          TitleElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "subtitle":
+          SubtitleElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "alias":
+          AliasElement = (List<Hl7.Fhir.Model.FhirString>)value;
+          return this;
+        case "author":
+          Author = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "scope":
+          Scope = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "topic":
+          Topic = (Hl7.Fhir.Model.DataType)value;
+          return this;
+        case "type":
+          Type = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "subType":
+          SubType = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "contentDefinition":
+          ContentDefinition = (Hl7.Fhir.Model.Contract.ContentDefinitionComponent)value;
+          return this;
+        case "term":
+          Term = (List<Hl7.Fhir.Model.Contract.TermComponent>)value;
+          return this;
+        case "supportingInfo":
+          SupportingInfo = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "relevantHistory":
+          RelevantHistory = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "signer":
+          Signer = (List<Hl7.Fhir.Model.Contract.SignatoryComponent>)value;
+          return this;
+        case "friendly":
+          Friendly = (List<Hl7.Fhir.Model.Contract.FriendlyLanguageComponent>)value;
+          return this;
+        case "legal":
+          Legal = (List<Hl7.Fhir.Model.Contract.LegalLanguageComponent>)value;
+          return this;
+        case "rule":
+          Rule = (List<Hl7.Fhir.Model.Contract.ComputableLanguageComponent>)value;
+          return this;
+        case "legallyBinding":
+          LegallyBinding = (Hl7.Fhir.Model.DataType)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/Contributor.cs b/src/Hl7.Fhir.R5/Model/Generated/Contributor.cs
index 961341e866..9faf6faba5 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/Contributor.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/Contributor.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -264,6 +264,25 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "type":
+          TypeElement = (Code<Hl7.Fhir.Model.Contributor.ContributorType>)value;
+          return this;
+        case "name":
+          NameElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "contact":
+          Contact = (List<Hl7.Fhir.Model.ContactDetail>)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/Count.cs b/src/Hl7.Fhir.R5/Model/Generated/Count.cs
index 4fcaa016dd..137d7073fd 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/Count.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/Count.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/Coverage.cs b/src/Hl7.Fhir.R5/Model/Generated/Coverage.cs
index 2846ec4858..b1ef3e4ffe 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/Coverage.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/Coverage.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Coverage","http://hl7.org/fhir/StructureDefinition/Coverage", IsResource=true)]
+  [FhirType("Coverage","http://hl7.org/fhir/StructureDefinition/Coverage")]
   public partial class Coverage : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -96,7 +96,7 @@ public enum CoverageKindCode
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Coverage#PaymentBy", IsNestedType=true)]
+    [FhirType("Coverage#PaymentBy")]
     [BackboneType("Coverage.paymentBy")]
     public partial class PaymentByComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -235,6 +235,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "party":
+            Party = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          case "responsibility":
+            ResponsibilityElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -253,7 +269,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Coverage#Class", IsNestedType=true)]
+    [FhirType("Coverage#Class")]
     [BackboneType("Coverage.class")]
     public partial class ClassComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -413,6 +429,25 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "type":
+            Type = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "value":
+            Value = (Hl7.Fhir.Model.Identifier)value;
+            return this;
+          case "name":
+            NameElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -432,7 +467,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Coverage#CostToBeneficiary", IsNestedType=true)]
+    [FhirType("Coverage#CostToBeneficiary")]
     [BackboneType("Coverage.costToBeneficiary")]
     public partial class CostToBeneficiaryComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -663,6 +698,37 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "type":
+            Type = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "category":
+            Category = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "network":
+            Network = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "unit":
+            Unit = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "term":
+            Term = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "value":
+            Value = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          case "exception":
+            Exception = (List<Hl7.Fhir.Model.Coverage.ExemptionComponent>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -685,7 +751,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Coverage#Exemption", IsNestedType=true)]
+    [FhirType("Coverage#Exemption")]
     [BackboneType("Coverage.costToBeneficiary.exception")]
     public partial class ExemptionComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -805,6 +871,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "type":
+            Type = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "period":
+            Period = (Hl7.Fhir.Model.Period)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1438,6 +1520,76 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "status":
+          StatusElement = (Code<Hl7.Fhir.Model.FinancialResourceStatusCodes>)value;
+          return this;
+        case "kind":
+          KindElement = (Code<Hl7.Fhir.Model.Coverage.CoverageKindCode>)value;
+          return this;
+        case "paymentBy":
+          PaymentBy = (List<Hl7.Fhir.Model.Coverage.PaymentByComponent>)value;
+          return this;
+        case "type":
+          Type = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "policyHolder":
+          PolicyHolder = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "subscriber":
+          Subscriber = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "subscriberId":
+          SubscriberId = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "beneficiary":
+          Beneficiary = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "dependent":
+          DependentElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "relationship":
+          Relationship = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "period":
+          Period = (Hl7.Fhir.Model.Period)value;
+          return this;
+        case "insurer":
+          Insurer = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "class":
+          Class = (List<Hl7.Fhir.Model.Coverage.ClassComponent>)value;
+          return this;
+        case "order":
+          OrderElement = (Hl7.Fhir.Model.PositiveInt)value;
+          return this;
+        case "network":
+          NetworkElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "costToBeneficiary":
+          CostToBeneficiary = (List<Hl7.Fhir.Model.Coverage.CostToBeneficiaryComponent>)value;
+          return this;
+        case "subrogation":
+          SubrogationElement = (Hl7.Fhir.Model.FhirBoolean)value;
+          return this;
+        case "contract":
+          Contract = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "insurancePlan":
+          InsurancePlan = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/CoverageEligibilityRequest.cs b/src/Hl7.Fhir.R5/Model/Generated/CoverageEligibilityRequest.cs
index 8832cda149..27b7677692 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/CoverageEligibilityRequest.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/CoverageEligibilityRequest.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("CoverageEligibilityRequest","http://hl7.org/fhir/StructureDefinition/CoverageEligibilityRequest", IsResource=true)]
+  [FhirType("CoverageEligibilityRequest","http://hl7.org/fhir/StructureDefinition/CoverageEligibilityRequest")]
   public partial class CoverageEligibilityRequest : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -101,7 +101,7 @@ public enum EligibilityRequestPurpose
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CoverageEligibilityRequest#Event", IsNestedType=true)]
+    [FhirType("CoverageEligibilityRequest#Event")]
     [BackboneType("CoverageEligibilityRequest.event")]
     public partial class EventComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -224,6 +224,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "type":
+            Type = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "when":
+            When = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -242,7 +258,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CoverageEligibilityRequest#SupportingInformation", IsNestedType=true)]
+    [FhirType("CoverageEligibilityRequest#SupportingInformation")]
     [BackboneType("CoverageEligibilityRequest.supportingInfo")]
     public partial class SupportingInformationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -421,6 +437,25 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "sequence":
+            SequenceElement = (Hl7.Fhir.Model.PositiveInt)value;
+            return this;
+          case "information":
+            Information = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          case "appliesToAll":
+            AppliesToAllElement = (Hl7.Fhir.Model.FhirBoolean)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -440,7 +475,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CoverageEligibilityRequest#Insurance", IsNestedType=true)]
+    [FhirType("CoverageEligibilityRequest#Insurance")]
     [BackboneType("CoverageEligibilityRequest.insurance")]
     public partial class InsuranceComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -618,6 +653,25 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "focal":
+            FocalElement = (Hl7.Fhir.Model.FhirBoolean)value;
+            return this;
+          case "coverage":
+            Coverage = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          case "businessArrangement":
+            BusinessArrangementElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -636,7 +690,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CoverageEligibilityRequest#Details", IsNestedType=true)]
+    [FhirType("CoverageEligibilityRequest#Details")]
     [BackboneType("CoverageEligibilityRequest.item")]
     public partial class DetailsComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -953,6 +1007,46 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "supportingInfoSequence":
+            SupportingInfoSequenceElement = (List<Hl7.Fhir.Model.PositiveInt>)value;
+            return this;
+          case "category":
+            Category = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "productOrService":
+            ProductOrService = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "modifier":
+            Modifier = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+            return this;
+          case "provider":
+            Provider = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          case "quantity":
+            Quantity = (Hl7.Fhir.Model.Quantity)value;
+            return this;
+          case "unitPrice":
+            UnitPrice = (Hl7.Fhir.Model.Money)value;
+            return this;
+          case "facility":
+            Facility = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          case "diagnosis":
+            Diagnosis = (List<Hl7.Fhir.Model.CoverageEligibilityRequest.DiagnosisComponent>)value;
+            return this;
+          case "detail":
+            Detail = (List<Hl7.Fhir.Model.ResourceReference>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -978,7 +1072,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CoverageEligibilityRequest#Diagnosis", IsNestedType=true)]
+    [FhirType("CoverageEligibilityRequest#Diagnosis")]
     [BackboneType("CoverageEligibilityRequest.item.diagnosis")]
     public partial class DiagnosisComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1079,6 +1173,19 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "diagnosis":
+            Diagnosis = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1552,6 +1659,61 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "status":
+          StatusElement = (Code<Hl7.Fhir.Model.FinancialResourceStatusCodes>)value;
+          return this;
+        case "priority":
+          Priority = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "purpose":
+          PurposeElement = (List<Code<Hl7.Fhir.Model.CoverageEligibilityRequest.EligibilityRequestPurpose>>)value;
+          return this;
+        case "patient":
+          Patient = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "event":
+          Event = (List<Hl7.Fhir.Model.CoverageEligibilityRequest.EventComponent>)value;
+          return this;
+        case "serviced":
+          Serviced = (Hl7.Fhir.Model.DataType)value;
+          return this;
+        case "created":
+          CreatedElement = (Hl7.Fhir.Model.FhirDateTime)value;
+          return this;
+        case "enterer":
+          Enterer = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "provider":
+          Provider = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "insurer":
+          Insurer = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "facility":
+          Facility = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "supportingInfo":
+          SupportingInfo = (List<Hl7.Fhir.Model.CoverageEligibilityRequest.SupportingInformationComponent>)value;
+          return this;
+        case "insurance":
+          Insurance = (List<Hl7.Fhir.Model.CoverageEligibilityRequest.InsuranceComponent>)value;
+          return this;
+        case "item":
+          Item = (List<Hl7.Fhir.Model.CoverageEligibilityRequest.DetailsComponent>)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/CoverageEligibilityResponse.cs b/src/Hl7.Fhir.R5/Model/Generated/CoverageEligibilityResponse.cs
index cdf5bab505..ed108d0884 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/CoverageEligibilityResponse.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/CoverageEligibilityResponse.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("CoverageEligibilityResponse","http://hl7.org/fhir/StructureDefinition/CoverageEligibilityResponse", IsResource=true)]
+  [FhirType("CoverageEligibilityResponse","http://hl7.org/fhir/StructureDefinition/CoverageEligibilityResponse")]
   public partial class CoverageEligibilityResponse : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -135,7 +135,7 @@ public enum EligibilityOutcome
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CoverageEligibilityResponse#Event", IsNestedType=true)]
+    [FhirType("CoverageEligibilityResponse#Event")]
     [BackboneType("CoverageEligibilityResponse.event")]
     public partial class EventComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -258,6 +258,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "type":
+            Type = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "when":
+            When = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -276,7 +292,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CoverageEligibilityResponse#Insurance", IsNestedType=true)]
+    [FhirType("CoverageEligibilityResponse#Insurance")]
     [BackboneType("CoverageEligibilityResponse.insurance")]
     public partial class InsuranceComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -458,6 +474,28 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "coverage":
+            Coverage = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          case "inforce":
+            InforceElement = (Hl7.Fhir.Model.FhirBoolean)value;
+            return this;
+          case "benefitPeriod":
+            BenefitPeriod = (Hl7.Fhir.Model.Period)value;
+            return this;
+          case "item":
+            Item = (List<Hl7.Fhir.Model.CoverageEligibilityResponse.ItemsComponent>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -477,7 +515,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CoverageEligibilityResponse#Items", IsNestedType=true)]
+    [FhirType("CoverageEligibilityResponse#Items")]
     [BackboneType("CoverageEligibilityResponse.insurance.item")]
     public partial class ItemsComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -949,6 +987,58 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "category":
+            Category = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "productOrService":
+            ProductOrService = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "modifier":
+            Modifier = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+            return this;
+          case "provider":
+            Provider = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          case "excluded":
+            ExcludedElement = (Hl7.Fhir.Model.FhirBoolean)value;
+            return this;
+          case "name":
+            NameElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "description":
+            DescriptionElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "network":
+            Network = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "unit":
+            Unit = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "term":
+            Term = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "benefit":
+            Benefit = (List<Hl7.Fhir.Model.CoverageEligibilityResponse.BenefitComponent>)value;
+            return this;
+          case "authorizationRequired":
+            AuthorizationRequiredElement = (Hl7.Fhir.Model.FhirBoolean)value;
+            return this;
+          case "authorizationSupporting":
+            AuthorizationSupporting = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+            return this;
+          case "authorizationUrl":
+            AuthorizationUrlElement = (Hl7.Fhir.Model.FhirUri)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -978,7 +1068,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CoverageEligibilityResponse#Benefit", IsNestedType=true)]
+    [FhirType("CoverageEligibilityResponse#Benefit")]
     [BackboneType("CoverageEligibilityResponse.insurance.item.benefit")]
     public partial class BenefitComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1123,6 +1213,25 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "type":
+            Type = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "allowed":
+            Allowed = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          case "used":
+            Used = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1141,7 +1250,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CoverageEligibilityResponse#Errors", IsNestedType=true)]
+    [FhirType("CoverageEligibilityResponse#Errors")]
     [BackboneType("CoverageEligibilityResponse.error")]
     public partial class ErrorsComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1280,6 +1389,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "code":
+            Code = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "expression":
+            ExpressionElement = (List<Hl7.Fhir.Model.FhirString>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1830,6 +1955,64 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "status":
+          StatusElement = (Code<Hl7.Fhir.Model.FinancialResourceStatusCodes>)value;
+          return this;
+        case "purpose":
+          PurposeElement = (List<Code<Hl7.Fhir.Model.CoverageEligibilityResponse.EligibilityResponsePurpose>>)value;
+          return this;
+        case "patient":
+          Patient = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "event":
+          Event = (List<Hl7.Fhir.Model.CoverageEligibilityResponse.EventComponent>)value;
+          return this;
+        case "serviced":
+          Serviced = (Hl7.Fhir.Model.DataType)value;
+          return this;
+        case "created":
+          CreatedElement = (Hl7.Fhir.Model.FhirDateTime)value;
+          return this;
+        case "requestor":
+          Requestor = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "request":
+          Request = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "outcome":
+          OutcomeElement = (Code<Hl7.Fhir.Model.CoverageEligibilityResponse.EligibilityOutcome>)value;
+          return this;
+        case "disposition":
+          DispositionElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "insurer":
+          Insurer = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "insurance":
+          Insurance = (List<Hl7.Fhir.Model.CoverageEligibilityResponse.InsuranceComponent>)value;
+          return this;
+        case "preAuthRef":
+          PreAuthRefElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "form":
+          Form = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "error":
+          Error = (List<Hl7.Fhir.Model.CoverageEligibilityResponse.ErrorsComponent>)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/DataRequirement.cs b/src/Hl7.Fhir.R5/Model/Generated/DataRequirement.cs
index 9d4c7f11ad..3c2107b3cf 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/DataRequirement.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/DataRequirement.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -141,7 +141,7 @@ public enum SortDirection
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("DataRequirement#CodeFilter", IsNestedType=true)]
+    [FhirType("DataRequirement#CodeFilter")]
     [BackboneType("DataRequirement.codeFilter")]
     public partial class CodeFilterComponent : Hl7.Fhir.Model.Element
     {
@@ -356,6 +356,28 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "path":
+            PathElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "searchParam":
+            SearchParamElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "valueSet":
+            ValueSetElement = (Hl7.Fhir.Model.Canonical)value;
+            return this;
+          case "code":
+            Code = (List<Hl7.Fhir.Model.Coding>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -375,7 +397,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("DataRequirement#DateFilter", IsNestedType=true)]
+    [FhirType("DataRequirement#DateFilter")]
     [BackboneType("DataRequirement.dateFilter")]
     public partial class DateFilterComponent : Hl7.Fhir.Model.Element
     {
@@ -552,6 +574,25 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "path":
+            PathElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "searchParam":
+            SearchParamElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "value":
+            Value = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -570,7 +611,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("DataRequirement#ValueFilter", IsNestedType=true)]
+    [FhirType("DataRequirement#ValueFilter")]
     [BackboneType("DataRequirement.valueFilter")]
     public partial class ValueFilterComponent : Hl7.Fhir.Model.Element
     {
@@ -788,6 +829,28 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "path":
+            PathElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "searchParam":
+            SearchParamElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "comparator":
+            ComparatorElement = (Code<Hl7.Fhir.Model.DataRequirement.ValueFilterComparator>)value;
+            return this;
+          case "value":
+            Value = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -808,7 +871,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("DataRequirement#Sort", IsNestedType=true)]
+    [FhirType("DataRequirement#Sort")]
     [BackboneType("DataRequirement.sort")]
     public partial class SortComponent : Hl7.Fhir.Model.Element
     {
@@ -966,6 +1029,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "path":
+            PathElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "direction":
+            DirectionElement = (Code<Hl7.Fhir.Model.DataRequirement.SortDirection>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1316,6 +1395,43 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "type":
+          TypeElement = (Code<Hl7.Fhir.Model.FHIRAllTypes>)value;
+          return this;
+        case "profile":
+          ProfileElement = (List<Hl7.Fhir.Model.Canonical>)value;
+          return this;
+        case "subject":
+          Subject = (Hl7.Fhir.Model.DataType)value;
+          return this;
+        case "mustSupport":
+          MustSupportElement = (List<Hl7.Fhir.Model.FhirString>)value;
+          return this;
+        case "codeFilter":
+          CodeFilter = (List<Hl7.Fhir.Model.DataRequirement.CodeFilterComponent>)value;
+          return this;
+        case "dateFilter":
+          DateFilter = (List<Hl7.Fhir.Model.DataRequirement.DateFilterComponent>)value;
+          return this;
+        case "valueFilter":
+          ValueFilter = (List<Hl7.Fhir.Model.DataRequirement.ValueFilterComponent>)value;
+          return this;
+        case "limit":
+          LimitElement = (Hl7.Fhir.Model.PositiveInt)value;
+          return this;
+        case "sort":
+          Sort = (List<Hl7.Fhir.Model.DataRequirement.SortComponent>)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/DetectedIssue.cs b/src/Hl7.Fhir.R5/Model/Generated/DetectedIssue.cs
index 4821502b6d..6428dd0d75 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/DetectedIssue.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/DetectedIssue.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("DetectedIssue","http://hl7.org/fhir/StructureDefinition/DetectedIssue", IsResource=true)]
+  [FhirType("DetectedIssue","http://hl7.org/fhir/StructureDefinition/DetectedIssue")]
   public partial class DetectedIssue : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -129,7 +129,7 @@ public enum DetectedIssueSeverity
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("DetectedIssue#Evidence", IsNestedType=true)]
+    [FhirType("DetectedIssue#Evidence")]
     [BackboneType("DetectedIssue.evidence")]
     public partial class EvidenceComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -252,6 +252,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "code":
+            Code = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+            return this;
+          case "detail":
+            Detail = (List<Hl7.Fhir.Model.ResourceReference>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -269,7 +285,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("DetectedIssue#Mitigation", IsNestedType=true)]
+    [FhirType("DetectedIssue#Mitigation")]
     [BackboneType("DetectedIssue.mitigation")]
     public partial class MitigationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -452,6 +468,28 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "action":
+            Action = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "date":
+            DateElement = (Hl7.Fhir.Model.FhirDateTime)value;
+            return this;
+          case "author":
+            Author = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          case "note":
+            Note = (List<Hl7.Fhir.Model.Annotation>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -920,6 +958,58 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "status":
+          StatusElement = (Code<Hl7.Fhir.Model.DetectedIssue.DetectedIssueStatus>)value;
+          return this;
+        case "category":
+          Category = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "code":
+          Code = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "severity":
+          SeverityElement = (Code<Hl7.Fhir.Model.DetectedIssue.DetectedIssueSeverity>)value;
+          return this;
+        case "subject":
+          Subject = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "encounter":
+          Encounter = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "identified":
+          Identified = (Hl7.Fhir.Model.DataType)value;
+          return this;
+        case "author":
+          Author = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "implicated":
+          Implicated = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "evidence":
+          Evidence = (List<Hl7.Fhir.Model.DetectedIssue.EvidenceComponent>)value;
+          return this;
+        case "detail":
+          DetailElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        case "reference":
+          ReferenceElement = (Hl7.Fhir.Model.FhirUri)value;
+          return this;
+        case "mitigation":
+          Mitigation = (List<Hl7.Fhir.Model.DetectedIssue.MitigationComponent>)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/Device.cs b/src/Hl7.Fhir.R5/Model/Generated/Device.cs
index de19e391ee..3be1b04d3e 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/Device.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/Device.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Device","http://hl7.org/fhir/StructureDefinition/Device", IsResource=true)]
+  [FhirType("Device","http://hl7.org/fhir/StructureDefinition/Device")]
   public partial class Device : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -148,7 +148,7 @@ public enum UDIEntryType
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Device#UdiCarrier", IsNestedType=true)]
+    [FhirType("Device#UdiCarrier")]
     [BackboneType("Device.udiCarrier")]
     public partial class UdiCarrierComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -462,6 +462,34 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "deviceIdentifier":
+            DeviceIdentifierElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "issuer":
+            IssuerElement = (Hl7.Fhir.Model.FhirUri)value;
+            return this;
+          case "jurisdiction":
+            JurisdictionElement = (Hl7.Fhir.Model.FhirUri)value;
+            return this;
+          case "carrierAIDC":
+            CarrierAIDCElement = (Hl7.Fhir.Model.Base64Binary)value;
+            return this;
+          case "carrierHRF":
+            CarrierHRFElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "entryType":
+            EntryTypeElement = (Code<Hl7.Fhir.Model.Device.UDIEntryType>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -483,7 +511,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Device#Name", IsNestedType=true)]
+    [FhirType("Device#Name")]
     [BackboneType("Device.name")]
     public partial class NameComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -680,6 +708,25 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "value":
+            ValueElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "type":
+            TypeElement = (Code<Hl7.Fhir.Model.DeviceNameType>)value;
+            return this;
+          case "display":
+            DisplayElement = (Hl7.Fhir.Model.FhirBoolean)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -695,7 +742,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Device#Version", IsNestedType=true)]
+    [FhirType("Device#Version")]
     [BackboneType("Device.version")]
     public partial class VersionComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -893,6 +940,28 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "type":
+            Type = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "component":
+            Component = (Hl7.Fhir.Model.Identifier)value;
+            return this;
+          case "installDate":
+            InstallDateElement = (Hl7.Fhir.Model.FhirDateTime)value;
+            return this;
+          case "value":
+            ValueElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -912,7 +981,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Device#ConformsTo", IsNestedType=true)]
+    [FhirType("Device#ConformsTo")]
     [BackboneType("Device.conformsTo")]
     public partial class ConformsToComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1072,6 +1141,25 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "category":
+            Category = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "specification":
+            Specification = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "version":
+            VersionElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1091,7 +1179,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Device#Property", IsNestedType=true)]
+    [FhirType("Device#Property")]
     [BackboneType("Device.property")]
     public partial class PropertyComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1214,6 +1302,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "type":
+            Type = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "value":
+            Value = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -2172,6 +2276,112 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "displayName":
+          DisplayNameElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "definition":
+          Definition = (Hl7.Fhir.Model.CodeableReference)value;
+          return this;
+        case "udiCarrier":
+          UdiCarrier = (List<Hl7.Fhir.Model.Device.UdiCarrierComponent>)value;
+          return this;
+        case "status":
+          StatusElement = (Code<Hl7.Fhir.Model.Device.FHIRDeviceStatus>)value;
+          return this;
+        case "availabilityStatus":
+          AvailabilityStatus = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "biologicalSourceEvent":
+          BiologicalSourceEvent = (Hl7.Fhir.Model.Identifier)value;
+          return this;
+        case "manufacturer":
+          ManufacturerElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "manufactureDate":
+          ManufactureDateElement = (Hl7.Fhir.Model.FhirDateTime)value;
+          return this;
+        case "expirationDate":
+          ExpirationDateElement = (Hl7.Fhir.Model.FhirDateTime)value;
+          return this;
+        case "lotNumber":
+          LotNumberElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "serialNumber":
+          SerialNumberElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "name":
+          Name = (List<Hl7.Fhir.Model.Device.NameComponent>)value;
+          return this;
+        case "modelNumber":
+          ModelNumberElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "partNumber":
+          PartNumberElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "category":
+          Category = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "type":
+          Type = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "version":
+          Version = (List<Hl7.Fhir.Model.Device.VersionComponent>)value;
+          return this;
+        case "conformsTo":
+          ConformsTo = (List<Hl7.Fhir.Model.Device.ConformsToComponent>)value;
+          return this;
+        case "property":
+          Property = (List<Hl7.Fhir.Model.Device.PropertyComponent>)value;
+          return this;
+        case "mode":
+          Mode = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "cycle":
+          Cycle = (Hl7.Fhir.Model.Count)value;
+          return this;
+        case "duration":
+          Duration = (Hl7.Fhir.Model.Duration)value;
+          return this;
+        case "owner":
+          Owner = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "contact":
+          Contact = (List<Hl7.Fhir.Model.ContactPoint>)value;
+          return this;
+        case "location":
+          Location = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "url":
+          UrlElement = (Hl7.Fhir.Model.FhirUri)value;
+          return this;
+        case "endpoint":
+          Endpoint = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "gateway":
+          Gateway = (List<Hl7.Fhir.Model.CodeableReference>)value;
+          return this;
+        case "note":
+          Note = (List<Hl7.Fhir.Model.Annotation>)value;
+          return this;
+        case "safety":
+          Safety = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "parent":
+          Parent = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/DeviceAssociation.cs b/src/Hl7.Fhir.R5/Model/Generated/DeviceAssociation.cs
index 86128da464..7f2242b790 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/DeviceAssociation.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/DeviceAssociation.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model
   /// </summary>
   [Serializable]
   [DataContract]
-  [FhirType("DeviceAssociation","http://hl7.org/fhir/StructureDefinition/DeviceAssociation", IsResource=true)]
+  [FhirType("DeviceAssociation","http://hl7.org/fhir/StructureDefinition/DeviceAssociation")]
   public partial class DeviceAssociation : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -101,7 +101,7 @@ public enum DeviceAssociationCodes
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("DeviceAssociation#Operation", IsNestedType=true)]
+    [FhirType("DeviceAssociation#Operation")]
     [BackboneType("DeviceAssociation.operation")]
     public partial class OperationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -245,6 +245,25 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "status":
+            Status = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "operator":
+            Operator = (List<Hl7.Fhir.Model.ResourceReference>)value;
+            return this;
+          case "period":
+            Period = (Hl7.Fhir.Model.Period)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -527,6 +546,43 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "device":
+          Device = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "category":
+          Category = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "status":
+          Status = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "statusReason":
+          StatusReason = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "subject":
+          Subject = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "bodyStructure":
+          BodyStructure = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "period":
+          Period = (Hl7.Fhir.Model.Period)value;
+          return this;
+        case "operation":
+          Operation = (List<Hl7.Fhir.Model.DeviceAssociation.OperationComponent>)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/DeviceDefinition.cs b/src/Hl7.Fhir.R5/Model/Generated/DeviceDefinition.cs
index 1aa261c725..cec1bc628e 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/DeviceDefinition.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/DeviceDefinition.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("DeviceDefinition","http://hl7.org/fhir/StructureDefinition/DeviceDefinition", IsResource=true)]
+  [FhirType("DeviceDefinition","http://hl7.org/fhir/StructureDefinition/DeviceDefinition")]
   public partial class DeviceDefinition : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -170,7 +170,7 @@ public enum DeviceCorrectiveActionScope
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("DeviceDefinition#UdiDeviceIdentifier", IsNestedType=true)]
+    [FhirType("DeviceDefinition#UdiDeviceIdentifier")]
     [BackboneType("DeviceDefinition.udiDeviceIdentifier")]
     public partial class UdiDeviceIdentifierComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -388,6 +388,28 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "deviceIdentifier":
+            DeviceIdentifierElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "issuer":
+            IssuerElement = (Hl7.Fhir.Model.FhirUri)value;
+            return this;
+          case "jurisdiction":
+            JurisdictionElement = (Hl7.Fhir.Model.FhirUri)value;
+            return this;
+          case "marketDistribution":
+            MarketDistribution = (List<Hl7.Fhir.Model.DeviceDefinition.UdiDeviceIdentifierMarketDistributionComponent>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -407,7 +429,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("DeviceDefinition#UdiDeviceIdentifierMarketDistribution", IsNestedType=true)]
+    [FhirType("DeviceDefinition#UdiDeviceIdentifierMarketDistribution")]
     [BackboneType("DeviceDefinition.udiDeviceIdentifier.marketDistribution")]
     public partial class UdiDeviceIdentifierMarketDistributionComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -545,6 +567,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "marketPeriod":
+            MarketPeriod = (Hl7.Fhir.Model.Period)value;
+            return this;
+          case "subJurisdiction":
+            SubJurisdictionElement = (Hl7.Fhir.Model.FhirUri)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -563,7 +601,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("DeviceDefinition#RegulatoryIdentifier", IsNestedType=true)]
+    [FhirType("DeviceDefinition#RegulatoryIdentifier")]
     [BackboneType("DeviceDefinition.regulatoryIdentifier")]
     public partial class RegulatoryIdentifierComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -801,6 +839,28 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "type":
+            TypeElement = (Code<Hl7.Fhir.Model.DeviceDefinition.DeviceDefinitionRegulatoryIdentifierType>)value;
+            return this;
+          case "deviceIdentifier":
+            DeviceIdentifierElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "issuer":
+            IssuerElement = (Hl7.Fhir.Model.FhirUri)value;
+            return this;
+          case "jurisdiction":
+            JurisdictionElement = (Hl7.Fhir.Model.FhirUri)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -817,7 +877,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("DeviceDefinition#DeviceName", IsNestedType=true)]
+    [FhirType("DeviceDefinition#DeviceName")]
     [BackboneType("DeviceDefinition.deviceName")]
     public partial class DeviceNameComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -975,6 +1035,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "name":
+            NameElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "type":
+            TypeElement = (Code<Hl7.Fhir.Model.DeviceNameType>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -992,7 +1068,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("DeviceDefinition#Classification", IsNestedType=true)]
+    [FhirType("DeviceDefinition#Classification")]
     [BackboneType("DeviceDefinition.classification")]
     public partial class ClassificationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1113,6 +1189,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "type":
+            Type = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "justification":
+            Justification = (List<Hl7.Fhir.Model.RelatedArtifact>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1130,7 +1222,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("DeviceDefinition#ConformsTo", IsNestedType=true)]
+    [FhirType("DeviceDefinition#ConformsTo")]
     [BackboneType("DeviceDefinition.conformsTo")]
     public partial class ConformsToComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1313,6 +1405,28 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "category":
+            Category = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "specification":
+            Specification = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "version":
+            VersionElement = (List<Hl7.Fhir.Model.FhirString>)value;
+            return this;
+          case "source":
+            Source = (List<Hl7.Fhir.Model.RelatedArtifact>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1332,7 +1446,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("DeviceDefinition#HasPart", IsNestedType=true)]
+    [FhirType("DeviceDefinition#HasPart")]
     [BackboneType("DeviceDefinition.hasPart")]
     public partial class HasPartComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1471,6 +1585,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "reference":
+            Reference = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          case "count":
+            CountElement = (Hl7.Fhir.Model.Integer)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1485,7 +1615,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("DeviceDefinition#Packaging", IsNestedType=true)]
+    [FhirType("DeviceDefinition#Packaging")]
     [BackboneType("DeviceDefinition.packaging")]
     public partial class PackagingComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1708,6 +1838,34 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "identifier":
+            Identifier = (Hl7.Fhir.Model.Identifier)value;
+            return this;
+          case "type":
+            Type = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "count":
+            CountElement = (Hl7.Fhir.Model.Integer)value;
+            return this;
+          case "distributor":
+            Distributor = (List<Hl7.Fhir.Model.DeviceDefinition.PackagingDistributorComponent>)value;
+            return this;
+          case "udiDeviceIdentifier":
+            UdiDeviceIdentifier = (List<Hl7.Fhir.Model.DeviceDefinition.UdiDeviceIdentifierComponent>)value;
+            return this;
+          case "packaging":
+            Packaging = (List<Hl7.Fhir.Model.DeviceDefinition.PackagingComponent>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1726,7 +1884,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("DeviceDefinition#PackagingDistributor", IsNestedType=true)]
+    [FhirType("DeviceDefinition#PackagingDistributor")]
     [BackboneType("DeviceDefinition.packaging.distributor")]
     public partial class PackagingDistributorComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1865,6 +2023,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "name":
+            NameElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "organizationReference":
+            OrganizationReference = (List<Hl7.Fhir.Model.ResourceReference>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1879,7 +2053,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("DeviceDefinition#Version", IsNestedType=true)]
+    [FhirType("DeviceDefinition#Version")]
     [BackboneType("DeviceDefinition.version")]
     public partial class VersionComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2037,6 +2211,25 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "type":
+            Type = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "component":
+            Component = (Hl7.Fhir.Model.Identifier)value;
+            return this;
+          case "value":
+            ValueElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -2056,7 +2249,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("DeviceDefinition#Property", IsNestedType=true)]
+    [FhirType("DeviceDefinition#Property")]
     [BackboneType("DeviceDefinition.property")]
     public partial class PropertyComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2179,6 +2372,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "type":
+            Type = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "value":
+            Value = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -2193,7 +2402,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("DeviceDefinition#Link", IsNestedType=true)]
+    [FhirType("DeviceDefinition#Link")]
     [BackboneType("DeviceDefinition.link")]
     public partial class LinkComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2314,6 +2523,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "relation":
+            Relation = (Hl7.Fhir.Model.Coding)value;
+            return this;
+          case "relatedDevice":
+            RelatedDevice = (Hl7.Fhir.Model.CodeableReference)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -2328,7 +2553,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("DeviceDefinition#Material", IsNestedType=true)]
+    [FhirType("DeviceDefinition#Material")]
     [BackboneType("DeviceDefinition.material")]
     public partial class MaterialComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2504,6 +2729,25 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "substance":
+            Substance = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "alternate":
+            AlternateElement = (Hl7.Fhir.Model.FhirBoolean)value;
+            return this;
+          case "allergenicIndicator":
+            AllergenicIndicatorElement = (Hl7.Fhir.Model.FhirBoolean)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -2522,7 +2766,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("DeviceDefinition#Guideline", IsNestedType=true)]
+    [FhirType("DeviceDefinition#Guideline")]
     [BackboneType("DeviceDefinition.guideline")]
     public partial class GuidelineComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2786,6 +3030,37 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "useContext":
+            UseContext = (List<Hl7.Fhir.Model.UsageContext>)value;
+            return this;
+          case "usageInstruction":
+            UsageInstructionElement = (Hl7.Fhir.Model.Markdown)value;
+            return this;
+          case "relatedArtifact":
+            RelatedArtifact = (List<Hl7.Fhir.Model.RelatedArtifact>)value;
+            return this;
+          case "indication":
+            Indication = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+            return this;
+          case "contraindication":
+            Contraindication = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+            return this;
+          case "warning":
+            Warning = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+            return this;
+          case "intendedUse":
+            IntendedUseElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -2805,7 +3080,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("DeviceDefinition#CorrectiveAction", IsNestedType=true)]
+    [FhirType("DeviceDefinition#CorrectiveAction")]
     [BackboneType("DeviceDefinition.correctiveAction")]
     public partial class CorrectiveActionComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2984,6 +3259,25 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "recall":
+            RecallElement = (Hl7.Fhir.Model.FhirBoolean)value;
+            return this;
+          case "scope":
+            ScopeElement = (Code<Hl7.Fhir.Model.DeviceDefinition.DeviceCorrectiveActionScope>)value;
+            return this;
+          case "period":
+            Period = (Hl7.Fhir.Model.Period)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -2999,7 +3293,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("DeviceDefinition#ChargeItem", IsNestedType=true)]
+    [FhirType("DeviceDefinition#ChargeItem")]
     [BackboneType("DeviceDefinition.chargeItem")]
     public partial class ChargeItemComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -3162,6 +3456,28 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "chargeItemCode":
+            ChargeItemCode = (Hl7.Fhir.Model.CodeableReference)value;
+            return this;
+          case "count":
+            Count = (Hl7.Fhir.Model.Quantity)value;
+            return this;
+          case "effectivePeriod":
+            EffectivePeriod = (Hl7.Fhir.Model.Period)value;
+            return this;
+          case "useContext":
+            UseContext = (List<Hl7.Fhir.Model.UsageContext>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -3886,6 +4202,94 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "description":
+          DescriptionElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "udiDeviceIdentifier":
+          UdiDeviceIdentifier = (List<Hl7.Fhir.Model.DeviceDefinition.UdiDeviceIdentifierComponent>)value;
+          return this;
+        case "regulatoryIdentifier":
+          RegulatoryIdentifier = (List<Hl7.Fhir.Model.DeviceDefinition.RegulatoryIdentifierComponent>)value;
+          return this;
+        case "partNumber":
+          PartNumberElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "manufacturer":
+          Manufacturer = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "deviceName":
+          DeviceName = (List<Hl7.Fhir.Model.DeviceDefinition.DeviceNameComponent>)value;
+          return this;
+        case "modelNumber":
+          ModelNumberElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "classification":
+          Classification = (List<Hl7.Fhir.Model.DeviceDefinition.ClassificationComponent>)value;
+          return this;
+        case "conformsTo":
+          ConformsTo = (List<Hl7.Fhir.Model.DeviceDefinition.ConformsToComponent>)value;
+          return this;
+        case "hasPart":
+          HasPart = (List<Hl7.Fhir.Model.DeviceDefinition.HasPartComponent>)value;
+          return this;
+        case "packaging":
+          Packaging = (List<Hl7.Fhir.Model.DeviceDefinition.PackagingComponent>)value;
+          return this;
+        case "version":
+          Version = (List<Hl7.Fhir.Model.DeviceDefinition.VersionComponent>)value;
+          return this;
+        case "safety":
+          Safety = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "shelfLifeStorage":
+          ShelfLifeStorage = (List<Hl7.Fhir.Model.ProductShelfLife>)value;
+          return this;
+        case "languageCode":
+          LanguageCode = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "property":
+          Property = (List<Hl7.Fhir.Model.DeviceDefinition.PropertyComponent>)value;
+          return this;
+        case "owner":
+          Owner = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "contact":
+          Contact = (List<Hl7.Fhir.Model.ContactPoint>)value;
+          return this;
+        case "link":
+          Link = (List<Hl7.Fhir.Model.DeviceDefinition.LinkComponent>)value;
+          return this;
+        case "note":
+          Note = (List<Hl7.Fhir.Model.Annotation>)value;
+          return this;
+        case "material":
+          Material = (List<Hl7.Fhir.Model.DeviceDefinition.MaterialComponent>)value;
+          return this;
+        case "productionIdentifierInUDI":
+          ProductionIdentifierInUDIElement = (List<Code<Hl7.Fhir.Model.DeviceDefinition.DeviceProductionIdentifierInUDI>>)value;
+          return this;
+        case "guideline":
+          Guideline = (Hl7.Fhir.Model.DeviceDefinition.GuidelineComponent)value;
+          return this;
+        case "correctiveAction":
+          CorrectiveAction = (Hl7.Fhir.Model.DeviceDefinition.CorrectiveActionComponent)value;
+          return this;
+        case "chargeItem":
+          ChargeItem = (List<Hl7.Fhir.Model.DeviceDefinition.ChargeItemComponent>)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/DeviceDispense.cs b/src/Hl7.Fhir.R5/Model/Generated/DeviceDispense.cs
index 56641019d6..b39a7bd441 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/DeviceDispense.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/DeviceDispense.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("DeviceDispense","http://hl7.org/fhir/StructureDefinition/DeviceDispense", IsResource=true)]
+  [FhirType("DeviceDispense","http://hl7.org/fhir/StructureDefinition/DeviceDispense")]
   public partial class DeviceDispense : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -131,7 +131,7 @@ public enum DeviceDispenseStatusCodes
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("DeviceDispense#Performer", IsNestedType=true)]
+    [FhirType("DeviceDispense#Performer")]
     [BackboneType("DeviceDispense.performer")]
     public partial class PerformerComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -252,6 +252,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "function":
+            Function = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "actor":
+            Actor = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -875,6 +891,79 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "basedOn":
+          BasedOn = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "partOf":
+          PartOf = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "status":
+          StatusElement = (Code<Hl7.Fhir.Model.DeviceDispense.DeviceDispenseStatusCodes>)value;
+          return this;
+        case "statusReason":
+          StatusReason = (Hl7.Fhir.Model.CodeableReference)value;
+          return this;
+        case "category":
+          Category = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "device":
+          Device = (Hl7.Fhir.Model.CodeableReference)value;
+          return this;
+        case "subject":
+          Subject = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "receiver":
+          Receiver = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "encounter":
+          Encounter = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "supportingInformation":
+          SupportingInformation = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "performer":
+          Performer = (List<Hl7.Fhir.Model.DeviceDispense.PerformerComponent>)value;
+          return this;
+        case "location":
+          Location = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "type":
+          Type = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "quantity":
+          Quantity = (Hl7.Fhir.Model.Quantity)value;
+          return this;
+        case "preparedDate":
+          PreparedDateElement = (Hl7.Fhir.Model.FhirDateTime)value;
+          return this;
+        case "whenHandedOver":
+          WhenHandedOverElement = (Hl7.Fhir.Model.FhirDateTime)value;
+          return this;
+        case "destination":
+          Destination = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "note":
+          Note = (List<Hl7.Fhir.Model.Annotation>)value;
+          return this;
+        case "usageInstruction":
+          UsageInstructionElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        case "eventHistory":
+          EventHistory = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/DeviceMetric.cs b/src/Hl7.Fhir.R5/Model/Generated/DeviceMetric.cs
index fecd768fe3..2a1e608eaf 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/DeviceMetric.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/DeviceMetric.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("DeviceMetric","http://hl7.org/fhir/StructureDefinition/DeviceMetric", IsResource=true)]
+  [FhirType("DeviceMetric","http://hl7.org/fhir/StructureDefinition/DeviceMetric")]
   public partial class DeviceMetric : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -201,7 +201,7 @@ public enum DeviceMetricCalibrationState
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("DeviceMetric#Calibration", IsNestedType=true)]
+    [FhirType("DeviceMetric#Calibration")]
     [BackboneType("DeviceMetric.calibration")]
     public partial class CalibrationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -398,6 +398,25 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "type":
+            TypeElement = (Code<Hl7.Fhir.Model.DeviceMetric.DeviceMetricCalibrationType>)value;
+            return this;
+          case "state":
+            StateElement = (Code<Hl7.Fhir.Model.DeviceMetric.DeviceMetricCalibrationState>)value;
+            return this;
+          case "time":
+            TimeElement = (Hl7.Fhir.Model.Instant)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -733,6 +752,43 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "type":
+          Type = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "unit":
+          Unit = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "device":
+          Device = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "operationalStatus":
+          OperationalStatusElement = (Code<Hl7.Fhir.Model.DeviceMetric.DeviceMetricOperationalStatus>)value;
+          return this;
+        case "color":
+          ColorElement = (Hl7.Fhir.Model.Code)value;
+          return this;
+        case "category":
+          CategoryElement = (Code<Hl7.Fhir.Model.DeviceMetric.DeviceMetricCategory>)value;
+          return this;
+        case "measurementFrequency":
+          MeasurementFrequency = (Hl7.Fhir.Model.Quantity)value;
+          return this;
+        case "calibration":
+          Calibration = (List<Hl7.Fhir.Model.DeviceMetric.CalibrationComponent>)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/DeviceRequest.cs b/src/Hl7.Fhir.R5/Model/Generated/DeviceRequest.cs
index 590a3db24d..2caa6886b5 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/DeviceRequest.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/DeviceRequest.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("DeviceRequest","http://hl7.org/fhir/StructureDefinition/DeviceRequest", IsResource=true)]
+  [FhirType("DeviceRequest","http://hl7.org/fhir/StructureDefinition/DeviceRequest")]
   public partial class DeviceRequest : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -67,7 +67,7 @@ public partial class DeviceRequest : Hl7.Fhir.Model.DomainResource, IIdentifiabl
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("DeviceRequest#Parameter", IsNestedType=true)]
+    [FhirType("DeviceRequest#Parameter")]
     [BackboneType("DeviceRequest.parameter")]
     public partial class ParameterComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -188,6 +188,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "code":
+            Code = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "value":
+            Value = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1014,6 +1030,94 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "instantiatesCanonical":
+          InstantiatesCanonicalElement = (List<Hl7.Fhir.Model.Canonical>)value;
+          return this;
+        case "instantiatesUri":
+          InstantiatesUriElement = (List<Hl7.Fhir.Model.FhirUri>)value;
+          return this;
+        case "basedOn":
+          BasedOn = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "replaces":
+          Replaces = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "groupIdentifier":
+          GroupIdentifier = (Hl7.Fhir.Model.Identifier)value;
+          return this;
+        case "status":
+          StatusElement = (Code<Hl7.Fhir.Model.RequestStatus>)value;
+          return this;
+        case "intent":
+          IntentElement = (Code<Hl7.Fhir.Model.RequestIntent>)value;
+          return this;
+        case "priority":
+          PriorityElement = (Code<Hl7.Fhir.Model.RequestPriority>)value;
+          return this;
+        case "doNotPerform":
+          DoNotPerformElement = (Hl7.Fhir.Model.FhirBoolean)value;
+          return this;
+        case "code":
+          Code = (Hl7.Fhir.Model.CodeableReference)value;
+          return this;
+        case "quantity":
+          QuantityElement = (Hl7.Fhir.Model.Integer)value;
+          return this;
+        case "parameter":
+          Parameter = (List<Hl7.Fhir.Model.DeviceRequest.ParameterComponent>)value;
+          return this;
+        case "subject":
+          Subject = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "encounter":
+          Encounter = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "occurrence":
+          Occurrence = (Hl7.Fhir.Model.DataType)value;
+          return this;
+        case "authoredOn":
+          AuthoredOnElement = (Hl7.Fhir.Model.FhirDateTime)value;
+          return this;
+        case "requester":
+          Requester = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "performer":
+          Performer = (Hl7.Fhir.Model.CodeableReference)value;
+          return this;
+        case "reason":
+          Reason = (List<Hl7.Fhir.Model.CodeableReference>)value;
+          return this;
+        case "asNeeded":
+          AsNeededElement = (Hl7.Fhir.Model.FhirBoolean)value;
+          return this;
+        case "asNeededFor":
+          AsNeededFor = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "insurance":
+          Insurance = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "supportingInfo":
+          SupportingInfo = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "note":
+          Note = (List<Hl7.Fhir.Model.Annotation>)value;
+          return this;
+        case "relevantHistory":
+          RelevantHistory = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/DeviceUsage.cs b/src/Hl7.Fhir.R5/Model/Generated/DeviceUsage.cs
index 4eb0e67d1a..dbd28e8d87 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/DeviceUsage.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/DeviceUsage.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("DeviceUsage","http://hl7.org/fhir/StructureDefinition/DeviceUsage", IsResource=true)]
+  [FhirType("DeviceUsage","http://hl7.org/fhir/StructureDefinition/DeviceUsage")]
   public partial class DeviceUsage : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -119,7 +119,7 @@ public enum DeviceUsageStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("DeviceUsage#Adherence", IsNestedType=true)]
+    [FhirType("DeviceUsage#Adherence")]
     [BackboneType("DeviceUsage.adherence")]
     public partial class AdherenceComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -241,6 +241,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "code":
+            Code = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "reason":
+            Reason = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -738,6 +754,67 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "basedOn":
+          BasedOn = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "status":
+          StatusElement = (Code<Hl7.Fhir.Model.DeviceUsage.DeviceUsageStatus>)value;
+          return this;
+        case "category":
+          Category = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "patient":
+          Patient = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "derivedFrom":
+          DerivedFrom = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "context":
+          Context = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "timing":
+          Timing = (Hl7.Fhir.Model.DataType)value;
+          return this;
+        case "dateAsserted":
+          DateAssertedElement = (Hl7.Fhir.Model.FhirDateTime)value;
+          return this;
+        case "usageStatus":
+          UsageStatus = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "usageReason":
+          UsageReason = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "adherence":
+          Adherence = (Hl7.Fhir.Model.DeviceUsage.AdherenceComponent)value;
+          return this;
+        case "informationSource":
+          InformationSource = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "device":
+          Device = (Hl7.Fhir.Model.CodeableReference)value;
+          return this;
+        case "reason":
+          Reason = (List<Hl7.Fhir.Model.CodeableReference>)value;
+          return this;
+        case "bodySite":
+          BodySite = (Hl7.Fhir.Model.CodeableReference)value;
+          return this;
+        case "note":
+          Note = (List<Hl7.Fhir.Model.Annotation>)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/DiagnosticReport.cs b/src/Hl7.Fhir.R5/Model/Generated/DiagnosticReport.cs
index 79f578134b..7385765f2e 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/DiagnosticReport.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/DiagnosticReport.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("DiagnosticReport","http://hl7.org/fhir/StructureDefinition/DiagnosticReport", IsResource=true)]
+  [FhirType("DiagnosticReport","http://hl7.org/fhir/StructureDefinition/DiagnosticReport")]
   public partial class DiagnosticReport : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -144,7 +144,7 @@ public enum DiagnosticReportStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("DiagnosticReport#SupportingInfo", IsNestedType=true)]
+    [FhirType("DiagnosticReport#SupportingInfo")]
     [BackboneType("DiagnosticReport.supportingInfo")]
     public partial class SupportingInfoComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -267,6 +267,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "type":
+            Type = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "reference":
+            Reference = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -284,7 +300,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("DiagnosticReport#Media", IsNestedType=true)]
+    [FhirType("DiagnosticReport#Media")]
     [BackboneType("DiagnosticReport.media")]
     public partial class MediaComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -423,6 +439,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "comment":
+            CommentElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "link":
+            Link = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1036,6 +1068,79 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "basedOn":
+          BasedOn = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "status":
+          StatusElement = (Code<Hl7.Fhir.Model.DiagnosticReport.DiagnosticReportStatus>)value;
+          return this;
+        case "category":
+          Category = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "code":
+          Code = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "subject":
+          Subject = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "encounter":
+          Encounter = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "effective":
+          Effective = (Hl7.Fhir.Model.DataType)value;
+          return this;
+        case "issued":
+          IssuedElement = (Hl7.Fhir.Model.Instant)value;
+          return this;
+        case "performer":
+          Performer = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "resultsInterpreter":
+          ResultsInterpreter = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "specimen":
+          Specimen = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "result":
+          Result = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "note":
+          Note = (List<Hl7.Fhir.Model.Annotation>)value;
+          return this;
+        case "study":
+          Study = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "supportingInfo":
+          SupportingInfo = (List<Hl7.Fhir.Model.DiagnosticReport.SupportingInfoComponent>)value;
+          return this;
+        case "media":
+          Media = (List<Hl7.Fhir.Model.DiagnosticReport.MediaComponent>)value;
+          return this;
+        case "composition":
+          Composition = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "conclusion":
+          ConclusionElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        case "conclusionCode":
+          ConclusionCode = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "presentedForm":
+          PresentedForm = (List<Hl7.Fhir.Model.Attachment>)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/Distance.cs b/src/Hl7.Fhir.R5/Model/Generated/Distance.cs
index 4cba6e0efe..14fabec10e 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/Distance.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/Distance.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/DocumentReference.cs b/src/Hl7.Fhir.R5/Model/Generated/DocumentReference.cs
index e26a1b81d8..74443fcb32 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/DocumentReference.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/DocumentReference.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("DocumentReference","http://hl7.org/fhir/StructureDefinition/DocumentReference", IsResource=true)]
+  [FhirType("DocumentReference","http://hl7.org/fhir/StructureDefinition/DocumentReference")]
   public partial class DocumentReference : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -97,7 +97,7 @@ public enum DocumentReferenceStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("DocumentReference#Attester", IsNestedType=true)]
+    [FhirType("DocumentReference#Attester")]
     [BackboneType("DocumentReference.attester")]
     public partial class AttesterComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -258,6 +258,25 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "mode":
+            Mode = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "time":
+            TimeElement = (Hl7.Fhir.Model.FhirDateTime)value;
+            return this;
+          case "party":
+            Party = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -277,7 +296,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("DocumentReference#RelatesTo", IsNestedType=true)]
+    [FhirType("DocumentReference#RelatesTo")]
     [BackboneType("DocumentReference.relatesTo")]
     public partial class RelatesToComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -400,6 +419,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "code":
+            Code = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "target":
+            Target = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -418,7 +453,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("DocumentReference#Content", IsNestedType=true)]
+    [FhirType("DocumentReference#Content")]
     [BackboneType("DocumentReference.content")]
     public partial class ContentComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -538,6 +573,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "attachment":
+            Attachment = (Hl7.Fhir.Model.Attachment)value;
+            return this;
+          case "profile":
+            Profile = (List<Hl7.Fhir.Model.DocumentReference.ProfileComponent>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -557,7 +608,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("DocumentReference#Profile", IsNestedType=true)]
+    [FhirType("DocumentReference#Profile")]
     [BackboneType("DocumentReference.content.profile")]
     public partial class ProfileComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -658,6 +709,19 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "value":
+            Value = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1343,6 +1407,85 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "version":
+          VersionElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "basedOn":
+          BasedOn = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "status":
+          StatusElement = (Code<Hl7.Fhir.Model.DocumentReference.DocumentReferenceStatus>)value;
+          return this;
+        case "docStatus":
+          DocStatusElement = (Code<Hl7.Fhir.Model.CompositionStatus>)value;
+          return this;
+        case "modality":
+          Modality = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "type":
+          Type = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "category":
+          Category = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "subject":
+          Subject = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "context":
+          Context = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "event":
+          Event = (List<Hl7.Fhir.Model.CodeableReference>)value;
+          return this;
+        case "bodySite":
+          BodySite = (List<Hl7.Fhir.Model.CodeableReference>)value;
+          return this;
+        case "facilityType":
+          FacilityType = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "practiceSetting":
+          PracticeSetting = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "period":
+          Period = (Hl7.Fhir.Model.Period)value;
+          return this;
+        case "date":
+          DateElement = (Hl7.Fhir.Model.Instant)value;
+          return this;
+        case "author":
+          Author = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "attester":
+          Attester = (List<Hl7.Fhir.Model.DocumentReference.AttesterComponent>)value;
+          return this;
+        case "custodian":
+          Custodian = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "relatesTo":
+          RelatesTo = (List<Hl7.Fhir.Model.DocumentReference.RelatesToComponent>)value;
+          return this;
+        case "description":
+          DescriptionElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        case "securityLabel":
+          SecurityLabel = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "content":
+          Content = (List<Hl7.Fhir.Model.DocumentReference.ContentComponent>)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/Dosage.cs b/src/Hl7.Fhir.R5/Model/Generated/Dosage.cs
index 8e06be11c5..b8cf6fcb8c 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/Dosage.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/Dosage.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -67,7 +67,7 @@ public partial class Dosage : Hl7.Fhir.Model.BackboneType
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Dosage#DoseAndRate", IsNestedType=true)]
+    [FhirType("Dosage#DoseAndRate")]
     [BackboneType("Dosage.doseAndRate")]
     public partial class DoseAndRateComponent : Hl7.Fhir.Model.Element
     {
@@ -211,6 +211,25 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "type":
+            Type = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "dose":
+            Dose = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          case "rate":
+            Rate = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -663,6 +682,58 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "sequence":
+          SequenceElement = (Hl7.Fhir.Model.Integer)value;
+          return this;
+        case "text":
+          TextElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "additionalInstruction":
+          AdditionalInstruction = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "patientInstruction":
+          PatientInstructionElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "timing":
+          Timing = (Hl7.Fhir.Model.Timing)value;
+          return this;
+        case "asNeeded":
+          AsNeededElement = (Hl7.Fhir.Model.FhirBoolean)value;
+          return this;
+        case "asNeededFor":
+          AsNeededFor = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "site":
+          Site = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "route":
+          Route = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "method":
+          Method = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "doseAndRate":
+          DoseAndRate = (List<Hl7.Fhir.Model.Dosage.DoseAndRateComponent>)value;
+          return this;
+        case "maxDosePerPeriod":
+          MaxDosePerPeriod = (List<Hl7.Fhir.Model.Ratio>)value;
+          return this;
+        case "maxDosePerAdministration":
+          MaxDosePerAdministration = (Hl7.Fhir.Model.Quantity)value;
+          return this;
+        case "maxDosePerLifetime":
+          MaxDosePerLifetime = (Hl7.Fhir.Model.Quantity)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/Duration.cs b/src/Hl7.Fhir.R5/Model/Generated/Duration.cs
index 7bdf484887..6f31af421d 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/Duration.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/Duration.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/Encounter.cs b/src/Hl7.Fhir.R5/Model/Generated/Encounter.cs
index 7abb580d16..f34fc61d7c 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/Encounter.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/Encounter.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Encounter","http://hl7.org/fhir/StructureDefinition/Encounter", IsResource=true)]
+  [FhirType("Encounter","http://hl7.org/fhir/StructureDefinition/Encounter")]
   public partial class Encounter : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -104,7 +104,7 @@ public enum EncounterLocationStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Encounter#Participant", IsNestedType=true)]
+    [FhirType("Encounter#Participant")]
     [BackboneType("Encounter.participant")]
     public partial class ParticipantComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -247,6 +247,25 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "type":
+            Type = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+            return this;
+          case "period":
+            Period = (Hl7.Fhir.Model.Period)value;
+            return this;
+          case "actor":
+            Actor = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -268,7 +287,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Encounter#Reason", IsNestedType=true)]
+    [FhirType("Encounter#Reason")]
     [BackboneType("Encounter.reason")]
     public partial class ReasonComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -390,6 +409,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "use":
+            Use = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+            return this;
+          case "value":
+            Value = (List<Hl7.Fhir.Model.CodeableReference>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -407,7 +442,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Encounter#Diagnosis", IsNestedType=true)]
+    [FhirType("Encounter#Diagnosis")]
     [BackboneType("Encounter.diagnosis")]
     public partial class DiagnosisComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -529,6 +564,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "condition":
+            Condition = (List<Hl7.Fhir.Model.CodeableReference>)value;
+            return this;
+          case "use":
+            Use = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -549,7 +600,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Encounter#Admission", IsNestedType=true)]
+    [FhirType("Encounter#Admission")]
     [BackboneType("Encounter.admission")]
     public partial class AdmissionComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -758,6 +809,34 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "preAdmissionIdentifier":
+            PreAdmissionIdentifier = (Hl7.Fhir.Model.Identifier)value;
+            return this;
+          case "origin":
+            Origin = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          case "admitSource":
+            AdmitSource = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "reAdmission":
+            ReAdmission = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "destination":
+            Destination = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          case "dischargeDisposition":
+            DischargeDisposition = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -780,7 +859,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Encounter#Location", IsNestedType=true)]
+    [FhirType("Encounter#Location")]
     [BackboneType("Encounter.location")]
     public partial class LocationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -964,6 +1043,28 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "location":
+            Location = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          case "status":
+            StatusElement = (Code<Hl7.Fhir.Model.Encounter.EncounterLocationStatus>)value;
+            return this;
+          case "form":
+            Form = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "period":
+            Period = (Hl7.Fhir.Model.Period)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1730,6 +1831,100 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "status":
+          StatusElement = (Code<Hl7.Fhir.Model.EncounterStatus>)value;
+          return this;
+        case "class":
+          Class = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "priority":
+          Priority = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "type":
+          Type = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "serviceType":
+          ServiceType = (List<Hl7.Fhir.Model.CodeableReference>)value;
+          return this;
+        case "subject":
+          Subject = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "subjectStatus":
+          SubjectStatus = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "episodeOfCare":
+          EpisodeOfCare = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "basedOn":
+          BasedOn = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "careTeam":
+          CareTeam = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "partOf":
+          PartOf = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "serviceProvider":
+          ServiceProvider = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "participant":
+          Participant = (List<Hl7.Fhir.Model.Encounter.ParticipantComponent>)value;
+          return this;
+        case "appointment":
+          Appointment = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "virtualService":
+          VirtualService = (List<Hl7.Fhir.Model.VirtualServiceDetail>)value;
+          return this;
+        case "actualPeriod":
+          ActualPeriod = (Hl7.Fhir.Model.Period)value;
+          return this;
+        case "plannedStartDate":
+          PlannedStartDateElement = (Hl7.Fhir.Model.FhirDateTime)value;
+          return this;
+        case "plannedEndDate":
+          PlannedEndDateElement = (Hl7.Fhir.Model.FhirDateTime)value;
+          return this;
+        case "length":
+          Length = (Hl7.Fhir.Model.Duration)value;
+          return this;
+        case "reason":
+          Reason = (List<Hl7.Fhir.Model.Encounter.ReasonComponent>)value;
+          return this;
+        case "diagnosis":
+          Diagnosis = (List<Hl7.Fhir.Model.Encounter.DiagnosisComponent>)value;
+          return this;
+        case "account":
+          Account = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "dietPreference":
+          DietPreference = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "specialArrangement":
+          SpecialArrangement = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "specialCourtesy":
+          SpecialCourtesy = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "admission":
+          Admission = (Hl7.Fhir.Model.Encounter.AdmissionComponent)value;
+          return this;
+        case "location":
+          Location = (List<Hl7.Fhir.Model.Encounter.LocationComponent>)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/EncounterHistory.cs b/src/Hl7.Fhir.R5/Model/Generated/EncounterHistory.cs
index b58520d466..fdf3f3f93e 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/EncounterHistory.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/EncounterHistory.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("EncounterHistory","http://hl7.org/fhir/StructureDefinition/EncounterHistory", IsResource=true)]
+  [FhirType("EncounterHistory","http://hl7.org/fhir/StructureDefinition/EncounterHistory")]
   public partial class EncounterHistory : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -68,7 +68,7 @@ public partial class EncounterHistory : Hl7.Fhir.Model.DomainResource, IIdentifi
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("EncounterHistory#Location", IsNestedType=true)]
+    [FhirType("EncounterHistory#Location")]
     [BackboneType("EncounterHistory.location")]
     public partial class LocationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -190,6 +190,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "location":
+            Location = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          case "form":
+            Form = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -611,6 +627,55 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "encounter":
+          Encounter = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "status":
+          StatusElement = (Code<Hl7.Fhir.Model.EncounterStatus>)value;
+          return this;
+        case "class":
+          Class = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "type":
+          Type = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "serviceType":
+          ServiceType = (List<Hl7.Fhir.Model.CodeableReference>)value;
+          return this;
+        case "subject":
+          Subject = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "subjectStatus":
+          SubjectStatus = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "actualPeriod":
+          ActualPeriod = (Hl7.Fhir.Model.Period)value;
+          return this;
+        case "plannedStartDate":
+          PlannedStartDateElement = (Hl7.Fhir.Model.FhirDateTime)value;
+          return this;
+        case "plannedEndDate":
+          PlannedEndDateElement = (Hl7.Fhir.Model.FhirDateTime)value;
+          return this;
+        case "length":
+          Length = (Hl7.Fhir.Model.Duration)value;
+          return this;
+        case "location":
+          Location = (List<Hl7.Fhir.Model.EncounterHistory.LocationComponent>)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/Endpoint.cs b/src/Hl7.Fhir.R5/Model/Generated/Endpoint.cs
index dd8542bf48..6c239e496b 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/Endpoint.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/Endpoint.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Endpoint","http://hl7.org/fhir/StructureDefinition/Endpoint", IsResource=true)]
+  [FhirType("Endpoint","http://hl7.org/fhir/StructureDefinition/Endpoint")]
   public partial class Endpoint : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -108,7 +108,7 @@ public enum EndpointStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Endpoint#Payload", IsNestedType=true)]
+    [FhirType("Endpoint#Payload")]
     [BackboneType("Endpoint.payload")]
     public partial class PayloadComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -248,6 +248,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "type":
+            Type = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+            return this;
+          case "mimeType":
+            MimeTypeElement = (List<Hl7.Fhir.Model.Code>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -682,6 +698,52 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "status":
+          StatusElement = (Code<Hl7.Fhir.Model.Endpoint.EndpointStatus>)value;
+          return this;
+        case "connectionType":
+          ConnectionType = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "name":
+          NameElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "description":
+          DescriptionElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "environmentType":
+          EnvironmentType = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "managingOrganization":
+          ManagingOrganization = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "contact":
+          Contact = (List<Hl7.Fhir.Model.ContactPoint>)value;
+          return this;
+        case "period":
+          Period = (Hl7.Fhir.Model.Period)value;
+          return this;
+        case "payload":
+          Payload = (List<Hl7.Fhir.Model.Endpoint.PayloadComponent>)value;
+          return this;
+        case "address":
+          AddressElement = (Hl7.Fhir.Model.FhirUrl)value;
+          return this;
+        case "header":
+          HeaderElement = (List<Hl7.Fhir.Model.FhirString>)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/EnrollmentRequest.cs b/src/Hl7.Fhir.R5/Model/Generated/EnrollmentRequest.cs
index 0a472848a5..eeb67ac26e 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/EnrollmentRequest.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/EnrollmentRequest.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("EnrollmentRequest","http://hl7.org/fhir/StructureDefinition/EnrollmentRequest", IsResource=true)]
+  [FhirType("EnrollmentRequest","http://hl7.org/fhir/StructureDefinition/EnrollmentRequest")]
   public partial class EnrollmentRequest : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -322,6 +322,37 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "status":
+          StatusElement = (Code<Hl7.Fhir.Model.FinancialResourceStatusCodes>)value;
+          return this;
+        case "created":
+          CreatedElement = (Hl7.Fhir.Model.FhirDateTime)value;
+          return this;
+        case "insurer":
+          Insurer = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "provider":
+          Provider = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "candidate":
+          Candidate = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "coverage":
+          Coverage = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/EnrollmentResponse.cs b/src/Hl7.Fhir.R5/Model/Generated/EnrollmentResponse.cs
index 6859e11c8d..5f59243c8e 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/EnrollmentResponse.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/EnrollmentResponse.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("EnrollmentResponse","http://hl7.org/fhir/StructureDefinition/EnrollmentResponse", IsResource=true)]
+  [FhirType("EnrollmentResponse","http://hl7.org/fhir/StructureDefinition/EnrollmentResponse")]
   public partial class EnrollmentResponse : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -413,6 +413,40 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "status":
+          StatusElement = (Code<Hl7.Fhir.Model.FinancialResourceStatusCodes>)value;
+          return this;
+        case "request":
+          Request = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "outcome":
+          OutcomeElement = (Code<Hl7.Fhir.Model.EnrollmentResponse.EnrollmentOutcome>)value;
+          return this;
+        case "disposition":
+          DispositionElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "created":
+          CreatedElement = (Hl7.Fhir.Model.FhirDateTime)value;
+          return this;
+        case "organization":
+          Organization = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "requestProvider":
+          RequestProvider = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/EpisodeOfCare.cs b/src/Hl7.Fhir.R5/Model/Generated/EpisodeOfCare.cs
index 3f05f86a88..b31694a882 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/EpisodeOfCare.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/EpisodeOfCare.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("EpisodeOfCare","http://hl7.org/fhir/StructureDefinition/EpisodeOfCare", IsResource=true)]
+  [FhirType("EpisodeOfCare","http://hl7.org/fhir/StructureDefinition/EpisodeOfCare")]
   public partial class EpisodeOfCare : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -119,7 +119,7 @@ public enum EpisodeOfCareStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("EpisodeOfCare#StatusHistory", IsNestedType=true)]
+    [FhirType("EpisodeOfCare#StatusHistory")]
     [BackboneType("EpisodeOfCare.statusHistory")]
     public partial class StatusHistoryComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -259,6 +259,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "status":
+            StatusElement = (Code<Hl7.Fhir.Model.EpisodeOfCare.EpisodeOfCareStatus>)value;
+            return this;
+          case "period":
+            Period = (Hl7.Fhir.Model.Period)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -279,7 +295,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("EpisodeOfCare#Reason", IsNestedType=true)]
+    [FhirType("EpisodeOfCare#Reason")]
     [BackboneType("EpisodeOfCare.reason")]
     public partial class ReasonComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -400,6 +416,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "use":
+            Use = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "value":
+            Value = (List<Hl7.Fhir.Model.CodeableReference>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -418,7 +450,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("EpisodeOfCare#Diagnosis", IsNestedType=true)]
+    [FhirType("EpisodeOfCare#Diagnosis")]
     [BackboneType("EpisodeOfCare.diagnosis")]
     public partial class DiagnosisComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -539,6 +571,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "condition":
+            Condition = (List<Hl7.Fhir.Model.CodeableReference>)value;
+            return this;
+          case "use":
+            Use = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -933,6 +981,55 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "status":
+          StatusElement = (Code<Hl7.Fhir.Model.EpisodeOfCare.EpisodeOfCareStatus>)value;
+          return this;
+        case "statusHistory":
+          StatusHistory = (List<Hl7.Fhir.Model.EpisodeOfCare.StatusHistoryComponent>)value;
+          return this;
+        case "type":
+          Type = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "reason":
+          Reason = (List<Hl7.Fhir.Model.EpisodeOfCare.ReasonComponent>)value;
+          return this;
+        case "diagnosis":
+          Diagnosis = (List<Hl7.Fhir.Model.EpisodeOfCare.DiagnosisComponent>)value;
+          return this;
+        case "patient":
+          Patient = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "managingOrganization":
+          ManagingOrganization = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "period":
+          Period = (Hl7.Fhir.Model.Period)value;
+          return this;
+        case "referralRequest":
+          ReferralRequest = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "careManager":
+          CareManager = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "careTeam":
+          CareTeam = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "account":
+          Account = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/EventDefinition.cs b/src/Hl7.Fhir.R5/Model/Generated/EventDefinition.cs
index 3094482ff7..2ad2d0ddf6 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/EventDefinition.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/EventDefinition.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("EventDefinition","http://hl7.org/fhir/StructureDefinition/EventDefinition", IsResource=true)]
+  [FhirType("EventDefinition","http://hl7.org/fhir/StructureDefinition/EventDefinition")]
   public partial class EventDefinition : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -1068,6 +1068,106 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "url":
+          UrlElement = (Hl7.Fhir.Model.FhirUri)value;
+          return this;
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "version":
+          VersionElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "versionAlgorithm":
+          VersionAlgorithm = (Hl7.Fhir.Model.DataType)value;
+          return this;
+        case "name":
+          NameElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "title":
+          TitleElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "subtitle":
+          SubtitleElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "status":
+          StatusElement = (Code<Hl7.Fhir.Model.PublicationStatus>)value;
+          return this;
+        case "experimental":
+          ExperimentalElement = (Hl7.Fhir.Model.FhirBoolean)value;
+          return this;
+        case "subject":
+          Subject = (Hl7.Fhir.Model.DataType)value;
+          return this;
+        case "date":
+          DateElement = (Hl7.Fhir.Model.FhirDateTime)value;
+          return this;
+        case "publisher":
+          PublisherElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "contact":
+          Contact = (List<Hl7.Fhir.Model.ContactDetail>)value;
+          return this;
+        case "description":
+          DescriptionElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        case "useContext":
+          UseContext = (List<Hl7.Fhir.Model.UsageContext>)value;
+          return this;
+        case "jurisdiction":
+          Jurisdiction = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "purpose":
+          PurposeElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        case "usage":
+          UsageElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        case "copyright":
+          CopyrightElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        case "copyrightLabel":
+          CopyrightLabelElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "approvalDate":
+          ApprovalDateElement = (Hl7.Fhir.Model.Date)value;
+          return this;
+        case "lastReviewDate":
+          LastReviewDateElement = (Hl7.Fhir.Model.Date)value;
+          return this;
+        case "effectivePeriod":
+          EffectivePeriod = (Hl7.Fhir.Model.Period)value;
+          return this;
+        case "topic":
+          Topic = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "author":
+          Author = (List<Hl7.Fhir.Model.ContactDetail>)value;
+          return this;
+        case "editor":
+          Editor = (List<Hl7.Fhir.Model.ContactDetail>)value;
+          return this;
+        case "reviewer":
+          Reviewer = (List<Hl7.Fhir.Model.ContactDetail>)value;
+          return this;
+        case "endorser":
+          Endorser = (List<Hl7.Fhir.Model.ContactDetail>)value;
+          return this;
+        case "relatedArtifact":
+          RelatedArtifact = (List<Hl7.Fhir.Model.RelatedArtifact>)value;
+          return this;
+        case "trigger":
+          Trigger = (List<Hl7.Fhir.Model.TriggerDefinition>)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/Evidence.cs b/src/Hl7.Fhir.R5/Model/Generated/Evidence.cs
index c12b5d211c..18e037ec6a 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/Evidence.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/Evidence.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Evidence","http://hl7.org/fhir/StructureDefinition/Evidence", IsResource=true)]
+  [FhirType("Evidence","http://hl7.org/fhir/StructureDefinition/Evidence")]
   public partial class Evidence : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -64,7 +64,7 @@ public partial class Evidence : Hl7.Fhir.Model.DomainResource, IIdentifiable<Lis
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Evidence#VariableDefinition", IsNestedType=true)]
+    [FhirType("Evidence#VariableDefinition")]
     [BackboneType("Evidence.variableDefinition")]
     public partial class VariableDefinitionComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -292,6 +292,34 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "description":
+            DescriptionElement = (Hl7.Fhir.Model.Markdown)value;
+            return this;
+          case "note":
+            Note = (List<Hl7.Fhir.Model.Annotation>)value;
+            return this;
+          case "variableRole":
+            VariableRole = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "observed":
+            Observed = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          case "intended":
+            Intended = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          case "directnessMatch":
+            DirectnessMatch = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -310,7 +338,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Evidence#Statistic", IsNestedType=true)]
+    [FhirType("Evidence#Statistic")]
     [BackboneType("Evidence.statistic")]
     public partial class StatisticComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -654,6 +682,46 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "description":
+            DescriptionElement = (Hl7.Fhir.Model.Markdown)value;
+            return this;
+          case "note":
+            Note = (List<Hl7.Fhir.Model.Annotation>)value;
+            return this;
+          case "statisticType":
+            StatisticType = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "category":
+            Category = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "quantity":
+            Quantity = (Hl7.Fhir.Model.Quantity)value;
+            return this;
+          case "numberOfEvents":
+            NumberOfEventsElement = (Hl7.Fhir.Model.UnsignedInt)value;
+            return this;
+          case "numberAffected":
+            NumberAffectedElement = (Hl7.Fhir.Model.UnsignedInt)value;
+            return this;
+          case "sampleSize":
+            SampleSize = (Hl7.Fhir.Model.Evidence.SampleSizeComponent)value;
+            return this;
+          case "attributeEstimate":
+            AttributeEstimate = (List<Hl7.Fhir.Model.Evidence.AttributeEstimateComponent>)value;
+            return this;
+          case "modelCharacteristic":
+            ModelCharacteristic = (List<Hl7.Fhir.Model.Evidence.ModelCharacteristicComponent>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -676,7 +744,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Evidence#SampleSize", IsNestedType=true)]
+    [FhirType("Evidence#SampleSize")]
     [BackboneType("Evidence.statistic.sampleSize")]
     public partial class SampleSizeComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -930,6 +998,31 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "description":
+            DescriptionElement = (Hl7.Fhir.Model.Markdown)value;
+            return this;
+          case "note":
+            Note = (List<Hl7.Fhir.Model.Annotation>)value;
+            return this;
+          case "numberOfStudies":
+            NumberOfStudiesElement = (Hl7.Fhir.Model.UnsignedInt)value;
+            return this;
+          case "numberOfParticipants":
+            NumberOfParticipantsElement = (Hl7.Fhir.Model.UnsignedInt)value;
+            return this;
+          case "knownDataCount":
+            KnownDataCountElement = (Hl7.Fhir.Model.UnsignedInt)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -950,7 +1043,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Evidence#AttributeEstimate", IsNestedType=true)]
+    [FhirType("Evidence#AttributeEstimate")]
     [BackboneType("Evidence.statistic.attributeEstimate")]
     public partial class AttributeEstimateComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1212,6 +1305,37 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "description":
+            DescriptionElement = (Hl7.Fhir.Model.Markdown)value;
+            return this;
+          case "note":
+            Note = (List<Hl7.Fhir.Model.Annotation>)value;
+            return this;
+          case "type":
+            Type = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "quantity":
+            Quantity = (Hl7.Fhir.Model.Quantity)value;
+            return this;
+          case "level":
+            LevelElement = (Hl7.Fhir.Model.FhirDecimal)value;
+            return this;
+          case "range":
+            Range = (Hl7.Fhir.Model.Range)value;
+            return this;
+          case "attributeEstimate":
+            AttributeEstimate = (List<Hl7.Fhir.Model.Evidence.AttributeEstimateComponent>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1234,7 +1358,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Evidence#ModelCharacteristic", IsNestedType=true)]
+    [FhirType("Evidence#ModelCharacteristic")]
     [BackboneType("Evidence.statistic.modelCharacteristic")]
     public partial class ModelCharacteristicComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1398,6 +1522,28 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "code":
+            Code = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "value":
+            Value = (Hl7.Fhir.Model.Quantity)value;
+            return this;
+          case "variable":
+            Variable = (List<Hl7.Fhir.Model.Evidence.VariableComponent>)value;
+            return this;
+          case "attributeEstimate":
+            AttributeEstimate = (List<Hl7.Fhir.Model.Evidence.AttributeEstimateComponent>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1414,7 +1560,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Evidence#Variable", IsNestedType=true)]
+    [FhirType("Evidence#Variable")]
     [BackboneType("Evidence.statistic.modelCharacteristic.variable")]
     public partial class VariableComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1621,6 +1767,31 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "variableDefinition":
+            VariableDefinition = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          case "handling":
+            HandlingElement = (Code<Hl7.Fhir.Model.EvidenceVariableHandling>)value;
+            return this;
+          case "valueCategory":
+            ValueCategory = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+            return this;
+          case "valueQuantity":
+            ValueQuantity = (List<Hl7.Fhir.Model.Quantity>)value;
+            return this;
+          case "valueRange":
+            ValueRange = (List<Hl7.Fhir.Model.Range>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1641,7 +1812,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Evidence#Certainty", IsNestedType=true)]
+    [FhirType("Evidence#Certainty")]
     [BackboneType("Evidence.certainty")]
     public partial class CertaintyComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1883,6 +2054,34 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "description":
+            DescriptionElement = (Hl7.Fhir.Model.Markdown)value;
+            return this;
+          case "note":
+            Note = (List<Hl7.Fhir.Model.Annotation>)value;
+            return this;
+          case "type":
+            Type = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "rating":
+            Rating = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "rater":
+            RaterElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "subcomponent":
+            Subcomponent = (List<Hl7.Fhir.Model.Evidence.CertaintyComponent>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -2909,6 +3108,109 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "url":
+          UrlElement = (Hl7.Fhir.Model.FhirUri)value;
+          return this;
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "version":
+          VersionElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "versionAlgorithm":
+          VersionAlgorithm = (Hl7.Fhir.Model.DataType)value;
+          return this;
+        case "name":
+          NameElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "title":
+          TitleElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "citeAs":
+          CiteAs = (Hl7.Fhir.Model.DataType)value;
+          return this;
+        case "status":
+          StatusElement = (Code<Hl7.Fhir.Model.PublicationStatus>)value;
+          return this;
+        case "experimental":
+          ExperimentalElement = (Hl7.Fhir.Model.FhirBoolean)value;
+          return this;
+        case "date":
+          DateElement = (Hl7.Fhir.Model.FhirDateTime)value;
+          return this;
+        case "approvalDate":
+          ApprovalDateElement = (Hl7.Fhir.Model.Date)value;
+          return this;
+        case "lastReviewDate":
+          LastReviewDateElement = (Hl7.Fhir.Model.Date)value;
+          return this;
+        case "publisher":
+          PublisherElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "contact":
+          Contact = (List<Hl7.Fhir.Model.ContactDetail>)value;
+          return this;
+        case "author":
+          Author = (List<Hl7.Fhir.Model.ContactDetail>)value;
+          return this;
+        case "editor":
+          Editor = (List<Hl7.Fhir.Model.ContactDetail>)value;
+          return this;
+        case "reviewer":
+          Reviewer = (List<Hl7.Fhir.Model.ContactDetail>)value;
+          return this;
+        case "endorser":
+          Endorser = (List<Hl7.Fhir.Model.ContactDetail>)value;
+          return this;
+        case "useContext":
+          UseContext = (List<Hl7.Fhir.Model.UsageContext>)value;
+          return this;
+        case "purpose":
+          PurposeElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        case "copyright":
+          CopyrightElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        case "copyrightLabel":
+          CopyrightLabelElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "relatedArtifact":
+          RelatedArtifact = (List<Hl7.Fhir.Model.RelatedArtifact>)value;
+          return this;
+        case "description":
+          DescriptionElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        case "assertion":
+          AssertionElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        case "note":
+          Note = (List<Hl7.Fhir.Model.Annotation>)value;
+          return this;
+        case "variableDefinition":
+          VariableDefinition = (List<Hl7.Fhir.Model.Evidence.VariableDefinitionComponent>)value;
+          return this;
+        case "synthesisType":
+          SynthesisType = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "studyDesign":
+          StudyDesign = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "statistic":
+          Statistic = (List<Hl7.Fhir.Model.Evidence.StatisticComponent>)value;
+          return this;
+        case "certainty":
+          Certainty = (List<Hl7.Fhir.Model.Evidence.CertaintyComponent>)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/EvidenceReport.cs b/src/Hl7.Fhir.R5/Model/Generated/EvidenceReport.cs
index fe1ea6133d..70794b658c 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/EvidenceReport.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/EvidenceReport.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("EvidenceReport","http://hl7.org/fhir/StructureDefinition/EvidenceReport", IsResource=true)]
+  [FhirType("EvidenceReport","http://hl7.org/fhir/StructureDefinition/EvidenceReport")]
   public partial class EvidenceReport : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -126,7 +126,7 @@ public enum ReportRelationshipType
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("EvidenceReport#Subject", IsNestedType=true)]
+    [FhirType("EvidenceReport#Subject")]
     [BackboneType("EvidenceReport.subject")]
     public partial class SubjectComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -246,6 +246,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "characteristic":
+            Characteristic = (List<Hl7.Fhir.Model.EvidenceReport.CharacteristicComponent>)value;
+            return this;
+          case "note":
+            Note = (List<Hl7.Fhir.Model.Annotation>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -260,7 +276,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("EvidenceReport#Characteristic", IsNestedType=true)]
+    [FhirType("EvidenceReport#Characteristic")]
     [BackboneType("EvidenceReport.subject.characteristic")]
     public partial class CharacteristicComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -444,6 +460,28 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "code":
+            Code = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "value":
+            Value = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          case "exclude":
+            ExcludeElement = (Hl7.Fhir.Model.FhirBoolean)value;
+            return this;
+          case "period":
+            Period = (Hl7.Fhir.Model.Period)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -464,7 +502,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("EvidenceReport#RelatesTo", IsNestedType=true)]
+    [FhirType("EvidenceReport#RelatesTo")]
     [BackboneType("EvidenceReport.relatesTo")]
     public partial class RelatesToComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -604,6 +642,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "code":
+            CodeElement = (Code<Hl7.Fhir.Model.EvidenceReport.ReportRelationshipType>)value;
+            return this;
+          case "target":
+            Target = (Hl7.Fhir.Model.EvidenceReport.TargetComponent)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -621,7 +675,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("EvidenceReport#Target", IsNestedType=true)]
+    [FhirType("EvidenceReport#Target")]
     [BackboneType("EvidenceReport.relatesTo.target")]
     public partial class TargetComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -819,6 +873,28 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "url":
+            UrlElement = (Hl7.Fhir.Model.FhirUri)value;
+            return this;
+          case "identifier":
+            Identifier = (Hl7.Fhir.Model.Identifier)value;
+            return this;
+          case "display":
+            DisplayElement = (Hl7.Fhir.Model.Markdown)value;
+            return this;
+          case "resource":
+            Resource = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -838,7 +914,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("EvidenceReport#Section", IsNestedType=true)]
+    [FhirType("EvidenceReport#Section")]
     [BackboneType("EvidenceReport.section")]
     public partial class SectionComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1219,6 +1295,52 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "title":
+            TitleElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "focus":
+            Focus = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "focusReference":
+            FocusReference = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          case "author":
+            Author = (List<Hl7.Fhir.Model.ResourceReference>)value;
+            return this;
+          case "text":
+            Text = (Hl7.Fhir.Model.Narrative)value;
+            return this;
+          case "mode":
+            ModeElement = (Code<Hl7.Fhir.Model.ListMode>)value;
+            return this;
+          case "orderedBy":
+            OrderedBy = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "entryClassifier":
+            EntryClassifier = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+            return this;
+          case "entryReference":
+            EntryReference = (List<Hl7.Fhir.Model.ResourceReference>)value;
+            return this;
+          case "entryQuantity":
+            EntryQuantity = (List<Hl7.Fhir.Model.Quantity>)value;
+            return this;
+          case "emptyReason":
+            EmptyReason = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "section":
+            Section = (List<Hl7.Fhir.Model.EvidenceReport.SectionComponent>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1759,6 +1881,70 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "url":
+          UrlElement = (Hl7.Fhir.Model.FhirUri)value;
+          return this;
+        case "status":
+          StatusElement = (Code<Hl7.Fhir.Model.PublicationStatus>)value;
+          return this;
+        case "useContext":
+          UseContext = (List<Hl7.Fhir.Model.UsageContext>)value;
+          return this;
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "relatedIdentifier":
+          RelatedIdentifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "citeAs":
+          CiteAs = (Hl7.Fhir.Model.DataType)value;
+          return this;
+        case "type":
+          Type = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "note":
+          Note = (List<Hl7.Fhir.Model.Annotation>)value;
+          return this;
+        case "relatedArtifact":
+          RelatedArtifact = (List<Hl7.Fhir.Model.RelatedArtifact>)value;
+          return this;
+        case "subject":
+          Subject = (Hl7.Fhir.Model.EvidenceReport.SubjectComponent)value;
+          return this;
+        case "publisher":
+          PublisherElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "contact":
+          Contact = (List<Hl7.Fhir.Model.ContactDetail>)value;
+          return this;
+        case "author":
+          Author = (List<Hl7.Fhir.Model.ContactDetail>)value;
+          return this;
+        case "editor":
+          Editor = (List<Hl7.Fhir.Model.ContactDetail>)value;
+          return this;
+        case "reviewer":
+          Reviewer = (List<Hl7.Fhir.Model.ContactDetail>)value;
+          return this;
+        case "endorser":
+          Endorser = (List<Hl7.Fhir.Model.ContactDetail>)value;
+          return this;
+        case "relatesTo":
+          RelatesTo = (List<Hl7.Fhir.Model.EvidenceReport.RelatesToComponent>)value;
+          return this;
+        case "section":
+          Section = (List<Hl7.Fhir.Model.EvidenceReport.SectionComponent>)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/EvidenceVariable.cs b/src/Hl7.Fhir.R5/Model/Generated/EvidenceVariable.cs
index 40e426f686..0f201135ee 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/EvidenceVariable.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/EvidenceVariable.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("EvidenceVariable","http://hl7.org/fhir/StructureDefinition/EvidenceVariable", IsResource=true)]
+  [FhirType("EvidenceVariable","http://hl7.org/fhir/StructureDefinition/EvidenceVariable")]
   public partial class EvidenceVariable : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -121,7 +121,7 @@ public enum CharacteristicCombinationCode
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("EvidenceVariable#Characteristic", IsNestedType=true)]
+    [FhirType("EvidenceVariable#Characteristic")]
     [BackboneType("EvidenceVariable.characteristic")]
     public partial class CharacteristicComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -589,6 +589,58 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "linkId":
+            LinkIdElement = (Hl7.Fhir.Model.Id)value;
+            return this;
+          case "description":
+            DescriptionElement = (Hl7.Fhir.Model.Markdown)value;
+            return this;
+          case "note":
+            Note = (List<Hl7.Fhir.Model.Annotation>)value;
+            return this;
+          case "exclude":
+            ExcludeElement = (Hl7.Fhir.Model.FhirBoolean)value;
+            return this;
+          case "definitionReference":
+            DefinitionReference = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          case "definitionCanonical":
+            DefinitionCanonicalElement = (Hl7.Fhir.Model.Canonical)value;
+            return this;
+          case "definitionCodeableConcept":
+            DefinitionCodeableConcept = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "definitionExpression":
+            DefinitionExpression = (Hl7.Fhir.Model.Expression)value;
+            return this;
+          case "definitionId":
+            DefinitionIdElement = (Hl7.Fhir.Model.Id)value;
+            return this;
+          case "definitionByTypeAndValue":
+            DefinitionByTypeAndValue = (Hl7.Fhir.Model.EvidenceVariable.DefinitionByTypeAndValueComponent)value;
+            return this;
+          case "definitionByCombination":
+            DefinitionByCombination = (Hl7.Fhir.Model.EvidenceVariable.DefinitionByCombinationComponent)value;
+            return this;
+          case "instances":
+            Instances = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          case "duration":
+            Duration = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          case "timeFromEvent":
+            TimeFromEvent = (List<Hl7.Fhir.Model.EvidenceVariable.TimeFromEventComponent>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -618,7 +670,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("EvidenceVariable#DefinitionByTypeAndValue", IsNestedType=true)]
+    [FhirType("EvidenceVariable#DefinitionByTypeAndValue")]
     [BackboneType("EvidenceVariable.characteristic.definitionByTypeAndValue")]
     public partial class DefinitionByTypeAndValueComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -809,6 +861,31 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "type":
+            Type = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "method":
+            Method = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+            return this;
+          case "device":
+            Device = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          case "value":
+            Value = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          case "offset":
+            Offset = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -829,7 +906,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("EvidenceVariable#DefinitionByCombination", IsNestedType=true)]
+    [FhirType("EvidenceVariable#DefinitionByCombination")]
     [BackboneType("EvidenceVariable.characteristic.definitionByCombination")]
     public partial class DefinitionByCombinationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1008,6 +1085,25 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "code":
+            CodeElement = (Code<Hl7.Fhir.Model.EvidenceVariable.CharacteristicCombinationCode>)value;
+            return this;
+          case "threshold":
+            ThresholdElement = (Hl7.Fhir.Model.PositiveInt)value;
+            return this;
+          case "characteristic":
+            Characteristic = (List<Hl7.Fhir.Model.EvidenceVariable.CharacteristicComponent>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1023,7 +1119,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("EvidenceVariable#TimeFromEvent", IsNestedType=true)]
+    [FhirType("EvidenceVariable#TimeFromEvent")]
     [BackboneType("EvidenceVariable.characteristic.timeFromEvent")]
     public partial class TimeFromEventComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1226,6 +1322,31 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "description":
+            DescriptionElement = (Hl7.Fhir.Model.Markdown)value;
+            return this;
+          case "note":
+            Note = (List<Hl7.Fhir.Model.Annotation>)value;
+            return this;
+          case "event":
+            Event = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          case "quantity":
+            Quantity = (Hl7.Fhir.Model.Quantity)value;
+            return this;
+          case "range":
+            Range = (Hl7.Fhir.Model.Range)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1243,7 +1364,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("EvidenceVariable#Category", IsNestedType=true)]
+    [FhirType("EvidenceVariable#Category")]
     [BackboneType("EvidenceVariable.category")]
     public partial class CategoryComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1381,6 +1502,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "name":
+            NameElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "value":
+            Value = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -2413,6 +2550,106 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "url":
+          UrlElement = (Hl7.Fhir.Model.FhirUri)value;
+          return this;
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "version":
+          VersionElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "versionAlgorithm":
+          VersionAlgorithm = (Hl7.Fhir.Model.DataType)value;
+          return this;
+        case "name":
+          NameElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "title":
+          TitleElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "shortTitle":
+          ShortTitleElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "status":
+          StatusElement = (Code<Hl7.Fhir.Model.PublicationStatus>)value;
+          return this;
+        case "experimental":
+          ExperimentalElement = (Hl7.Fhir.Model.FhirBoolean)value;
+          return this;
+        case "date":
+          DateElement = (Hl7.Fhir.Model.FhirDateTime)value;
+          return this;
+        case "publisher":
+          PublisherElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "contact":
+          Contact = (List<Hl7.Fhir.Model.ContactDetail>)value;
+          return this;
+        case "description":
+          DescriptionElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        case "note":
+          Note = (List<Hl7.Fhir.Model.Annotation>)value;
+          return this;
+        case "useContext":
+          UseContext = (List<Hl7.Fhir.Model.UsageContext>)value;
+          return this;
+        case "purpose":
+          PurposeElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        case "copyright":
+          CopyrightElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        case "copyrightLabel":
+          CopyrightLabelElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "approvalDate":
+          ApprovalDateElement = (Hl7.Fhir.Model.Date)value;
+          return this;
+        case "lastReviewDate":
+          LastReviewDateElement = (Hl7.Fhir.Model.Date)value;
+          return this;
+        case "effectivePeriod":
+          EffectivePeriod = (Hl7.Fhir.Model.Period)value;
+          return this;
+        case "author":
+          Author = (List<Hl7.Fhir.Model.ContactDetail>)value;
+          return this;
+        case "editor":
+          Editor = (List<Hl7.Fhir.Model.ContactDetail>)value;
+          return this;
+        case "reviewer":
+          Reviewer = (List<Hl7.Fhir.Model.ContactDetail>)value;
+          return this;
+        case "endorser":
+          Endorser = (List<Hl7.Fhir.Model.ContactDetail>)value;
+          return this;
+        case "relatedArtifact":
+          RelatedArtifact = (List<Hl7.Fhir.Model.RelatedArtifact>)value;
+          return this;
+        case "actual":
+          ActualElement = (Hl7.Fhir.Model.FhirBoolean)value;
+          return this;
+        case "characteristic":
+          Characteristic = (List<Hl7.Fhir.Model.EvidenceVariable.CharacteristicComponent>)value;
+          return this;
+        case "handling":
+          HandlingElement = (Code<Hl7.Fhir.Model.EvidenceVariableHandling>)value;
+          return this;
+        case "category":
+          Category = (List<Hl7.Fhir.Model.EvidenceVariable.CategoryComponent>)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/ExampleScenario.cs b/src/Hl7.Fhir.R5/Model/Generated/ExampleScenario.cs
index c3f672c6e0..f19e784c06 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/ExampleScenario.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/ExampleScenario.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model
   /// </summary>
   [Serializable]
   [DataContract]
-  [FhirType("ExampleScenario","http://hl7.org/fhir/StructureDefinition/ExampleScenario", IsResource=true)]
+  [FhirType("ExampleScenario","http://hl7.org/fhir/StructureDefinition/ExampleScenario")]
   public partial class ExampleScenario : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -64,7 +64,7 @@ public partial class ExampleScenario : Hl7.Fhir.Model.DomainResource, IIdentifia
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExampleScenario#Actor", IsNestedType=true)]
+    [FhirType("ExampleScenario#Actor")]
     [BackboneType("ExampleScenario.actor")]
     public partial class ActorComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -301,6 +301,28 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "key":
+            KeyElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "type":
+            TypeElement = (Code<Hl7.Fhir.Model.ExampleScenarioActorType>)value;
+            return this;
+          case "title":
+            TitleElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "description":
+            DescriptionElement = (Hl7.Fhir.Model.Markdown)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -320,7 +342,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExampleScenario#Instance", IsNestedType=true)]
+    [FhirType("ExampleScenario#Instance")]
     [BackboneType("ExampleScenario.instance")]
     public partial class InstanceComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -665,6 +687,43 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "key":
+            KeyElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "structureType":
+            StructureType = (Hl7.Fhir.Model.Coding)value;
+            return this;
+          case "structureVersion":
+            StructureVersionElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "structureProfile":
+            StructureProfile = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          case "title":
+            TitleElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "description":
+            DescriptionElement = (Hl7.Fhir.Model.Markdown)value;
+            return this;
+          case "content":
+            Content = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          case "version":
+            Version = (List<Hl7.Fhir.Model.ExampleScenario.VersionComponent>)value;
+            return this;
+          case "containedInstance":
+            ContainedInstance = (List<Hl7.Fhir.Model.ExampleScenario.ContainedInstanceComponent>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -690,7 +749,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExampleScenario#Version", IsNestedType=true)]
+    [FhirType("ExampleScenario#Version")]
     [BackboneType("ExampleScenario.instance.version")]
     public partial class VersionComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -906,6 +965,28 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "key":
+            KeyElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "title":
+            TitleElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "description":
+            DescriptionElement = (Hl7.Fhir.Model.Markdown)value;
+            return this;
+          case "content":
+            Content = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -925,7 +1006,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExampleScenario#ContainedInstance", IsNestedType=true)]
+    [FhirType("ExampleScenario#ContainedInstance")]
     [BackboneType("ExampleScenario.instance.containedInstance")]
     public partial class ContainedInstanceComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1080,6 +1161,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "instanceReference":
+            InstanceReferenceElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "versionReference":
+            VersionReferenceElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1098,7 +1195,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExampleScenario#Process", IsNestedType=true)]
+    [FhirType("ExampleScenario#Process")]
     [BackboneType("ExampleScenario.process")]
     public partial class ProcessComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1353,6 +1450,31 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "title":
+            TitleElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "description":
+            DescriptionElement = (Hl7.Fhir.Model.Markdown)value;
+            return this;
+          case "preConditions":
+            PreConditionsElement = (Hl7.Fhir.Model.Markdown)value;
+            return this;
+          case "postConditions":
+            PostConditionsElement = (Hl7.Fhir.Model.Markdown)value;
+            return this;
+          case "step":
+            Step = (List<Hl7.Fhir.Model.ExampleScenario.StepComponent>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1373,7 +1495,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExampleScenario#Step", IsNestedType=true)]
+    [FhirType("ExampleScenario#Step")]
     [BackboneType("ExampleScenario.process.step")]
     public partial class StepComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1630,6 +1752,34 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "number":
+            NumberElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "process":
+            Process = (Hl7.Fhir.Model.ExampleScenario.ProcessComponent)value;
+            return this;
+          case "workflow":
+            WorkflowElement = (Hl7.Fhir.Model.Canonical)value;
+            return this;
+          case "operation":
+            Operation = (Hl7.Fhir.Model.ExampleScenario.OperationComponent)value;
+            return this;
+          case "alternative":
+            Alternative = (List<Hl7.Fhir.Model.ExampleScenario.AlternativeComponent>)value;
+            return this;
+          case "pause":
+            PauseElement = (Hl7.Fhir.Model.FhirBoolean)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1651,7 +1801,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExampleScenario#Operation", IsNestedType=true)]
+    [FhirType("ExampleScenario#Operation")]
     [BackboneType("ExampleScenario.process.step.operation")]
     public partial class OperationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2025,6 +2175,43 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "type":
+            Type = (Hl7.Fhir.Model.Coding)value;
+            return this;
+          case "title":
+            TitleElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "initiator":
+            InitiatorElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "receiver":
+            ReceiverElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "description":
+            DescriptionElement = (Hl7.Fhir.Model.Markdown)value;
+            return this;
+          case "initiatorActive":
+            InitiatorActiveElement = (Hl7.Fhir.Model.FhirBoolean)value;
+            return this;
+          case "receiverActive":
+            ReceiverActiveElement = (Hl7.Fhir.Model.FhirBoolean)value;
+            return this;
+          case "request":
+            Request = (Hl7.Fhir.Model.ExampleScenario.ContainedInstanceComponent)value;
+            return this;
+          case "response":
+            Response = (Hl7.Fhir.Model.ExampleScenario.ContainedInstanceComponent)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -2049,7 +2236,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExampleScenario#Alternative", IsNestedType=true)]
+    [FhirType("ExampleScenario#Alternative")]
     [BackboneType("ExampleScenario.process.step.alternative")]
     public partial class AlternativeComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2226,6 +2413,25 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "title":
+            TitleElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "description":
+            DescriptionElement = (Hl7.Fhir.Model.Markdown)value;
+            return this;
+          case "step":
+            Step = (List<Hl7.Fhir.Model.ExampleScenario.StepComponent>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -2954,6 +3160,76 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "url":
+          UrlElement = (Hl7.Fhir.Model.FhirUri)value;
+          return this;
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "version":
+          VersionElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "versionAlgorithm":
+          VersionAlgorithm = (Hl7.Fhir.Model.DataType)value;
+          return this;
+        case "name":
+          NameElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "title":
+          TitleElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "status":
+          StatusElement = (Code<Hl7.Fhir.Model.PublicationStatus>)value;
+          return this;
+        case "experimental":
+          ExperimentalElement = (Hl7.Fhir.Model.FhirBoolean)value;
+          return this;
+        case "date":
+          DateElement = (Hl7.Fhir.Model.FhirDateTime)value;
+          return this;
+        case "publisher":
+          PublisherElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "contact":
+          Contact = (List<Hl7.Fhir.Model.ContactDetail>)value;
+          return this;
+        case "description":
+          DescriptionElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        case "useContext":
+          UseContext = (List<Hl7.Fhir.Model.UsageContext>)value;
+          return this;
+        case "jurisdiction":
+          Jurisdiction = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "purpose":
+          PurposeElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        case "copyright":
+          CopyrightElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        case "copyrightLabel":
+          CopyrightLabelElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "actor":
+          Actor = (List<Hl7.Fhir.Model.ExampleScenario.ActorComponent>)value;
+          return this;
+        case "instance":
+          Instance = (List<Hl7.Fhir.Model.ExampleScenario.InstanceComponent>)value;
+          return this;
+        case "process":
+          Process = (List<Hl7.Fhir.Model.ExampleScenario.ProcessComponent>)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/ExplanationOfBenefit.cs b/src/Hl7.Fhir.R5/Model/Generated/ExplanationOfBenefit.cs
index 05dd646d92..bb1aa1a95a 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/ExplanationOfBenefit.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/ExplanationOfBenefit.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("ExplanationOfBenefit","http://hl7.org/fhir/StructureDefinition/ExplanationOfBenefit", IsResource=true)]
+  [FhirType("ExplanationOfBenefit","http://hl7.org/fhir/StructureDefinition/ExplanationOfBenefit")]
   public partial class ExplanationOfBenefit : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -102,7 +102,7 @@ public enum ExplanationOfBenefitStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#RelatedClaim", IsNestedType=true)]
+    [FhirType("ExplanationOfBenefit#RelatedClaim")]
     [BackboneType("ExplanationOfBenefit.related")]
     public partial class RelatedClaimComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -244,6 +244,25 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "claim":
+            Claim = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          case "relationship":
+            Relationship = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "reference":
+            Reference = (Hl7.Fhir.Model.Identifier)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -262,7 +281,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#Event", IsNestedType=true)]
+    [FhirType("ExplanationOfBenefit#Event")]
     [BackboneType("ExplanationOfBenefit.event")]
     public partial class EventComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -385,6 +404,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "type":
+            Type = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "when":
+            When = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -403,7 +438,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#Payee", IsNestedType=true)]
+    [FhirType("ExplanationOfBenefit#Payee")]
     [BackboneType("ExplanationOfBenefit.payee")]
     public partial class PayeeComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -524,6 +559,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "type":
+            Type = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "party":
+            Party = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -541,7 +592,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#CareTeam", IsNestedType=true)]
+    [FhirType("ExplanationOfBenefit#CareTeam")]
     [BackboneType("ExplanationOfBenefit.careTeam")]
     public partial class CareTeamComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -764,6 +815,31 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "sequence":
+            SequenceElement = (Hl7.Fhir.Model.PositiveInt)value;
+            return this;
+          case "provider":
+            Provider = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          case "responsible":
+            ResponsibleElement = (Hl7.Fhir.Model.FhirBoolean)value;
+            return this;
+          case "role":
+            Role = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "specialty":
+            Specialty = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -785,7 +861,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#SupportingInformation", IsNestedType=true)]
+    [FhirType("ExplanationOfBenefit#SupportingInformation")]
     [BackboneType("ExplanationOfBenefit.supportingInfo")]
     public partial class SupportingInformationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1015,6 +1091,34 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "sequence":
+            SequenceElement = (Hl7.Fhir.Model.PositiveInt)value;
+            return this;
+          case "category":
+            Category = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "code":
+            Code = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "timing":
+            Timing = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          case "value":
+            Value = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          case "reason":
+            Reason = (Hl7.Fhir.Model.Coding)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1036,7 +1140,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#Diagnosis", IsNestedType=true)]
+    [FhirType("ExplanationOfBenefit#Diagnosis")]
     [BackboneType("ExplanationOfBenefit.diagnosis")]
     public partial class DiagnosisComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1223,6 +1327,28 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "sequence":
+            SequenceElement = (Hl7.Fhir.Model.PositiveInt)value;
+            return this;
+          case "diagnosis":
+            Diagnosis = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          case "type":
+            Type = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+            return this;
+          case "onAdmission":
+            OnAdmission = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1242,7 +1368,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#Procedure", IsNestedType=true)]
+    [FhirType("ExplanationOfBenefit#Procedure")]
     [BackboneType("ExplanationOfBenefit.procedure")]
     public partial class ProcedureComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1470,6 +1596,31 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "sequence":
+            SequenceElement = (Hl7.Fhir.Model.PositiveInt)value;
+            return this;
+          case "type":
+            Type = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+            return this;
+          case "date":
+            DateElement = (Hl7.Fhir.Model.FhirDateTime)value;
+            return this;
+          case "procedure":
+            Procedure = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          case "udi":
+            Udi = (List<Hl7.Fhir.Model.ResourceReference>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1491,7 +1642,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#Insurance", IsNestedType=true)]
+    [FhirType("ExplanationOfBenefit#Insurance")]
     [BackboneType("ExplanationOfBenefit.insurance")]
     public partial class InsuranceComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1671,6 +1822,25 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "focal":
+            FocalElement = (Hl7.Fhir.Model.FhirBoolean)value;
+            return this;
+          case "coverage":
+            Coverage = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          case "preAuthRef":
+            PreAuthRefElement = (List<Hl7.Fhir.Model.FhirString>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1689,7 +1859,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#Accident", IsNestedType=true)]
+    [FhirType("ExplanationOfBenefit#Accident")]
     [BackboneType("ExplanationOfBenefit.accident")]
     public partial class AccidentComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1850,6 +2020,25 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "date":
+            DateElement = (Hl7.Fhir.Model.Date)value;
+            return this;
+          case "type":
+            Type = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "location":
+            Location = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1868,7 +2057,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#Item", IsNestedType=true)]
+    [FhirType("ExplanationOfBenefit#Item")]
     [BackboneType("ExplanationOfBenefit.item")]
     public partial class ItemComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2691,6 +2880,100 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "sequence":
+            SequenceElement = (Hl7.Fhir.Model.PositiveInt)value;
+            return this;
+          case "careTeamSequence":
+            CareTeamSequenceElement = (List<Hl7.Fhir.Model.PositiveInt>)value;
+            return this;
+          case "diagnosisSequence":
+            DiagnosisSequenceElement = (List<Hl7.Fhir.Model.PositiveInt>)value;
+            return this;
+          case "procedureSequence":
+            ProcedureSequenceElement = (List<Hl7.Fhir.Model.PositiveInt>)value;
+            return this;
+          case "informationSequence":
+            InformationSequenceElement = (List<Hl7.Fhir.Model.PositiveInt>)value;
+            return this;
+          case "traceNumber":
+            TraceNumber = (List<Hl7.Fhir.Model.Identifier>)value;
+            return this;
+          case "revenue":
+            Revenue = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "category":
+            Category = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "productOrService":
+            ProductOrService = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "productOrServiceEnd":
+            ProductOrServiceEnd = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "request":
+            Request = (List<Hl7.Fhir.Model.ResourceReference>)value;
+            return this;
+          case "modifier":
+            Modifier = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+            return this;
+          case "programCode":
+            ProgramCode = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+            return this;
+          case "serviced":
+            Serviced = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          case "location":
+            Location = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          case "patientPaid":
+            PatientPaid = (Hl7.Fhir.Model.Money)value;
+            return this;
+          case "quantity":
+            Quantity = (Hl7.Fhir.Model.Quantity)value;
+            return this;
+          case "unitPrice":
+            UnitPrice = (Hl7.Fhir.Model.Money)value;
+            return this;
+          case "factor":
+            FactorElement = (Hl7.Fhir.Model.FhirDecimal)value;
+            return this;
+          case "tax":
+            Tax = (Hl7.Fhir.Model.Money)value;
+            return this;
+          case "net":
+            Net = (Hl7.Fhir.Model.Money)value;
+            return this;
+          case "udi":
+            Udi = (List<Hl7.Fhir.Model.ResourceReference>)value;
+            return this;
+          case "bodySite":
+            BodySite = (List<Hl7.Fhir.Model.ExplanationOfBenefit.ItemBodySiteComponent>)value;
+            return this;
+          case "encounter":
+            Encounter = (List<Hl7.Fhir.Model.ResourceReference>)value;
+            return this;
+          case "noteNumber":
+            NoteNumberElement = (List<Hl7.Fhir.Model.PositiveInt>)value;
+            return this;
+          case "reviewOutcome":
+            ReviewOutcome = (Hl7.Fhir.Model.ExplanationOfBenefit.ReviewOutcomeComponent)value;
+            return this;
+          case "adjudication":
+            Adjudication = (List<Hl7.Fhir.Model.ExplanationOfBenefit.AdjudicationComponent>)value;
+            return this;
+          case "detail":
+            Detail = (List<Hl7.Fhir.Model.ExplanationOfBenefit.DetailComponent>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -2734,7 +3017,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#ItemBodySite", IsNestedType=true)]
+    [FhirType("ExplanationOfBenefit#ItemBodySite")]
     [BackboneType("ExplanationOfBenefit.item.bodySite")]
     public partial class ItemBodySiteComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2856,6 +3139,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "site":
+            Site = (List<Hl7.Fhir.Model.CodeableReference>)value;
+            return this;
+          case "subSite":
+            SubSite = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -2873,7 +3172,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#ReviewOutcome", IsNestedType=true)]
+    [FhirType("ExplanationOfBenefit#ReviewOutcome")]
     [BackboneType("ExplanationOfBenefit.item.reviewOutcome")]
     public partial class ReviewOutcomeComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -3054,6 +3353,28 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "decision":
+            Decision = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "reason":
+            Reason = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+            return this;
+          case "preAuthRef":
+            PreAuthRefElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "preAuthPeriod":
+            PreAuthPeriod = (Hl7.Fhir.Model.Period)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -3073,7 +3394,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#Adjudication", IsNestedType=true)]
+    [FhirType("ExplanationOfBenefit#Adjudication")]
     [BackboneType("ExplanationOfBenefit.item.adjudication")]
     public partial class AdjudicationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -3236,6 +3557,28 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "category":
+            Category = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "reason":
+            Reason = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "amount":
+            Amount = (Hl7.Fhir.Model.Money)value;
+            return this;
+          case "quantity":
+            Quantity = (Hl7.Fhir.Model.Quantity)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -3255,7 +3598,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#Detail", IsNestedType=true)]
+    [FhirType("ExplanationOfBenefit#Detail")]
     [BackboneType("ExplanationOfBenefit.item.detail")]
     public partial class DetailComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -3800,6 +4143,73 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "sequence":
+            SequenceElement = (Hl7.Fhir.Model.PositiveInt)value;
+            return this;
+          case "traceNumber":
+            TraceNumber = (List<Hl7.Fhir.Model.Identifier>)value;
+            return this;
+          case "revenue":
+            Revenue = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "category":
+            Category = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "productOrService":
+            ProductOrService = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "productOrServiceEnd":
+            ProductOrServiceEnd = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "modifier":
+            Modifier = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+            return this;
+          case "programCode":
+            ProgramCode = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+            return this;
+          case "patientPaid":
+            PatientPaid = (Hl7.Fhir.Model.Money)value;
+            return this;
+          case "quantity":
+            Quantity = (Hl7.Fhir.Model.Quantity)value;
+            return this;
+          case "unitPrice":
+            UnitPrice = (Hl7.Fhir.Model.Money)value;
+            return this;
+          case "factor":
+            FactorElement = (Hl7.Fhir.Model.FhirDecimal)value;
+            return this;
+          case "tax":
+            Tax = (Hl7.Fhir.Model.Money)value;
+            return this;
+          case "net":
+            Net = (Hl7.Fhir.Model.Money)value;
+            return this;
+          case "udi":
+            Udi = (List<Hl7.Fhir.Model.ResourceReference>)value;
+            return this;
+          case "noteNumber":
+            NoteNumberElement = (List<Hl7.Fhir.Model.PositiveInt>)value;
+            return this;
+          case "reviewOutcome":
+            ReviewOutcome = (Hl7.Fhir.Model.ExplanationOfBenefit.ReviewOutcomeComponent)value;
+            return this;
+          case "adjudication":
+            Adjudication = (List<Hl7.Fhir.Model.ExplanationOfBenefit.AdjudicationComponent>)value;
+            return this;
+          case "subDetail":
+            SubDetail = (List<Hl7.Fhir.Model.ExplanationOfBenefit.SubDetailComponent>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -3834,7 +4244,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#SubDetail", IsNestedType=true)]
+    [FhirType("ExplanationOfBenefit#SubDetail")]
     [BackboneType("ExplanationOfBenefit.item.detail.subDetail")]
     public partial class SubDetailComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -4357,6 +4767,70 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "sequence":
+            SequenceElement = (Hl7.Fhir.Model.PositiveInt)value;
+            return this;
+          case "traceNumber":
+            TraceNumber = (List<Hl7.Fhir.Model.Identifier>)value;
+            return this;
+          case "revenue":
+            Revenue = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "category":
+            Category = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "productOrService":
+            ProductOrService = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "productOrServiceEnd":
+            ProductOrServiceEnd = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "modifier":
+            Modifier = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+            return this;
+          case "programCode":
+            ProgramCode = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+            return this;
+          case "patientPaid":
+            PatientPaid = (Hl7.Fhir.Model.Money)value;
+            return this;
+          case "quantity":
+            Quantity = (Hl7.Fhir.Model.Quantity)value;
+            return this;
+          case "unitPrice":
+            UnitPrice = (Hl7.Fhir.Model.Money)value;
+            return this;
+          case "factor":
+            FactorElement = (Hl7.Fhir.Model.FhirDecimal)value;
+            return this;
+          case "tax":
+            Tax = (Hl7.Fhir.Model.Money)value;
+            return this;
+          case "net":
+            Net = (Hl7.Fhir.Model.Money)value;
+            return this;
+          case "udi":
+            Udi = (List<Hl7.Fhir.Model.ResourceReference>)value;
+            return this;
+          case "noteNumber":
+            NoteNumberElement = (List<Hl7.Fhir.Model.PositiveInt>)value;
+            return this;
+          case "reviewOutcome":
+            ReviewOutcome = (Hl7.Fhir.Model.ExplanationOfBenefit.ReviewOutcomeComponent)value;
+            return this;
+          case "adjudication":
+            Adjudication = (List<Hl7.Fhir.Model.ExplanationOfBenefit.AdjudicationComponent>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -4390,7 +4864,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#AddedItem", IsNestedType=true)]
+    [FhirType("ExplanationOfBenefit#AddedItem")]
     [BackboneType("ExplanationOfBenefit.addItem")]
     public partial class AddedItemComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -5087,6 +5561,88 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "itemSequence":
+            ItemSequenceElement = (List<Hl7.Fhir.Model.PositiveInt>)value;
+            return this;
+          case "detailSequence":
+            DetailSequenceElement = (List<Hl7.Fhir.Model.PositiveInt>)value;
+            return this;
+          case "subDetailSequence":
+            SubDetailSequenceElement = (List<Hl7.Fhir.Model.PositiveInt>)value;
+            return this;
+          case "traceNumber":
+            TraceNumber = (List<Hl7.Fhir.Model.Identifier>)value;
+            return this;
+          case "provider":
+            Provider = (List<Hl7.Fhir.Model.ResourceReference>)value;
+            return this;
+          case "revenue":
+            Revenue = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "productOrService":
+            ProductOrService = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "productOrServiceEnd":
+            ProductOrServiceEnd = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "request":
+            Request = (List<Hl7.Fhir.Model.ResourceReference>)value;
+            return this;
+          case "modifier":
+            Modifier = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+            return this;
+          case "programCode":
+            ProgramCode = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+            return this;
+          case "serviced":
+            Serviced = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          case "location":
+            Location = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          case "patientPaid":
+            PatientPaid = (Hl7.Fhir.Model.Money)value;
+            return this;
+          case "quantity":
+            Quantity = (Hl7.Fhir.Model.Quantity)value;
+            return this;
+          case "unitPrice":
+            UnitPrice = (Hl7.Fhir.Model.Money)value;
+            return this;
+          case "factor":
+            FactorElement = (Hl7.Fhir.Model.FhirDecimal)value;
+            return this;
+          case "tax":
+            Tax = (Hl7.Fhir.Model.Money)value;
+            return this;
+          case "net":
+            Net = (Hl7.Fhir.Model.Money)value;
+            return this;
+          case "bodySite":
+            BodySite = (List<Hl7.Fhir.Model.ExplanationOfBenefit.AddedItemBodySiteComponent>)value;
+            return this;
+          case "noteNumber":
+            NoteNumberElement = (List<Hl7.Fhir.Model.PositiveInt>)value;
+            return this;
+          case "reviewOutcome":
+            ReviewOutcome = (Hl7.Fhir.Model.ExplanationOfBenefit.ReviewOutcomeComponent)value;
+            return this;
+          case "adjudication":
+            Adjudication = (List<Hl7.Fhir.Model.ExplanationOfBenefit.AdjudicationComponent>)value;
+            return this;
+          case "detail":
+            Detail = (List<Hl7.Fhir.Model.ExplanationOfBenefit.AddedItemDetailComponent>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -5126,7 +5682,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#AddedItemBodySite", IsNestedType=true)]
+    [FhirType("ExplanationOfBenefit#AddedItemBodySite")]
     [BackboneType("ExplanationOfBenefit.addItem.bodySite")]
     public partial class AddedItemBodySiteComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -5248,6 +5804,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "site":
+            Site = (List<Hl7.Fhir.Model.CodeableReference>)value;
+            return this;
+          case "subSite":
+            SubSite = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -5265,7 +5837,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#AddedItemDetail", IsNestedType=true)]
+    [FhirType("ExplanationOfBenefit#AddedItemDetail")]
     [BackboneType("ExplanationOfBenefit.addItem.detail")]
     public partial class AddedItemDetailComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -5701,6 +6273,61 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "traceNumber":
+            TraceNumber = (List<Hl7.Fhir.Model.Identifier>)value;
+            return this;
+          case "revenue":
+            Revenue = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "productOrService":
+            ProductOrService = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "productOrServiceEnd":
+            ProductOrServiceEnd = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "modifier":
+            Modifier = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+            return this;
+          case "patientPaid":
+            PatientPaid = (Hl7.Fhir.Model.Money)value;
+            return this;
+          case "quantity":
+            Quantity = (Hl7.Fhir.Model.Quantity)value;
+            return this;
+          case "unitPrice":
+            UnitPrice = (Hl7.Fhir.Model.Money)value;
+            return this;
+          case "factor":
+            FactorElement = (Hl7.Fhir.Model.FhirDecimal)value;
+            return this;
+          case "tax":
+            Tax = (Hl7.Fhir.Model.Money)value;
+            return this;
+          case "net":
+            Net = (Hl7.Fhir.Model.Money)value;
+            return this;
+          case "noteNumber":
+            NoteNumberElement = (List<Hl7.Fhir.Model.PositiveInt>)value;
+            return this;
+          case "reviewOutcome":
+            ReviewOutcome = (Hl7.Fhir.Model.ExplanationOfBenefit.ReviewOutcomeComponent)value;
+            return this;
+          case "adjudication":
+            Adjudication = (List<Hl7.Fhir.Model.ExplanationOfBenefit.AdjudicationComponent>)value;
+            return this;
+          case "subDetail":
+            SubDetail = (List<Hl7.Fhir.Model.ExplanationOfBenefit.AddedItemDetailSubDetailComponent>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -5731,7 +6358,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#AddedItemDetailSubDetail", IsNestedType=true)]
+    [FhirType("ExplanationOfBenefit#AddedItemDetailSubDetail")]
     [BackboneType("ExplanationOfBenefit.addItem.detail.subDetail")]
     public partial class AddedItemDetailSubDetailComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -6145,6 +6772,58 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "traceNumber":
+            TraceNumber = (List<Hl7.Fhir.Model.Identifier>)value;
+            return this;
+          case "revenue":
+            Revenue = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "productOrService":
+            ProductOrService = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "productOrServiceEnd":
+            ProductOrServiceEnd = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "modifier":
+            Modifier = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+            return this;
+          case "patientPaid":
+            PatientPaid = (Hl7.Fhir.Model.Money)value;
+            return this;
+          case "quantity":
+            Quantity = (Hl7.Fhir.Model.Quantity)value;
+            return this;
+          case "unitPrice":
+            UnitPrice = (Hl7.Fhir.Model.Money)value;
+            return this;
+          case "factor":
+            FactorElement = (Hl7.Fhir.Model.FhirDecimal)value;
+            return this;
+          case "tax":
+            Tax = (Hl7.Fhir.Model.Money)value;
+            return this;
+          case "net":
+            Net = (Hl7.Fhir.Model.Money)value;
+            return this;
+          case "noteNumber":
+            NoteNumberElement = (List<Hl7.Fhir.Model.PositiveInt>)value;
+            return this;
+          case "reviewOutcome":
+            ReviewOutcome = (Hl7.Fhir.Model.ExplanationOfBenefit.ReviewOutcomeComponent)value;
+            return this;
+          case "adjudication":
+            Adjudication = (List<Hl7.Fhir.Model.ExplanationOfBenefit.AdjudicationComponent>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -6175,7 +6854,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#Total", IsNestedType=true)]
+    [FhirType("ExplanationOfBenefit#Total")]
     [BackboneType("ExplanationOfBenefit.total")]
     public partial class TotalComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -6296,6 +6975,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "category":
+            Category = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "amount":
+            Amount = (Hl7.Fhir.Model.Money)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -6313,7 +7008,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#Payment", IsNestedType=true)]
+    [FhirType("ExplanationOfBenefit#Payment")]
     [BackboneType("ExplanationOfBenefit.payment")]
     public partial class PaymentComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -6535,6 +7230,34 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "type":
+            Type = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "adjustment":
+            Adjustment = (Hl7.Fhir.Model.Money)value;
+            return this;
+          case "adjustmentReason":
+            AdjustmentReason = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "date":
+            DateElement = (Hl7.Fhir.Model.Date)value;
+            return this;
+          case "amount":
+            Amount = (Hl7.Fhir.Model.Money)value;
+            return this;
+          case "identifier":
+            Identifier = (Hl7.Fhir.Model.Identifier)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -6556,7 +7279,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#Note", IsNestedType=true)]
+    [FhirType("ExplanationOfBenefit#Note")]
     [BackboneType("ExplanationOfBenefit.processNote")]
     public partial class NoteComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -6754,6 +7477,28 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "number":
+            NumberElement = (Hl7.Fhir.Model.PositiveInt)value;
+            return this;
+          case "type":
+            Type = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "text":
+            TextElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "language":
+            Language = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -6770,7 +7515,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#BenefitBalance", IsNestedType=true)]
+    [FhirType("ExplanationOfBenefit#BenefitBalance")]
     [BackboneType("ExplanationOfBenefit.benefitBalance")]
     public partial class BenefitBalanceComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -7074,6 +7819,40 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "category":
+            Category = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "excluded":
+            ExcludedElement = (Hl7.Fhir.Model.FhirBoolean)value;
+            return this;
+          case "name":
+            NameElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "description":
+            DescriptionElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "network":
+            Network = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "unit":
+            Unit = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "term":
+            Term = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "financial":
+            Financial = (List<Hl7.Fhir.Model.ExplanationOfBenefit.BenefitComponent>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -7097,7 +7876,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#Benefit", IsNestedType=true)]
+    [FhirType("ExplanationOfBenefit#Benefit")]
     [BackboneType("ExplanationOfBenefit.benefitBalance.financial")]
     public partial class BenefitComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -7242,6 +8021,25 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "type":
+            Type = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "allowed":
+            Allowed = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          case "used":
+            Used = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -8536,6 +9334,163 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "traceNumber":
+          TraceNumber = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "status":
+          StatusElement = (Code<Hl7.Fhir.Model.ExplanationOfBenefit.ExplanationOfBenefitStatus>)value;
+          return this;
+        case "type":
+          Type = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "subType":
+          SubType = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "use":
+          UseElement = (Code<Hl7.Fhir.Model.ClaimUseCode>)value;
+          return this;
+        case "patient":
+          Patient = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "billablePeriod":
+          BillablePeriod = (Hl7.Fhir.Model.Period)value;
+          return this;
+        case "created":
+          CreatedElement = (Hl7.Fhir.Model.FhirDateTime)value;
+          return this;
+        case "enterer":
+          Enterer = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "insurer":
+          Insurer = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "provider":
+          Provider = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "priority":
+          Priority = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "fundsReserveRequested":
+          FundsReserveRequested = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "fundsReserve":
+          FundsReserve = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "related":
+          Related = (List<Hl7.Fhir.Model.ExplanationOfBenefit.RelatedClaimComponent>)value;
+          return this;
+        case "prescription":
+          Prescription = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "originalPrescription":
+          OriginalPrescription = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "event":
+          Event = (List<Hl7.Fhir.Model.ExplanationOfBenefit.EventComponent>)value;
+          return this;
+        case "payee":
+          Payee = (Hl7.Fhir.Model.ExplanationOfBenefit.PayeeComponent)value;
+          return this;
+        case "referral":
+          Referral = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "encounter":
+          Encounter = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "facility":
+          Facility = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "claim":
+          Claim = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "claimResponse":
+          ClaimResponse = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "outcome":
+          OutcomeElement = (Code<Hl7.Fhir.Model.ClaimProcessingCodes>)value;
+          return this;
+        case "decision":
+          Decision = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "disposition":
+          DispositionElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "preAuthRef":
+          PreAuthRefElement = (List<Hl7.Fhir.Model.FhirString>)value;
+          return this;
+        case "preAuthRefPeriod":
+          PreAuthRefPeriod = (List<Hl7.Fhir.Model.Period>)value;
+          return this;
+        case "diagnosisRelatedGroup":
+          DiagnosisRelatedGroup = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "careTeam":
+          CareTeam = (List<Hl7.Fhir.Model.ExplanationOfBenefit.CareTeamComponent>)value;
+          return this;
+        case "supportingInfo":
+          SupportingInfo = (List<Hl7.Fhir.Model.ExplanationOfBenefit.SupportingInformationComponent>)value;
+          return this;
+        case "diagnosis":
+          Diagnosis = (List<Hl7.Fhir.Model.ExplanationOfBenefit.DiagnosisComponent>)value;
+          return this;
+        case "procedure":
+          Procedure = (List<Hl7.Fhir.Model.ExplanationOfBenefit.ProcedureComponent>)value;
+          return this;
+        case "precedence":
+          PrecedenceElement = (Hl7.Fhir.Model.PositiveInt)value;
+          return this;
+        case "insurance":
+          Insurance = (List<Hl7.Fhir.Model.ExplanationOfBenefit.InsuranceComponent>)value;
+          return this;
+        case "accident":
+          Accident = (Hl7.Fhir.Model.ExplanationOfBenefit.AccidentComponent)value;
+          return this;
+        case "patientPaid":
+          PatientPaid = (Hl7.Fhir.Model.Money)value;
+          return this;
+        case "item":
+          Item = (List<Hl7.Fhir.Model.ExplanationOfBenefit.ItemComponent>)value;
+          return this;
+        case "addItem":
+          AddItem = (List<Hl7.Fhir.Model.ExplanationOfBenefit.AddedItemComponent>)value;
+          return this;
+        case "adjudication":
+          Adjudication = (List<Hl7.Fhir.Model.ExplanationOfBenefit.AdjudicationComponent>)value;
+          return this;
+        case "total":
+          Total = (List<Hl7.Fhir.Model.ExplanationOfBenefit.TotalComponent>)value;
+          return this;
+        case "payment":
+          Payment = (Hl7.Fhir.Model.ExplanationOfBenefit.PaymentComponent)value;
+          return this;
+        case "formCode":
+          FormCode = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "form":
+          Form = (Hl7.Fhir.Model.Attachment)value;
+          return this;
+        case "processNote":
+          ProcessNote = (List<Hl7.Fhir.Model.ExplanationOfBenefit.NoteComponent>)value;
+          return this;
+        case "benefitPeriod":
+          BenefitPeriod = (Hl7.Fhir.Model.Period)value;
+          return this;
+        case "benefitBalance":
+          BenefitBalance = (List<Hl7.Fhir.Model.ExplanationOfBenefit.BenefitBalanceComponent>)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/Expression.cs b/src/Hl7.Fhir.R5/Model/Generated/Expression.cs
index bde6c46024..7c789c6a44 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/Expression.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/Expression.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -322,6 +322,31 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "description":
+          DescriptionElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "name":
+          NameElement = (Hl7.Fhir.Model.Code)value;
+          return this;
+        case "language":
+          LanguageElement = (Hl7.Fhir.Model.Code)value;
+          return this;
+        case "expression":
+          ExpressionElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "reference":
+          ReferenceElement = (Hl7.Fhir.Model.FhirUri)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/ExtendedContactDetail.cs b/src/Hl7.Fhir.R5/Model/Generated/ExtendedContactDetail.cs
index 9983e6e2af..e74a7d7daf 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/ExtendedContactDetail.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/ExtendedContactDetail.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -258,6 +258,34 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "purpose":
+          Purpose = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "name":
+          Name = (List<Hl7.Fhir.Model.HumanName>)value;
+          return this;
+        case "telecom":
+          Telecom = (List<Hl7.Fhir.Model.ContactPoint>)value;
+          return this;
+        case "address":
+          Address = (Hl7.Fhir.Model.Address)value;
+          return this;
+        case "organization":
+          Organization = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "period":
+          Period = (Hl7.Fhir.Model.Period)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/FamilyMemberHistory.cs b/src/Hl7.Fhir.R5/Model/Generated/FamilyMemberHistory.cs
index 0606045fee..5f58d4bbbd 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/FamilyMemberHistory.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/FamilyMemberHistory.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("FamilyMemberHistory","http://hl7.org/fhir/StructureDefinition/FamilyMemberHistory", IsResource=true)]
+  [FhirType("FamilyMemberHistory","http://hl7.org/fhir/StructureDefinition/FamilyMemberHistory")]
   public partial class FamilyMemberHistory : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -101,7 +101,7 @@ public enum FamilyHistoryStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("FamilyMemberHistory#Participant", IsNestedType=true)]
+    [FhirType("FamilyMemberHistory#Participant")]
     [BackboneType("FamilyMemberHistory.participant")]
     public partial class ParticipantComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -223,6 +223,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "function":
+            Function = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "actor":
+            Actor = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -240,7 +256,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("FamilyMemberHistory#Condition", IsNestedType=true)]
+    [FhirType("FamilyMemberHistory#Condition")]
     [BackboneType("FamilyMemberHistory.condition")]
     public partial class ConditionComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -445,6 +461,31 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "code":
+            Code = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "outcome":
+            Outcome = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "contributedToDeath":
+            ContributedToDeathElement = (Hl7.Fhir.Model.FhirBoolean)value;
+            return this;
+          case "onset":
+            Onset = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          case "note":
+            Note = (List<Hl7.Fhir.Model.Annotation>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -465,7 +506,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("FamilyMemberHistory#Procedure", IsNestedType=true)]
+    [FhirType("FamilyMemberHistory#Procedure")]
     [BackboneType("FamilyMemberHistory.procedure")]
     public partial class ProcedureComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -670,6 +711,31 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "code":
+            Code = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "outcome":
+            Outcome = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "contributedToDeath":
+            ContributedToDeathElement = (Hl7.Fhir.Model.FhirBoolean)value;
+            return this;
+          case "performed":
+            Performed = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          case "note":
+            Note = (List<Hl7.Fhir.Model.Annotation>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1283,6 +1349,73 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "instantiatesCanonical":
+          InstantiatesCanonicalElement = (List<Hl7.Fhir.Model.Canonical>)value;
+          return this;
+        case "instantiatesUri":
+          InstantiatesUriElement = (List<Hl7.Fhir.Model.FhirUri>)value;
+          return this;
+        case "status":
+          StatusElement = (Code<Hl7.Fhir.Model.FamilyMemberHistory.FamilyHistoryStatus>)value;
+          return this;
+        case "dataAbsentReason":
+          DataAbsentReason = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "patient":
+          Patient = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "date":
+          DateElement = (Hl7.Fhir.Model.FhirDateTime)value;
+          return this;
+        case "participant":
+          Participant = (List<Hl7.Fhir.Model.FamilyMemberHistory.ParticipantComponent>)value;
+          return this;
+        case "name":
+          NameElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "relationship":
+          Relationship = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "sex":
+          Sex = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "born":
+          Born = (Hl7.Fhir.Model.DataType)value;
+          return this;
+        case "age":
+          Age = (Hl7.Fhir.Model.DataType)value;
+          return this;
+        case "estimatedAge":
+          EstimatedAgeElement = (Hl7.Fhir.Model.FhirBoolean)value;
+          return this;
+        case "deceased":
+          Deceased = (Hl7.Fhir.Model.DataType)value;
+          return this;
+        case "reason":
+          Reason = (List<Hl7.Fhir.Model.CodeableReference>)value;
+          return this;
+        case "note":
+          Note = (List<Hl7.Fhir.Model.Annotation>)value;
+          return this;
+        case "condition":
+          Condition = (List<Hl7.Fhir.Model.FamilyMemberHistory.ConditionComponent>)value;
+          return this;
+        case "procedure":
+          Procedure = (List<Hl7.Fhir.Model.FamilyMemberHistory.ProcedureComponent>)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/Flag.cs b/src/Hl7.Fhir.R5/Model/Generated/Flag.cs
index d567674fa0..b8df1620ab 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/Flag.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/Flag.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Flag","http://hl7.org/fhir/StructureDefinition/Flag", IsResource=true)]
+  [FhirType("Flag","http://hl7.org/fhir/StructureDefinition/Flag")]
   public partial class Flag : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -357,6 +357,40 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "status":
+          StatusElement = (Code<Hl7.Fhir.Model.Flag.FlagStatus>)value;
+          return this;
+        case "category":
+          Category = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "code":
+          Code = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "subject":
+          Subject = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "period":
+          Period = (Hl7.Fhir.Model.Period)value;
+          return this;
+        case "encounter":
+          Encounter = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "author":
+          Author = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/FormularyItem.cs b/src/Hl7.Fhir.R5/Model/Generated/FormularyItem.cs
index 2d30958c49..f86a0828bf 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/FormularyItem.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/FormularyItem.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("FormularyItem","http://hl7.org/fhir/StructureDefinition/FormularyItem", IsResource=true)]
+  [FhirType("FormularyItem","http://hl7.org/fhir/StructureDefinition/FormularyItem")]
   public partial class FormularyItem : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -241,6 +241,25 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "code":
+          Code = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "status":
+          StatusElement = (Code<Hl7.Fhir.Model.FormularyItem.FormularyItemStatusCodes>)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/GenomicStudy.cs b/src/Hl7.Fhir.R5/Model/Generated/GenomicStudy.cs
index 6bd6a57e6b..dab3012389 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/GenomicStudy.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/GenomicStudy.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("GenomicStudy","http://hl7.org/fhir/StructureDefinition/GenomicStudy", IsResource=true)]
+  [FhirType("GenomicStudy","http://hl7.org/fhir/StructureDefinition/GenomicStudy")]
   public partial class GenomicStudy : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -107,7 +107,7 @@ public enum GenomicStudyStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("GenomicStudy#Analysis", IsNestedType=true)]
+    [FhirType("GenomicStudy#Analysis")]
     [BackboneType("GenomicStudy.analysis")]
     public partial class AnalysisComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -658,6 +658,70 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "identifier":
+            Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+            return this;
+          case "methodType":
+            MethodType = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+            return this;
+          case "changeType":
+            ChangeType = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+            return this;
+          case "genomeBuild":
+            GenomeBuild = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "instantiatesCanonical":
+            InstantiatesCanonicalElement = (Hl7.Fhir.Model.Canonical)value;
+            return this;
+          case "instantiatesUri":
+            InstantiatesUriElement = (Hl7.Fhir.Model.FhirUri)value;
+            return this;
+          case "title":
+            TitleElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "focus":
+            Focus = (List<Hl7.Fhir.Model.ResourceReference>)value;
+            return this;
+          case "specimen":
+            Specimen = (List<Hl7.Fhir.Model.ResourceReference>)value;
+            return this;
+          case "date":
+            DateElement = (Hl7.Fhir.Model.FhirDateTime)value;
+            return this;
+          case "note":
+            Note = (List<Hl7.Fhir.Model.Annotation>)value;
+            return this;
+          case "protocolPerformed":
+            ProtocolPerformed = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          case "regionsStudied":
+            RegionsStudied = (List<Hl7.Fhir.Model.ResourceReference>)value;
+            return this;
+          case "regionsCalled":
+            RegionsCalled = (List<Hl7.Fhir.Model.ResourceReference>)value;
+            return this;
+          case "input":
+            Input = (List<Hl7.Fhir.Model.GenomicStudy.InputComponent>)value;
+            return this;
+          case "output":
+            Output = (List<Hl7.Fhir.Model.GenomicStudy.OutputComponent>)value;
+            return this;
+          case "performer":
+            Performer = (List<Hl7.Fhir.Model.GenomicStudy.PerformerComponent>)value;
+            return this;
+          case "device":
+            Device = (List<Hl7.Fhir.Model.GenomicStudy.DeviceComponent>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -688,7 +752,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("GenomicStudy#Input", IsNestedType=true)]
+    [FhirType("GenomicStudy#Input")]
     [BackboneType("GenomicStudy.analysis.input")]
     public partial class InputComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -833,6 +897,25 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "file":
+            File = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          case "type":
+            Type = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "generatedBy":
+            GeneratedBy = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -848,7 +931,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("GenomicStudy#Output", IsNestedType=true)]
+    [FhirType("GenomicStudy#Output")]
     [BackboneType("GenomicStudy.analysis.output")]
     public partial class OutputComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -969,6 +1052,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "file":
+            File = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          case "type":
+            Type = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -983,7 +1082,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("GenomicStudy#Performer", IsNestedType=true)]
+    [FhirType("GenomicStudy#Performer")]
     [BackboneType("GenomicStudy.analysis.performer")]
     public partial class PerformerComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1103,6 +1202,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "actor":
+            Actor = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          case "role":
+            Role = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1117,7 +1232,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("GenomicStudy#Device", IsNestedType=true)]
+    [FhirType("GenomicStudy#Device")]
     [BackboneType("GenomicStudy.analysis.device")]
     public partial class DeviceComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1237,6 +1352,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "device":
+            Device = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          case "function":
+            Function = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1742,6 +1873,61 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "status":
+          StatusElement = (Code<Hl7.Fhir.Model.GenomicStudy.GenomicStudyStatus>)value;
+          return this;
+        case "type":
+          Type = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "subject":
+          Subject = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "encounter":
+          Encounter = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "startDate":
+          StartDateElement = (Hl7.Fhir.Model.FhirDateTime)value;
+          return this;
+        case "basedOn":
+          BasedOn = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "referrer":
+          Referrer = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "interpreter":
+          Interpreter = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "reason":
+          Reason = (List<Hl7.Fhir.Model.CodeableReference>)value;
+          return this;
+        case "instantiatesCanonical":
+          InstantiatesCanonicalElement = (Hl7.Fhir.Model.Canonical)value;
+          return this;
+        case "instantiatesUri":
+          InstantiatesUriElement = (Hl7.Fhir.Model.FhirUri)value;
+          return this;
+        case "note":
+          Note = (List<Hl7.Fhir.Model.Annotation>)value;
+          return this;
+        case "description":
+          DescriptionElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        case "analysis":
+          Analysis = (List<Hl7.Fhir.Model.GenomicStudy.AnalysisComponent>)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/Goal.cs b/src/Hl7.Fhir.R5/Model/Generated/Goal.cs
index b97cf08c0b..93b5a5acf7 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/Goal.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/Goal.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Goal","http://hl7.org/fhir/StructureDefinition/Goal", IsResource=true)]
+  [FhirType("Goal","http://hl7.org/fhir/StructureDefinition/Goal")]
   public partial class Goal : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -133,7 +133,7 @@ public enum GoalLifecycleStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Goal#Target", IsNestedType=true)]
+    [FhirType("Goal#Target")]
     [BackboneType("Goal.target")]
     public partial class TargetComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -278,6 +278,25 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "measure":
+            Measure = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "detail":
+            Detail = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          case "due":
+            Due = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -790,6 +809,64 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "lifecycleStatus":
+          LifecycleStatusElement = (Code<Hl7.Fhir.Model.Goal.GoalLifecycleStatus>)value;
+          return this;
+        case "achievementStatus":
+          AchievementStatus = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "category":
+          Category = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "continuous":
+          ContinuousElement = (Hl7.Fhir.Model.FhirBoolean)value;
+          return this;
+        case "priority":
+          Priority = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "description":
+          Description = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "subject":
+          Subject = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "start":
+          Start = (Hl7.Fhir.Model.DataType)value;
+          return this;
+        case "target":
+          Target = (List<Hl7.Fhir.Model.Goal.TargetComponent>)value;
+          return this;
+        case "statusDate":
+          StatusDateElement = (Hl7.Fhir.Model.Date)value;
+          return this;
+        case "statusReason":
+          StatusReasonElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "source":
+          Source = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "addresses":
+          Addresses = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "note":
+          Note = (List<Hl7.Fhir.Model.Annotation>)value;
+          return this;
+        case "outcome":
+          Outcome = (List<Hl7.Fhir.Model.CodeableReference>)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/GraphDefinition.cs b/src/Hl7.Fhir.R5/Model/Generated/GraphDefinition.cs
index a3f09f859d..c0c0902bdb 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/GraphDefinition.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/GraphDefinition.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("GraphDefinition","http://hl7.org/fhir/StructureDefinition/GraphDefinition", IsResource=true)]
+  [FhirType("GraphDefinition","http://hl7.org/fhir/StructureDefinition/GraphDefinition")]
   public partial class GraphDefinition : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -120,7 +120,7 @@ public enum GraphCompartmentRule
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("GraphDefinition#Node", IsNestedType=true)]
+    [FhirType("GraphDefinition#Node")]
     [BackboneType("GraphDefinition.node")]
     public partial class NodeComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -356,6 +356,28 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "nodeId":
+            NodeIdElement = (Hl7.Fhir.Model.Id)value;
+            return this;
+          case "description":
+            DescriptionElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "type":
+            TypeElement = (Code<Hl7.Fhir.Model.VersionIndependentResourceTypesAll>)value;
+            return this;
+          case "profile":
+            ProfileElement = (Hl7.Fhir.Model.Canonical)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -372,7 +394,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("GraphDefinition#Link", IsNestedType=true)]
+    [FhirType("GraphDefinition#Link")]
     [BackboneType("GraphDefinition.link")]
     public partial class LinkComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -784,6 +806,43 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "description":
+            DescriptionElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "min":
+            MinElement = (Hl7.Fhir.Model.Integer)value;
+            return this;
+          case "max":
+            MaxElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "sourceId":
+            SourceIdElement = (Hl7.Fhir.Model.Id)value;
+            return this;
+          case "path":
+            PathElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "sliceName":
+            SliceNameElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "targetId":
+            TargetIdElement = (Hl7.Fhir.Model.Id)value;
+            return this;
+          case "params":
+            ParamsElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "compartment":
+            Compartment = (List<Hl7.Fhir.Model.GraphDefinition.CompartmentComponent>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -805,7 +864,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("GraphDefinition#Compartment", IsNestedType=true)]
+    [FhirType("GraphDefinition#Compartment")]
     [BackboneType("GraphDefinition.link.compartment")]
     public partial class CompartmentComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1085,6 +1144,31 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "use":
+            UseElement = (Code<Hl7.Fhir.Model.GraphDefinition.GraphCompartmentUse>)value;
+            return this;
+          case "rule":
+            RuleElement = (Code<Hl7.Fhir.Model.GraphDefinition.GraphCompartmentRule>)value;
+            return this;
+          case "code":
+            CodeElement = (Code<Hl7.Fhir.Model.CompartmentType>)value;
+            return this;
+          case "expression":
+            ExpressionElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "description":
+            DescriptionElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1834,6 +1918,76 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "url":
+          UrlElement = (Hl7.Fhir.Model.FhirUri)value;
+          return this;
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "version":
+          VersionElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "versionAlgorithm":
+          VersionAlgorithm = (Hl7.Fhir.Model.DataType)value;
+          return this;
+        case "name":
+          NameElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "title":
+          TitleElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "status":
+          StatusElement = (Code<Hl7.Fhir.Model.PublicationStatus>)value;
+          return this;
+        case "experimental":
+          ExperimentalElement = (Hl7.Fhir.Model.FhirBoolean)value;
+          return this;
+        case "date":
+          DateElement = (Hl7.Fhir.Model.FhirDateTime)value;
+          return this;
+        case "publisher":
+          PublisherElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "contact":
+          Contact = (List<Hl7.Fhir.Model.ContactDetail>)value;
+          return this;
+        case "description":
+          DescriptionElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        case "useContext":
+          UseContext = (List<Hl7.Fhir.Model.UsageContext>)value;
+          return this;
+        case "jurisdiction":
+          Jurisdiction = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "purpose":
+          PurposeElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        case "copyright":
+          CopyrightElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        case "copyrightLabel":
+          CopyrightLabelElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "start":
+          StartElement = (Hl7.Fhir.Model.Id)value;
+          return this;
+        case "node":
+          Node = (List<Hl7.Fhir.Model.GraphDefinition.NodeComponent>)value;
+          return this;
+        case "link":
+          Link = (List<Hl7.Fhir.Model.GraphDefinition.LinkComponent>)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/Group.cs b/src/Hl7.Fhir.R5/Model/Generated/Group.cs
index cbb32fc209..2307147cca 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/Group.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/Group.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Group","http://hl7.org/fhir/StructureDefinition/Group", IsResource=true)]
+  [FhirType("Group","http://hl7.org/fhir/StructureDefinition/Group")]
   public partial class Group : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -161,7 +161,7 @@ public enum GroupMembershipBasis
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Group#Characteristic", IsNestedType=true)]
+    [FhirType("Group#Characteristic")]
     [BackboneType("Group.characteristic")]
     public partial class CharacteristicComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -346,6 +346,28 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "code":
+            Code = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "value":
+            Value = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          case "exclude":
+            ExcludeElement = (Hl7.Fhir.Model.FhirBoolean)value;
+            return this;
+          case "period":
+            Period = (Hl7.Fhir.Model.Period)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -365,7 +387,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Group#Member", IsNestedType=true)]
+    [FhirType("Group#Member")]
     [BackboneType("Group.member")]
     public partial class MemberComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -525,6 +547,25 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "entity":
+            Entity = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          case "period":
+            Period = (Hl7.Fhir.Model.Period)value;
+            return this;
+          case "inactive":
+            InactiveElement = (Hl7.Fhir.Model.FhirBoolean)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -954,6 +995,49 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "active":
+          ActiveElement = (Hl7.Fhir.Model.FhirBoolean)value;
+          return this;
+        case "type":
+          TypeElement = (Code<Hl7.Fhir.Model.Group.GroupType>)value;
+          return this;
+        case "membership":
+          MembershipElement = (Code<Hl7.Fhir.Model.Group.GroupMembershipBasis>)value;
+          return this;
+        case "code":
+          Code = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "name":
+          NameElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "description":
+          DescriptionElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        case "quantity":
+          QuantityElement = (Hl7.Fhir.Model.UnsignedInt)value;
+          return this;
+        case "managingEntity":
+          ManagingEntity = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "characteristic":
+          Characteristic = (List<Hl7.Fhir.Model.Group.CharacteristicComponent>)value;
+          return this;
+        case "member":
+          Member = (List<Hl7.Fhir.Model.Group.MemberComponent>)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/GuidanceResponse.cs b/src/Hl7.Fhir.R5/Model/Generated/GuidanceResponse.cs
index a427225e51..ca2941b21b 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/GuidanceResponse.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/GuidanceResponse.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("GuidanceResponse","http://hl7.org/fhir/StructureDefinition/GuidanceResponse", IsResource=true)]
+  [FhirType("GuidanceResponse","http://hl7.org/fhir/StructureDefinition/GuidanceResponse")]
   public partial class GuidanceResponse : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -528,6 +528,58 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "requestIdentifier":
+          RequestIdentifier = (Hl7.Fhir.Model.Identifier)value;
+          return this;
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "module":
+          Module = (Hl7.Fhir.Model.DataType)value;
+          return this;
+        case "status":
+          StatusElement = (Code<Hl7.Fhir.Model.GuidanceResponse.GuidanceResponseStatus>)value;
+          return this;
+        case "subject":
+          Subject = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "encounter":
+          Encounter = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "occurrenceDateTime":
+          OccurrenceDateTimeElement = (Hl7.Fhir.Model.FhirDateTime)value;
+          return this;
+        case "performer":
+          Performer = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "reason":
+          Reason = (List<Hl7.Fhir.Model.CodeableReference>)value;
+          return this;
+        case "note":
+          Note = (List<Hl7.Fhir.Model.Annotation>)value;
+          return this;
+        case "evaluationMessage":
+          EvaluationMessage = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "outputParameters":
+          OutputParameters = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "result":
+          Result = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "dataRequirement":
+          DataRequirement = (List<Hl7.Fhir.Model.DataRequirement>)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/HealthcareService.cs b/src/Hl7.Fhir.R5/Model/Generated/HealthcareService.cs
index ecd4c2a443..42d496c7aa 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/HealthcareService.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/HealthcareService.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model
   /// </summary>
   [Serializable]
   [DataContract]
-  [FhirType("HealthcareService","http://hl7.org/fhir/StructureDefinition/HealthcareService", IsResource=true)]
+  [FhirType("HealthcareService","http://hl7.org/fhir/StructureDefinition/HealthcareService")]
   public partial class HealthcareService : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -64,7 +64,7 @@ public partial class HealthcareService : Hl7.Fhir.Model.DomainResource, IIdentif
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("HealthcareService#Eligibility", IsNestedType=true)]
+    [FhirType("HealthcareService#Eligibility")]
     [BackboneType("HealthcareService.eligibility")]
     public partial class EligibilityComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -201,6 +201,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "code":
+            Code = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "comment":
+            CommentElement = (Hl7.Fhir.Model.Markdown)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -886,6 +902,85 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "active":
+          ActiveElement = (Hl7.Fhir.Model.FhirBoolean)value;
+          return this;
+        case "providedBy":
+          ProvidedBy = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "offeredIn":
+          OfferedIn = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "category":
+          Category = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "type":
+          Type = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "specialty":
+          Specialty = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "location":
+          Location = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "name":
+          NameElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "comment":
+          CommentElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        case "extraDetails":
+          ExtraDetailsElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        case "photo":
+          Photo = (Hl7.Fhir.Model.Attachment)value;
+          return this;
+        case "contact":
+          Contact = (List<Hl7.Fhir.Model.ExtendedContactDetail>)value;
+          return this;
+        case "coverageArea":
+          CoverageArea = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "serviceProvisionCode":
+          ServiceProvisionCode = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "eligibility":
+          Eligibility = (List<Hl7.Fhir.Model.HealthcareService.EligibilityComponent>)value;
+          return this;
+        case "program":
+          Program = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "characteristic":
+          Characteristic = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "communication":
+          Communication = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "referralMethod":
+          ReferralMethod = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "appointmentRequired":
+          AppointmentRequiredElement = (Hl7.Fhir.Model.FhirBoolean)value;
+          return this;
+        case "availability":
+          Availability = (List<Hl7.Fhir.Model.Availability>)value;
+          return this;
+        case "endpoint":
+          Endpoint = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/HumanName.cs b/src/Hl7.Fhir.R5/Model/Generated/HumanName.cs
index 0b23796e6b..d4c5eeb206 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/HumanName.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/HumanName.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -439,6 +439,37 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "use":
+          UseElement = (Code<Hl7.Fhir.Model.HumanName.NameUse>)value;
+          return this;
+        case "text":
+          TextElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "family":
+          FamilyElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "given":
+          GivenElement = (List<Hl7.Fhir.Model.FhirString>)value;
+          return this;
+        case "prefix":
+          PrefixElement = (List<Hl7.Fhir.Model.FhirString>)value;
+          return this;
+        case "suffix":
+          SuffixElement = (List<Hl7.Fhir.Model.FhirString>)value;
+          return this;
+        case "period":
+          Period = (Hl7.Fhir.Model.Period)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/ICanonicalResource.cs b/src/Hl7.Fhir.R5/Model/Generated/ICanonicalResource.cs
index 9156d49060..a3da15928c 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/ICanonicalResource.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/ICanonicalResource.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/IMetadataResource.cs b/src/Hl7.Fhir.R5/Model/Generated/IMetadataResource.cs
index 5f782e160e..7b376eb6d5 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/IMetadataResource.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/IMetadataResource.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/ImagingSelection.cs b/src/Hl7.Fhir.R5/Model/Generated/ImagingSelection.cs
index dc9a736d06..cd58aae8b9 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/ImagingSelection.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/ImagingSelection.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("ImagingSelection","http://hl7.org/fhir/StructureDefinition/ImagingSelection", IsResource=true)]
+  [FhirType("ImagingSelection","http://hl7.org/fhir/StructureDefinition/ImagingSelection")]
   public partial class ImagingSelection : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -181,7 +181,7 @@ public enum ImagingSelection3DGraphicType
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ImagingSelection#Performer", IsNestedType=true)]
+    [FhirType("ImagingSelection#Performer")]
     [BackboneType("ImagingSelection.performer")]
     public partial class PerformerComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -302,6 +302,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "function":
+            Function = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "actor":
+            Actor = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -319,7 +335,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ImagingSelection#Instance", IsNestedType=true)]
+    [FhirType("ImagingSelection#Instance")]
     [BackboneType("ImagingSelection.instance")]
     public partial class InstanceComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -580,6 +596,34 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "uid":
+            UidElement = (Hl7.Fhir.Model.Id)value;
+            return this;
+          case "number":
+            NumberElement = (Hl7.Fhir.Model.UnsignedInt)value;
+            return this;
+          case "sopClass":
+            SopClass = (Hl7.Fhir.Model.Coding)value;
+            return this;
+          case "subset":
+            SubsetElement = (List<Hl7.Fhir.Model.FhirString>)value;
+            return this;
+          case "imageRegion2D":
+            ImageRegion2D = (List<Hl7.Fhir.Model.ImagingSelection.ImageRegion2DComponent>)value;
+            return this;
+          case "imageRegion3D":
+            ImageRegion3D = (List<Hl7.Fhir.Model.ImagingSelection.ImageRegion3DComponent>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -602,7 +646,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ImagingSelection#ImageRegion2D", IsNestedType=true)]
+    [FhirType("ImagingSelection#ImageRegion2D")]
     [BackboneType("ImagingSelection.instance.imageRegion2D")]
     public partial class ImageRegion2DComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -760,6 +804,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "regionType":
+            RegionTypeElement = (Code<Hl7.Fhir.Model.ImagingSelection.ImagingSelection2DGraphicType>)value;
+            return this;
+          case "coordinate":
+            CoordinateElement = (List<Hl7.Fhir.Model.FhirDecimal>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -777,7 +837,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ImagingSelection#ImageRegion3D", IsNestedType=true)]
+    [FhirType("ImagingSelection#ImageRegion3D")]
     [BackboneType("ImagingSelection.instance.imageRegion3D")]
     public partial class ImageRegion3DComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -935,6 +995,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "regionType":
+            RegionTypeElement = (Code<Hl7.Fhir.Model.ImagingSelection.ImagingSelection3DGraphicType>)value;
+            return this;
+          case "coordinate":
+            CoordinateElement = (List<Hl7.Fhir.Model.FhirDecimal>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1503,6 +1579,67 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "status":
+          StatusElement = (Code<Hl7.Fhir.Model.ImagingSelection.ImagingSelectionStatus>)value;
+          return this;
+        case "subject":
+          Subject = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "issued":
+          IssuedElement = (Hl7.Fhir.Model.Instant)value;
+          return this;
+        case "performer":
+          Performer = (List<Hl7.Fhir.Model.ImagingSelection.PerformerComponent>)value;
+          return this;
+        case "basedOn":
+          BasedOn = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "category":
+          Category = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "code":
+          Code = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "studyUid":
+          StudyUidElement = (Hl7.Fhir.Model.Id)value;
+          return this;
+        case "derivedFrom":
+          DerivedFrom = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "endpoint":
+          Endpoint = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "seriesUid":
+          SeriesUidElement = (Hl7.Fhir.Model.Id)value;
+          return this;
+        case "seriesNumber":
+          SeriesNumberElement = (Hl7.Fhir.Model.UnsignedInt)value;
+          return this;
+        case "frameOfReferenceUid":
+          FrameOfReferenceUidElement = (Hl7.Fhir.Model.Id)value;
+          return this;
+        case "bodySite":
+          BodySite = (Hl7.Fhir.Model.CodeableReference)value;
+          return this;
+        case "focus":
+          Focus = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "instance":
+          Instance = (List<Hl7.Fhir.Model.ImagingSelection.InstanceComponent>)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/ImagingStudy.cs b/src/Hl7.Fhir.R5/Model/Generated/ImagingStudy.cs
index 9e410f785d..84055dde8d 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/ImagingStudy.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/ImagingStudy.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("ImagingStudy","http://hl7.org/fhir/StructureDefinition/ImagingStudy", IsResource=true)]
+  [FhirType("ImagingStudy","http://hl7.org/fhir/StructureDefinition/ImagingStudy")]
   public partial class ImagingStudy : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -107,7 +107,7 @@ public enum ImagingStudyStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ImagingStudy#Series", IsNestedType=true)]
+    [FhirType("ImagingStudy#Series")]
     [BackboneType("ImagingStudy.series")]
     public partial class SeriesComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -538,6 +538,52 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "uid":
+            UidElement = (Hl7.Fhir.Model.Id)value;
+            return this;
+          case "number":
+            NumberElement = (Hl7.Fhir.Model.UnsignedInt)value;
+            return this;
+          case "modality":
+            Modality = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "description":
+            DescriptionElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "numberOfInstances":
+            NumberOfInstancesElement = (Hl7.Fhir.Model.UnsignedInt)value;
+            return this;
+          case "endpoint":
+            Endpoint = (List<Hl7.Fhir.Model.ResourceReference>)value;
+            return this;
+          case "bodySite":
+            BodySite = (Hl7.Fhir.Model.CodeableReference)value;
+            return this;
+          case "laterality":
+            Laterality = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "specimen":
+            Specimen = (List<Hl7.Fhir.Model.ResourceReference>)value;
+            return this;
+          case "started":
+            StartedElement = (Hl7.Fhir.Model.FhirDateTime)value;
+            return this;
+          case "performer":
+            Performer = (List<Hl7.Fhir.Model.ImagingStudy.PerformerComponent>)value;
+            return this;
+          case "instance":
+            Instance = (List<Hl7.Fhir.Model.ImagingStudy.InstanceComponent>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -566,7 +612,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ImagingStudy#Performer", IsNestedType=true)]
+    [FhirType("ImagingStudy#Performer")]
     [BackboneType("ImagingStudy.series.performer")]
     public partial class PerformerComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -688,6 +734,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "function":
+            Function = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "actor":
+            Actor = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -705,7 +767,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ImagingStudy#Instance", IsNestedType=true)]
+    [FhirType("ImagingStudy#Instance")]
     [BackboneType("ImagingStudy.series.instance")]
     public partial class InstanceComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -922,6 +984,28 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "uid":
+            UidElement = (Hl7.Fhir.Model.Id)value;
+            return this;
+          case "sopClass":
+            SopClass = (Hl7.Fhir.Model.Coding)value;
+            return this;
+          case "number":
+            NumberElement = (Hl7.Fhir.Model.UnsignedInt)value;
+            return this;
+          case "title":
+            TitleElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1500,6 +1584,70 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "status":
+          StatusElement = (Code<Hl7.Fhir.Model.ImagingStudy.ImagingStudyStatus>)value;
+          return this;
+        case "modality":
+          Modality = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "subject":
+          Subject = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "encounter":
+          Encounter = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "started":
+          StartedElement = (Hl7.Fhir.Model.FhirDateTime)value;
+          return this;
+        case "basedOn":
+          BasedOn = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "partOf":
+          PartOf = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "referrer":
+          Referrer = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "endpoint":
+          Endpoint = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "numberOfSeries":
+          NumberOfSeriesElement = (Hl7.Fhir.Model.UnsignedInt)value;
+          return this;
+        case "numberOfInstances":
+          NumberOfInstancesElement = (Hl7.Fhir.Model.UnsignedInt)value;
+          return this;
+        case "procedure":
+          Procedure = (List<Hl7.Fhir.Model.CodeableReference>)value;
+          return this;
+        case "location":
+          Location = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "reason":
+          Reason = (List<Hl7.Fhir.Model.CodeableReference>)value;
+          return this;
+        case "note":
+          Note = (List<Hl7.Fhir.Model.Annotation>)value;
+          return this;
+        case "description":
+          DescriptionElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "series":
+          Series = (List<Hl7.Fhir.Model.ImagingStudy.SeriesComponent>)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/Immunization.cs b/src/Hl7.Fhir.R5/Model/Generated/Immunization.cs
index a397cd2f38..9f7ba33845 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/Immunization.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/Immunization.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Immunization","http://hl7.org/fhir/StructureDefinition/Immunization", IsResource=true)]
+  [FhirType("Immunization","http://hl7.org/fhir/StructureDefinition/Immunization")]
   public partial class Immunization : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -95,7 +95,7 @@ public enum ImmunizationStatusCodes
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Immunization#Performer", IsNestedType=true)]
+    [FhirType("Immunization#Performer")]
     [BackboneType("Immunization.performer")]
     public partial class PerformerComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -217,6 +217,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "function":
+            Function = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "actor":
+            Actor = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -234,7 +250,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Immunization#ProgramEligibility", IsNestedType=true)]
+    [FhirType("Immunization#ProgramEligibility")]
     [BackboneType("Immunization.programEligibility")]
     public partial class ProgramEligibilityComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -356,6 +372,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "program":
+            Program = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "programStatus":
+            ProgramStatus = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -374,7 +406,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Immunization#Reaction", IsNestedType=true)]
+    [FhirType("Immunization#Reaction")]
     [BackboneType("Immunization.reaction")]
     public partial class ReactionComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -549,6 +581,25 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "date":
+            DateElement = (Hl7.Fhir.Model.FhirDateTime)value;
+            return this;
+          case "manifestation":
+            Manifestation = (Hl7.Fhir.Model.CodeableReference)value;
+            return this;
+          case "reported":
+            ReportedElement = (Hl7.Fhir.Model.FhirBoolean)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -567,7 +618,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Immunization#ProtocolApplied", IsNestedType=true)]
+    [FhirType("Immunization#ProtocolApplied")]
     [BackboneType("Immunization.protocolApplied")]
     public partial class ProtocolAppliedComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -807,6 +858,31 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "series":
+            SeriesElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "authority":
+            Authority = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          case "targetDisease":
+            TargetDisease = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+            return this;
+          case "doseNumber":
+            DoseNumberElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "seriesDoses":
+            SeriesDosesElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1602,6 +1678,100 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "basedOn":
+          BasedOn = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "status":
+          StatusElement = (Code<Hl7.Fhir.Model.Immunization.ImmunizationStatusCodes>)value;
+          return this;
+        case "statusReason":
+          StatusReason = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "vaccineCode":
+          VaccineCode = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "administeredProduct":
+          AdministeredProduct = (Hl7.Fhir.Model.CodeableReference)value;
+          return this;
+        case "manufacturer":
+          Manufacturer = (Hl7.Fhir.Model.CodeableReference)value;
+          return this;
+        case "lotNumber":
+          LotNumberElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "expirationDate":
+          ExpirationDateElement = (Hl7.Fhir.Model.Date)value;
+          return this;
+        case "patient":
+          Patient = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "encounter":
+          Encounter = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "supportingInformation":
+          SupportingInformation = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "occurrence":
+          Occurrence = (Hl7.Fhir.Model.DataType)value;
+          return this;
+        case "primarySource":
+          PrimarySourceElement = (Hl7.Fhir.Model.FhirBoolean)value;
+          return this;
+        case "informationSource":
+          InformationSource = (Hl7.Fhir.Model.CodeableReference)value;
+          return this;
+        case "location":
+          Location = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "site":
+          Site = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "route":
+          Route = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "doseQuantity":
+          DoseQuantity = (Hl7.Fhir.Model.Quantity)value;
+          return this;
+        case "performer":
+          Performer = (List<Hl7.Fhir.Model.Immunization.PerformerComponent>)value;
+          return this;
+        case "note":
+          Note = (List<Hl7.Fhir.Model.Annotation>)value;
+          return this;
+        case "reason":
+          Reason = (List<Hl7.Fhir.Model.CodeableReference>)value;
+          return this;
+        case "isSubpotent":
+          IsSubpotentElement = (Hl7.Fhir.Model.FhirBoolean)value;
+          return this;
+        case "subpotentReason":
+          SubpotentReason = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "programEligibility":
+          ProgramEligibility = (List<Hl7.Fhir.Model.Immunization.ProgramEligibilityComponent>)value;
+          return this;
+        case "fundingSource":
+          FundingSource = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "reaction":
+          Reaction = (List<Hl7.Fhir.Model.Immunization.ReactionComponent>)value;
+          return this;
+        case "protocolApplied":
+          ProtocolApplied = (List<Hl7.Fhir.Model.Immunization.ProtocolAppliedComponent>)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/ImmunizationEvaluation.cs b/src/Hl7.Fhir.R5/Model/Generated/ImmunizationEvaluation.cs
index a1bfd17a8f..1755a40282 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/ImmunizationEvaluation.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/ImmunizationEvaluation.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("ImmunizationEvaluation","http://hl7.org/fhir/StructureDefinition/ImmunizationEvaluation", IsResource=true)]
+  [FhirType("ImmunizationEvaluation","http://hl7.org/fhir/StructureDefinition/ImmunizationEvaluation")]
   public partial class ImmunizationEvaluation : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -549,6 +549,55 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "status":
+          StatusElement = (Code<Hl7.Fhir.Model.ImmunizationEvaluation.ImmunizationEvaluationStatusCodes>)value;
+          return this;
+        case "patient":
+          Patient = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "date":
+          DateElement = (Hl7.Fhir.Model.FhirDateTime)value;
+          return this;
+        case "authority":
+          Authority = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "targetDisease":
+          TargetDisease = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "immunizationEvent":
+          ImmunizationEvent = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "doseStatus":
+          DoseStatus = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "doseStatusReason":
+          DoseStatusReason = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "description":
+          DescriptionElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        case "series":
+          SeriesElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "doseNumber":
+          DoseNumberElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "seriesDoses":
+          SeriesDosesElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/ImmunizationRecommendation.cs b/src/Hl7.Fhir.R5/Model/Generated/ImmunizationRecommendation.cs
index c9fe7cecd6..f4cafb7498 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/ImmunizationRecommendation.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/ImmunizationRecommendation.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("ImmunizationRecommendation","http://hl7.org/fhir/StructureDefinition/ImmunizationRecommendation", IsResource=true)]
+  [FhirType("ImmunizationRecommendation","http://hl7.org/fhir/StructureDefinition/ImmunizationRecommendation")]
   public partial class ImmunizationRecommendation : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -67,7 +67,7 @@ public partial class ImmunizationRecommendation : Hl7.Fhir.Model.DomainResource,
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ImmunizationRecommendation#Recommendation", IsNestedType=true)]
+    [FhirType("ImmunizationRecommendation#Recommendation")]
     [BackboneType("ImmunizationRecommendation.recommendation")]
     public partial class RecommendationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -484,6 +484,52 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "vaccineCode":
+            VaccineCode = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+            return this;
+          case "targetDisease":
+            TargetDisease = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+            return this;
+          case "contraindicatedVaccineCode":
+            ContraindicatedVaccineCode = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+            return this;
+          case "forecastStatus":
+            ForecastStatus = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "forecastReason":
+            ForecastReason = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+            return this;
+          case "dateCriterion":
+            DateCriterion = (List<Hl7.Fhir.Model.ImmunizationRecommendation.DateCriterionComponent>)value;
+            return this;
+          case "description":
+            DescriptionElement = (Hl7.Fhir.Model.Markdown)value;
+            return this;
+          case "series":
+            SeriesElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "doseNumber":
+            DoseNumberElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "seriesDoses":
+            SeriesDosesElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "supportingImmunization":
+            SupportingImmunization = (List<Hl7.Fhir.Model.ResourceReference>)value;
+            return this;
+          case "supportingPatientInformation":
+            SupportingPatientInformation = (List<Hl7.Fhir.Model.ResourceReference>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -511,7 +557,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ImmunizationRecommendation#DateCriterion", IsNestedType=true)]
+    [FhirType("ImmunizationRecommendation#DateCriterion")]
     [BackboneType("ImmunizationRecommendation.recommendation.dateCriterion")]
     public partial class DateCriterionComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -650,6 +696,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "code":
+            Code = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "value":
+            ValueElement = (Hl7.Fhir.Model.FhirDateTime)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -859,6 +921,31 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "patient":
+          Patient = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "date":
+          DateElement = (Hl7.Fhir.Model.FhirDateTime)value;
+          return this;
+        case "authority":
+          Authority = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "recommendation":
+          Recommendation = (List<Hl7.Fhir.Model.ImmunizationRecommendation.RecommendationComponent>)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/ImplementationGuide.cs b/src/Hl7.Fhir.R5/Model/Generated/ImplementationGuide.cs
index a64308725c..57a1be61e3 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/ImplementationGuide.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/ImplementationGuide.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("ImplementationGuide","http://hl7.org/fhir/StructureDefinition/ImplementationGuide", IsResource=true)]
+  [FhirType("ImplementationGuide","http://hl7.org/fhir/StructureDefinition/ImplementationGuide")]
   public partial class ImplementationGuide : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -2187,7 +2187,7 @@ public enum GuidePageGeneration
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ImplementationGuide#DependsOn", IsNestedType=true)]
+    [FhirType("ImplementationGuide#DependsOn")]
     [BackboneType("ImplementationGuide.dependsOn")]
     public partial class DependsOnComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2420,6 +2420,28 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "uri":
+            UriElement = (Hl7.Fhir.Model.Canonical)value;
+            return this;
+          case "packageId":
+            PackageIdElement = (Hl7.Fhir.Model.Id)value;
+            return this;
+          case "version":
+            VersionElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "reason":
+            ReasonElement = (Hl7.Fhir.Model.Markdown)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -2440,7 +2462,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ImplementationGuide#Global", IsNestedType=true)]
+    [FhirType("ImplementationGuide#Global")]
     [BackboneType("ImplementationGuide.global")]
     public partial class GlobalComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2598,6 +2620,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "type":
+            TypeElement = (Code<Hl7.Fhir.Model.ResourceType>)value;
+            return this;
+          case "profile":
+            ProfileElement = (Hl7.Fhir.Model.Canonical)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -2616,7 +2654,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ImplementationGuide#Definition", IsNestedType=true)]
+    [FhirType("ImplementationGuide#Definition")]
     [BackboneType("ImplementationGuide.definition")]
     public partial class DefinitionComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2801,6 +2839,31 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "grouping":
+            Grouping = (List<Hl7.Fhir.Model.ImplementationGuide.GroupingComponent>)value;
+            return this;
+          case "resource":
+            Resource = (List<Hl7.Fhir.Model.ImplementationGuide.ResourceComponent>)value;
+            return this;
+          case "page":
+            Page = (Hl7.Fhir.Model.ImplementationGuide.PageComponent)value;
+            return this;
+          case "parameter":
+            Parameter = (List<Hl7.Fhir.Model.ImplementationGuide.ParameterComponent>)value;
+            return this;
+          case "template":
+            Template = (List<Hl7.Fhir.Model.ImplementationGuide.TemplateComponent>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -2822,7 +2885,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ImplementationGuide#Grouping", IsNestedType=true)]
+    [FhirType("ImplementationGuide#Grouping")]
     [BackboneType("ImplementationGuide.definition.grouping")]
     public partial class GroupingComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2977,6 +3040,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "name":
+            NameElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "description":
+            DescriptionElement = (Hl7.Fhir.Model.Markdown)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -2994,7 +3073,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ImplementationGuide#Resource", IsNestedType=true)]
+    [FhirType("ImplementationGuide#Resource")]
     [BackboneType("ImplementationGuide.definition.resource")]
     public partial class ResourceComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -3332,6 +3411,37 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "reference":
+            Reference = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          case "fhirVersion":
+            FhirVersionElement = (List<Code<Hl7.Fhir.Model.FHIRVersion>>)value;
+            return this;
+          case "name":
+            NameElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "description":
+            DescriptionElement = (Hl7.Fhir.Model.Markdown)value;
+            return this;
+          case "isExample":
+            IsExampleElement = (Hl7.Fhir.Model.FhirBoolean)value;
+            return this;
+          case "profile":
+            ProfileElement = (List<Hl7.Fhir.Model.Canonical>)value;
+            return this;
+          case "groupingId":
+            GroupingIdElement = (Hl7.Fhir.Model.Id)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -3355,7 +3465,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ImplementationGuide#Page", IsNestedType=true)]
+    [FhirType("ImplementationGuide#Page")]
     [BackboneType("ImplementationGuide.definition.page")]
     public partial class PageComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -3598,6 +3708,31 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "source":
+            Source = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          case "name":
+            NameElement = (Hl7.Fhir.Model.FhirUrl)value;
+            return this;
+          case "title":
+            TitleElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "generation":
+            GenerationElement = (Code<Hl7.Fhir.Model.ImplementationGuide.GuidePageGeneration>)value;
+            return this;
+          case "page":
+            Page = (List<Hl7.Fhir.Model.ImplementationGuide.PageComponent>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -3619,7 +3754,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ImplementationGuide#Parameter", IsNestedType=true)]
+    [FhirType("ImplementationGuide#Parameter")]
     [BackboneType("ImplementationGuide.definition.parameter")]
     public partial class ParameterComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -3757,6 +3892,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "code":
+            Code = (Hl7.Fhir.Model.Coding)value;
+            return this;
+          case "value":
+            ValueElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -3771,7 +3922,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("ImplementationGuide#Template", IsNestedType=true)]
+    [FhirType("ImplementationGuide#Template")]
     [BackboneType("ImplementationGuide.definition.template")]
     public partial class TemplateComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -3966,6 +4117,25 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "code":
+            CodeElement = (Hl7.Fhir.Model.Code)value;
+            return this;
+          case "source":
+            SourceElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "scope":
+            ScopeElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -3984,7 +4154,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ImplementationGuide#Manifest", IsNestedType=true)]
+    [FhirType("ImplementationGuide#Manifest")]
     [BackboneType("ImplementationGuide.manifest")]
     public partial class ManifestComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -4223,6 +4393,31 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "rendering":
+            RenderingElement = (Hl7.Fhir.Model.FhirUrl)value;
+            return this;
+          case "resource":
+            Resource = (List<Hl7.Fhir.Model.ImplementationGuide.ManifestResourceComponent>)value;
+            return this;
+          case "page":
+            Page = (List<Hl7.Fhir.Model.ImplementationGuide.ManifestPageComponent>)value;
+            return this;
+          case "image":
+            ImageElement = (List<Hl7.Fhir.Model.FhirString>)value;
+            return this;
+          case "other":
+            OtherElement = (List<Hl7.Fhir.Model.FhirString>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -4243,7 +4438,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ImplementationGuide#ManifestResource", IsNestedType=true)]
+    [FhirType("ImplementationGuide#ManifestResource")]
     [BackboneType("ImplementationGuide.manifest.resource")]
     public partial class ManifestResourceComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -4461,6 +4656,28 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "reference":
+            Reference = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          case "isExample":
+            IsExampleElement = (Hl7.Fhir.Model.FhirBoolean)value;
+            return this;
+          case "profile":
+            ProfileElement = (List<Hl7.Fhir.Model.Canonical>)value;
+            return this;
+          case "relativePath":
+            RelativePathElement = (Hl7.Fhir.Model.FhirUrl)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -4480,7 +4697,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ImplementationGuide#ManifestPage", IsNestedType=true)]
+    [FhirType("ImplementationGuide#ManifestPage")]
     [BackboneType("ImplementationGuide.manifest.page")]
     public partial class ManifestPageComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -4675,6 +4892,25 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "name":
+            NameElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "title":
+            TitleElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "anchor":
+            AnchorElement = (List<Hl7.Fhir.Model.FhirString>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -5548,6 +5784,88 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "url":
+          UrlElement = (Hl7.Fhir.Model.FhirUri)value;
+          return this;
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "version":
+          VersionElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "versionAlgorithm":
+          VersionAlgorithm = (Hl7.Fhir.Model.DataType)value;
+          return this;
+        case "name":
+          NameElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "title":
+          TitleElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "status":
+          StatusElement = (Code<Hl7.Fhir.Model.PublicationStatus>)value;
+          return this;
+        case "experimental":
+          ExperimentalElement = (Hl7.Fhir.Model.FhirBoolean)value;
+          return this;
+        case "date":
+          DateElement = (Hl7.Fhir.Model.FhirDateTime)value;
+          return this;
+        case "publisher":
+          PublisherElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "contact":
+          Contact = (List<Hl7.Fhir.Model.ContactDetail>)value;
+          return this;
+        case "description":
+          DescriptionElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        case "useContext":
+          UseContext = (List<Hl7.Fhir.Model.UsageContext>)value;
+          return this;
+        case "jurisdiction":
+          Jurisdiction = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "purpose":
+          PurposeElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        case "copyright":
+          CopyrightElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        case "copyrightLabel":
+          CopyrightLabelElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "packageId":
+          PackageIdElement = (Hl7.Fhir.Model.Id)value;
+          return this;
+        case "license":
+          LicenseElement = (Code<Hl7.Fhir.Model.ImplementationGuide.SPDXLicense>)value;
+          return this;
+        case "fhirVersion":
+          FhirVersionElement = (List<Code<Hl7.Fhir.Model.FHIRVersion>>)value;
+          return this;
+        case "dependsOn":
+          DependsOn = (List<Hl7.Fhir.Model.ImplementationGuide.DependsOnComponent>)value;
+          return this;
+        case "global":
+          Global = (List<Hl7.Fhir.Model.ImplementationGuide.GlobalComponent>)value;
+          return this;
+        case "definition":
+          Definition = (Hl7.Fhir.Model.ImplementationGuide.DefinitionComponent)value;
+          return this;
+        case "manifest":
+          Manifest = (Hl7.Fhir.Model.ImplementationGuide.ManifestComponent)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/Ingredient.cs b/src/Hl7.Fhir.R5/Model/Generated/Ingredient.cs
index 6014af8ddc..99e04ff3a7 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/Ingredient.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/Ingredient.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model
   /// </summary>
   [Serializable]
   [DataContract]
-  [FhirType("Ingredient","http://hl7.org/fhir/StructureDefinition/Ingredient", IsResource=true)]
+  [FhirType("Ingredient","http://hl7.org/fhir/StructureDefinition/Ingredient")]
   public partial class Ingredient : Hl7.Fhir.Model.DomainResource, IIdentifiable<Identifier>
   {
     /// <summary>
@@ -92,7 +92,7 @@ public enum IngredientManufacturerRole
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Ingredient#Manufacturer", IsNestedType=true)]
+    [FhirType("Ingredient#Manufacturer")]
     [BackboneType("Ingredient.manufacturer")]
     public partial class ManufacturerComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -233,6 +233,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "role":
+            RoleElement = (Code<Hl7.Fhir.Model.Ingredient.IngredientManufacturerRole>)value;
+            return this;
+          case "manufacturer":
+            Manufacturer = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -247,7 +263,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Ingredient#Substance", IsNestedType=true)]
+    [FhirType("Ingredient#Substance")]
     [BackboneType("Ingredient.substance")]
     public partial class SubstanceComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -368,6 +384,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "code":
+            Code = (Hl7.Fhir.Model.CodeableReference)value;
+            return this;
+          case "strength":
+            Strength = (List<Hl7.Fhir.Model.Ingredient.StrengthComponent>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -385,7 +417,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Ingredient#Strength", IsNestedType=true)]
+    [FhirType("Ingredient#Strength")]
     [BackboneType("Ingredient.substance.strength")]
     public partial class StrengthComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -690,6 +722,40 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "presentation":
+            Presentation = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          case "textPresentation":
+            TextPresentationElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "concentration":
+            Concentration = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          case "textConcentration":
+            TextConcentrationElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "basis":
+            Basis = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "measurementPoint":
+            MeasurementPointElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "country":
+            Country = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+            return this;
+          case "referenceStrength":
+            ReferenceStrength = (List<Hl7.Fhir.Model.Ingredient.ReferenceStrengthComponent>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -713,7 +779,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Ingredient#ReferenceStrength", IsNestedType=true)]
+    [FhirType("Ingredient#ReferenceStrength")]
     [BackboneType("Ingredient.substance.strength.referenceStrength")]
     public partial class ReferenceStrengthComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -898,6 +964,28 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "substance":
+            Substance = (Hl7.Fhir.Model.CodeableReference)value;
+            return this;
+          case "strength":
+            Strength = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          case "measurementPoint":
+            MeasurementPointElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "country":
+            Country = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1254,6 +1342,46 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "identifier":
+          Identifier = (Hl7.Fhir.Model.Identifier)value;
+          return this;
+        case "status":
+          StatusElement = (Code<Hl7.Fhir.Model.PublicationStatus>)value;
+          return this;
+        case "for":
+          For = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "role":
+          Role = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "function":
+          Function = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "group":
+          Group = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "allergenicIndicator":
+          AllergenicIndicatorElement = (Hl7.Fhir.Model.FhirBoolean)value;
+          return this;
+        case "comment":
+          CommentElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        case "manufacturer":
+          Manufacturer = (List<Hl7.Fhir.Model.Ingredient.ManufacturerComponent>)value;
+          return this;
+        case "substance":
+          Substance = (Hl7.Fhir.Model.Ingredient.SubstanceComponent)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/InsurancePlan.cs b/src/Hl7.Fhir.R5/Model/Generated/InsurancePlan.cs
index 1a4c635044..616b48c15e 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/InsurancePlan.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/InsurancePlan.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model
   /// </summary>
   [Serializable]
   [DataContract]
-  [FhirType("InsurancePlan","http://hl7.org/fhir/StructureDefinition/InsurancePlan", IsResource=true)]
+  [FhirType("InsurancePlan","http://hl7.org/fhir/StructureDefinition/InsurancePlan")]
   public partial class InsurancePlan : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -92,7 +92,7 @@ public enum BenefitCostApplicability
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("InsurancePlan#Coverage", IsNestedType=true)]
+    [FhirType("InsurancePlan#Coverage")]
     [BackboneType("InsurancePlan.coverage")]
     public partial class CoverageComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -236,6 +236,25 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "type":
+            Type = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "network":
+            Network = (List<Hl7.Fhir.Model.ResourceReference>)value;
+            return this;
+          case "benefit":
+            Benefit = (List<Hl7.Fhir.Model.InsurancePlan.CoverageBenefitComponent>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -254,7 +273,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("InsurancePlan#CoverageBenefit", IsNestedType=true)]
+    [FhirType("InsurancePlan#CoverageBenefit")]
     [BackboneType("InsurancePlan.coverage.benefit")]
     public partial class CoverageBenefitComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -413,6 +432,25 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "type":
+            Type = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "requirement":
+            RequirementElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "limit":
+            Limit = (List<Hl7.Fhir.Model.InsurancePlan.LimitComponent>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -431,7 +469,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("InsurancePlan#Limit", IsNestedType=true)]
+    [FhirType("InsurancePlan#Limit")]
     [BackboneType("InsurancePlan.coverage.benefit.limit")]
     public partial class LimitComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -549,6 +587,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "value":
+            Value = (Hl7.Fhir.Model.Quantity)value;
+            return this;
+          case "code":
+            Code = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -566,7 +620,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("InsurancePlan#Plan", IsNestedType=true)]
+    [FhirType("InsurancePlan#Plan")]
     [BackboneType("InsurancePlan.plan")]
     public partial class PlanComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -777,6 +831,34 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "identifier":
+            Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+            return this;
+          case "type":
+            Type = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "coverageArea":
+            CoverageArea = (List<Hl7.Fhir.Model.ResourceReference>)value;
+            return this;
+          case "network":
+            Network = (List<Hl7.Fhir.Model.ResourceReference>)value;
+            return this;
+          case "generalCost":
+            GeneralCost = (List<Hl7.Fhir.Model.InsurancePlan.GeneralCostComponent>)value;
+            return this;
+          case "specificCost":
+            SpecificCost = (List<Hl7.Fhir.Model.InsurancePlan.SpecificCostComponent>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -798,7 +880,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("InsurancePlan#GeneralCost", IsNestedType=true)]
+    [FhirType("InsurancePlan#GeneralCost")]
     [BackboneType("InsurancePlan.plan.generalCost")]
     public partial class GeneralCostComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -994,6 +1076,28 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "type":
+            Type = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "groupSize":
+            GroupSizeElement = (Hl7.Fhir.Model.PositiveInt)value;
+            return this;
+          case "cost":
+            Cost = (Hl7.Fhir.Model.Money)value;
+            return this;
+          case "comment":
+            CommentElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1013,7 +1117,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("InsurancePlan#SpecificCost", IsNestedType=true)]
+    [FhirType("InsurancePlan#SpecificCost")]
     [BackboneType("InsurancePlan.plan.specificCost")]
     public partial class SpecificCostComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1133,6 +1237,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "category":
+            Category = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "benefit":
+            Benefit = (List<Hl7.Fhir.Model.InsurancePlan.PlanBenefitComponent>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1150,7 +1270,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("InsurancePlan#PlanBenefit", IsNestedType=true)]
+    [FhirType("InsurancePlan#PlanBenefit")]
     [BackboneType("InsurancePlan.plan.specificCost.benefit")]
     public partial class PlanBenefitComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1270,6 +1390,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "type":
+            Type = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "cost":
+            Cost = (List<Hl7.Fhir.Model.InsurancePlan.CostComponent>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1287,7 +1423,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("InsurancePlan#Cost", IsNestedType=true)]
+    [FhirType("InsurancePlan#Cost")]
     [BackboneType("InsurancePlan.plan.specificCost.benefit.cost")]
     public partial class CostComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1450,6 +1586,28 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "type":
+            Type = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "applicability":
+            Applicability = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "qualifiers":
+            Qualifiers = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+            return this;
+          case "value":
+            Value = (Hl7.Fhir.Model.Quantity)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1900,6 +2058,58 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "status":
+          StatusElement = (Code<Hl7.Fhir.Model.PublicationStatus>)value;
+          return this;
+        case "type":
+          Type = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "name":
+          NameElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "alias":
+          AliasElement = (List<Hl7.Fhir.Model.FhirString>)value;
+          return this;
+        case "period":
+          Period = (Hl7.Fhir.Model.Period)value;
+          return this;
+        case "ownedBy":
+          OwnedBy = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "administeredBy":
+          AdministeredBy = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "coverageArea":
+          CoverageArea = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "contact":
+          Contact = (List<Hl7.Fhir.Model.ExtendedContactDetail>)value;
+          return this;
+        case "endpoint":
+          Endpoint = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "network":
+          Network = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "coverage":
+          Coverage = (List<Hl7.Fhir.Model.InsurancePlan.CoverageComponent>)value;
+          return this;
+        case "plan":
+          Plan = (List<Hl7.Fhir.Model.InsurancePlan.PlanComponent>)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/InventoryItem.cs b/src/Hl7.Fhir.R5/Model/Generated/InventoryItem.cs
index 1fdf00fb19..b97151cd22 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/InventoryItem.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/InventoryItem.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model
   /// </summary>
   [Serializable]
   [DataContract]
-  [FhirType("InventoryItem","http://hl7.org/fhir/StructureDefinition/InventoryItem", IsResource=true)]
+  [FhirType("InventoryItem","http://hl7.org/fhir/StructureDefinition/InventoryItem")]
   public partial class InventoryItem : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -98,7 +98,7 @@ public enum InventoryItemStatusCodes
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("InventoryItem#Name", IsNestedType=true)]
+    [FhirType("InventoryItem#Name")]
     [BackboneType("InventoryItem.name")]
     public partial class NameComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -279,6 +279,25 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "nameType":
+            NameType = (Hl7.Fhir.Model.Coding)value;
+            return this;
+          case "language":
+            LanguageElement = (Code<Hl7.Fhir.Model.CommonLanguages>)value;
+            return this;
+          case "name":
+            NameElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -294,7 +313,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("InventoryItem#ResponsibleOrganization", IsNestedType=true)]
+    [FhirType("InventoryItem#ResponsibleOrganization")]
     [BackboneType("InventoryItem.responsibleOrganization")]
     public partial class ResponsibleOrganizationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -416,6 +435,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "role":
+            Role = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "organization":
+            Organization = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -433,7 +468,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("InventoryItem#Description", IsNestedType=true)]
+    [FhirType("InventoryItem#Description")]
     [BackboneType("InventoryItem.description")]
     public partial class DescriptionComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -589,6 +624,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "language":
+            LanguageElement = (Code<Hl7.Fhir.Model.CommonLanguages>)value;
+            return this;
+          case "description":
+            DescriptionElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -603,7 +654,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("InventoryItem#Association", IsNestedType=true)]
+    [FhirType("InventoryItem#Association")]
     [BackboneType("InventoryItem.association")]
     public partial class AssociationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -747,6 +798,25 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "associationType":
+            AssociationType = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "relatedItem":
+            RelatedItem = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          case "quantity":
+            Quantity = (Hl7.Fhir.Model.Ratio)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -765,7 +835,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("InventoryItem#Characteristic", IsNestedType=true)]
+    [FhirType("InventoryItem#Characteristic")]
     [BackboneType("InventoryItem.characteristic")]
     public partial class CharacteristicComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -887,6 +957,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "characteristicType":
+            CharacteristicType = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "value":
+            Value = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -901,7 +987,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("InventoryItem#Instance", IsNestedType=true)]
+    [FhirType("InventoryItem#Instance")]
     [BackboneType("InventoryItem.instance")]
     public partial class InstanceComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1123,6 +1209,31 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "identifier":
+            Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+            return this;
+          case "lotNumber":
+            LotNumberElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "expiry":
+            ExpiryElement = (Hl7.Fhir.Model.FhirDateTime)value;
+            return this;
+          case "subject":
+            Subject = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          case "location":
+            Location = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1529,6 +1640,58 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "status":
+          StatusElement = (Code<Hl7.Fhir.Model.InventoryItem.InventoryItemStatusCodes>)value;
+          return this;
+        case "category":
+          Category = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "code":
+          Code = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "name":
+          Name = (List<Hl7.Fhir.Model.InventoryItem.NameComponent>)value;
+          return this;
+        case "responsibleOrganization":
+          ResponsibleOrganization = (List<Hl7.Fhir.Model.InventoryItem.ResponsibleOrganizationComponent>)value;
+          return this;
+        case "description":
+          Description = (Hl7.Fhir.Model.InventoryItem.DescriptionComponent)value;
+          return this;
+        case "inventoryStatus":
+          InventoryStatus = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "baseUnit":
+          BaseUnit = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "netContent":
+          NetContent = (Hl7.Fhir.Model.Quantity)value;
+          return this;
+        case "association":
+          Association = (List<Hl7.Fhir.Model.InventoryItem.AssociationComponent>)value;
+          return this;
+        case "characteristic":
+          Characteristic = (List<Hl7.Fhir.Model.InventoryItem.CharacteristicComponent>)value;
+          return this;
+        case "instance":
+          Instance = (Hl7.Fhir.Model.InventoryItem.InstanceComponent)value;
+          return this;
+        case "productReference":
+          ProductReference = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/InventoryReport.cs b/src/Hl7.Fhir.R5/Model/Generated/InventoryReport.cs
index 719c598cfe..fe2edd4af5 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/InventoryReport.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/InventoryReport.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model
   /// </summary>
   [Serializable]
   [DataContract]
-  [FhirType("InventoryReport","http://hl7.org/fhir/StructureDefinition/InventoryReport", IsResource=true)]
+  [FhirType("InventoryReport","http://hl7.org/fhir/StructureDefinition/InventoryReport")]
   public partial class InventoryReport : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -117,7 +117,7 @@ public enum InventoryCountType
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("InventoryReport#InventoryListing", IsNestedType=true)]
+    [FhirType("InventoryReport#InventoryListing")]
     [BackboneType("InventoryReport.inventoryListing")]
     public partial class InventoryListingComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -298,6 +298,28 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "location":
+            Location = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          case "itemStatus":
+            ItemStatus = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "countingDateTime":
+            CountingDateTimeElement = (Hl7.Fhir.Model.FhirDateTime)value;
+            return this;
+          case "item":
+            Item = (List<Hl7.Fhir.Model.InventoryReport.ItemComponent>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -314,7 +336,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("InventoryReport#Item", IsNestedType=true)]
+    [FhirType("InventoryReport#Item")]
     [BackboneType("InventoryReport.inventoryListing.item")]
     public partial class ItemComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -455,6 +477,25 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "category":
+            Category = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "quantity":
+            Quantity = (Hl7.Fhir.Model.Quantity)value;
+            return this;
+          case "item":
+            Item = (Hl7.Fhir.Model.CodeableReference)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -810,6 +851,46 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "status":
+          StatusElement = (Code<Hl7.Fhir.Model.InventoryReport.InventoryReportStatus>)value;
+          return this;
+        case "countType":
+          CountTypeElement = (Code<Hl7.Fhir.Model.InventoryReport.InventoryCountType>)value;
+          return this;
+        case "operationType":
+          OperationType = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "operationTypeReason":
+          OperationTypeReason = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "reportedDateTime":
+          ReportedDateTimeElement = (Hl7.Fhir.Model.FhirDateTime)value;
+          return this;
+        case "reporter":
+          Reporter = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "reportingPeriod":
+          ReportingPeriod = (Hl7.Fhir.Model.Period)value;
+          return this;
+        case "inventoryListing":
+          InventoryListing = (List<Hl7.Fhir.Model.InventoryReport.InventoryListingComponent>)value;
+          return this;
+        case "note":
+          Note = (List<Hl7.Fhir.Model.Annotation>)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/Invoice.cs b/src/Hl7.Fhir.R5/Model/Generated/Invoice.cs
index 5d347538d9..7b36525a22 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/Invoice.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/Invoice.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Invoice","http://hl7.org/fhir/StructureDefinition/Invoice", IsResource=true)]
+  [FhirType("Invoice","http://hl7.org/fhir/StructureDefinition/Invoice")]
   public partial class Invoice : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -107,7 +107,7 @@ public enum InvoiceStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Invoice#Participant", IsNestedType=true)]
+    [FhirType("Invoice#Participant")]
     [BackboneType("Invoice.participant")]
     public partial class ParticipantComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -228,6 +228,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "role":
+            Role = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "actor":
+            Actor = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -245,7 +261,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Invoice#LineItem", IsNestedType=true)]
+    [FhirType("Invoice#LineItem")]
     [BackboneType("Invoice.lineItem")]
     public partial class LineItemComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -430,6 +446,28 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "sequence":
+            SequenceElement = (Hl7.Fhir.Model.PositiveInt)value;
+            return this;
+          case "serviced":
+            Serviced = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          case "chargeItem":
+            ChargeItem = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          case "priceComponent":
+            PriceComponent = (List<Hl7.Fhir.Model.MonetaryComponent>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -996,6 +1034,70 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "status":
+          StatusElement = (Code<Hl7.Fhir.Model.Invoice.InvoiceStatus>)value;
+          return this;
+        case "cancelledReason":
+          CancelledReasonElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "type":
+          Type = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "subject":
+          Subject = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "recipient":
+          Recipient = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "date":
+          DateElement = (Hl7.Fhir.Model.FhirDateTime)value;
+          return this;
+        case "creation":
+          CreationElement = (Hl7.Fhir.Model.FhirDateTime)value;
+          return this;
+        case "period":
+          Period = (Hl7.Fhir.Model.DataType)value;
+          return this;
+        case "participant":
+          Participant = (List<Hl7.Fhir.Model.Invoice.ParticipantComponent>)value;
+          return this;
+        case "issuer":
+          Issuer = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "account":
+          Account = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "lineItem":
+          LineItem = (List<Hl7.Fhir.Model.Invoice.LineItemComponent>)value;
+          return this;
+        case "totalPriceComponent":
+          TotalPriceComponent = (List<Hl7.Fhir.Model.MonetaryComponent>)value;
+          return this;
+        case "totalNet":
+          TotalNet = (Hl7.Fhir.Model.Money)value;
+          return this;
+        case "totalGross":
+          TotalGross = (Hl7.Fhir.Model.Money)value;
+          return this;
+        case "paymentTerms":
+          PaymentTermsElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        case "note":
+          Note = (List<Hl7.Fhir.Model.Annotation>)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/Library.cs b/src/Hl7.Fhir.R5/Model/Generated/Library.cs
index 0014d8b6a6..b714fbc386 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/Library.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/Library.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Library","http://hl7.org/fhir/StructureDefinition/Library", IsResource=true)]
+  [FhirType("Library","http://hl7.org/fhir/StructureDefinition/Library")]
   public partial class Library : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -1135,6 +1135,115 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "url":
+          UrlElement = (Hl7.Fhir.Model.FhirUri)value;
+          return this;
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "version":
+          VersionElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "versionAlgorithm":
+          VersionAlgorithm = (Hl7.Fhir.Model.DataType)value;
+          return this;
+        case "name":
+          NameElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "title":
+          TitleElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "subtitle":
+          SubtitleElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "status":
+          StatusElement = (Code<Hl7.Fhir.Model.PublicationStatus>)value;
+          return this;
+        case "experimental":
+          ExperimentalElement = (Hl7.Fhir.Model.FhirBoolean)value;
+          return this;
+        case "type":
+          Type = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "subject":
+          Subject = (Hl7.Fhir.Model.DataType)value;
+          return this;
+        case "date":
+          DateElement = (Hl7.Fhir.Model.FhirDateTime)value;
+          return this;
+        case "publisher":
+          PublisherElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "contact":
+          Contact = (List<Hl7.Fhir.Model.ContactDetail>)value;
+          return this;
+        case "description":
+          DescriptionElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        case "useContext":
+          UseContext = (List<Hl7.Fhir.Model.UsageContext>)value;
+          return this;
+        case "jurisdiction":
+          Jurisdiction = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "purpose":
+          PurposeElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        case "usage":
+          UsageElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        case "copyright":
+          CopyrightElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        case "copyrightLabel":
+          CopyrightLabelElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "approvalDate":
+          ApprovalDateElement = (Hl7.Fhir.Model.Date)value;
+          return this;
+        case "lastReviewDate":
+          LastReviewDateElement = (Hl7.Fhir.Model.Date)value;
+          return this;
+        case "effectivePeriod":
+          EffectivePeriod = (Hl7.Fhir.Model.Period)value;
+          return this;
+        case "topic":
+          Topic = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "author":
+          Author = (List<Hl7.Fhir.Model.ContactDetail>)value;
+          return this;
+        case "editor":
+          Editor = (List<Hl7.Fhir.Model.ContactDetail>)value;
+          return this;
+        case "reviewer":
+          Reviewer = (List<Hl7.Fhir.Model.ContactDetail>)value;
+          return this;
+        case "endorser":
+          Endorser = (List<Hl7.Fhir.Model.ContactDetail>)value;
+          return this;
+        case "relatedArtifact":
+          RelatedArtifact = (List<Hl7.Fhir.Model.RelatedArtifact>)value;
+          return this;
+        case "parameter":
+          Parameter = (List<Hl7.Fhir.Model.ParameterDefinition>)value;
+          return this;
+        case "dataRequirement":
+          DataRequirement = (List<Hl7.Fhir.Model.DataRequirement>)value;
+          return this;
+        case "content":
+          Content = (List<Hl7.Fhir.Model.Attachment>)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/Linkage.cs b/src/Hl7.Fhir.R5/Model/Generated/Linkage.cs
index 7b21913cfc..edc6b976d1 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/Linkage.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/Linkage.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Linkage","http://hl7.org/fhir/StructureDefinition/Linkage", IsResource=true)]
+  [FhirType("Linkage","http://hl7.org/fhir/StructureDefinition/Linkage")]
   public partial class Linkage : Hl7.Fhir.Model.DomainResource
   {
     /// <summary>
@@ -95,7 +95,7 @@ public enum LinkageType
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Linkage#Item", IsNestedType=true)]
+    [FhirType("Linkage#Item")]
     [BackboneType("Linkage.item")]
     public partial class ItemComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -237,6 +237,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "type":
+            TypeElement = (Code<Hl7.Fhir.Model.Linkage.LinkageType>)value;
+            return this;
+          case "resource":
+            Resource = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -397,6 +413,25 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "active":
+          ActiveElement = (Hl7.Fhir.Model.FhirBoolean)value;
+          return this;
+        case "author":
+          Author = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "item":
+          Item = (List<Hl7.Fhir.Model.Linkage.ItemComponent>)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/List.cs b/src/Hl7.Fhir.R5/Model/Generated/List.cs
index a96e889227..9461837628 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/List.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/List.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("List","http://hl7.org/fhir/StructureDefinition/List", IsResource=true)]
+  [FhirType("List","http://hl7.org/fhir/StructureDefinition/List")]
   public partial class List : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -96,7 +96,7 @@ public enum ListStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("List#Entry", IsNestedType=true)]
+    [FhirType("List#Entry")]
     [BackboneType("List.entry")]
     public partial class EntryComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -296,6 +296,28 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "flag":
+            Flag = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "deleted":
+            DeletedElement = (Hl7.Fhir.Model.FhirBoolean)value;
+            return this;
+          case "date":
+            DateElement = (Hl7.Fhir.Model.FhirDateTime)value;
+            return this;
+          case "item":
+            Item = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -740,6 +762,55 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "status":
+          StatusElement = (Code<Hl7.Fhir.Model.List.ListStatus>)value;
+          return this;
+        case "mode":
+          ModeElement = (Code<Hl7.Fhir.Model.ListMode>)value;
+          return this;
+        case "title":
+          TitleElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "code":
+          Code = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "subject":
+          Subject = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "encounter":
+          Encounter = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "date":
+          DateElement = (Hl7.Fhir.Model.FhirDateTime)value;
+          return this;
+        case "source":
+          Source = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "orderedBy":
+          OrderedBy = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "note":
+          Note = (List<Hl7.Fhir.Model.Annotation>)value;
+          return this;
+        case "entry":
+          Entry = (List<Hl7.Fhir.Model.List.EntryComponent>)value;
+          return this;
+        case "emptyReason":
+          EmptyReason = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/Location.cs b/src/Hl7.Fhir.R5/Model/Generated/Location.cs
index 40fda88670..1a65799a71 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/Location.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/Location.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Location","http://hl7.org/fhir/StructureDefinition/Location", IsResource=true)]
+  [FhirType("Location","http://hl7.org/fhir/StructureDefinition/Location")]
   public partial class Location : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -118,7 +118,7 @@ public enum LocationMode
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Location#Position", IsNestedType=true)]
+    [FhirType("Location#Position")]
     [BackboneType("Location.position")]
     public partial class PositionComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -313,6 +313,25 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "longitude":
+            LongitudeElement = (Hl7.Fhir.Model.FhirDecimal)value;
+            return this;
+          case "latitude":
+            LatitudeElement = (Hl7.Fhir.Model.FhirDecimal)value;
+            return this;
+          case "altitude":
+            AltitudeElement = (Hl7.Fhir.Model.FhirDecimal)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -882,6 +901,70 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "status":
+          StatusElement = (Code<Hl7.Fhir.Model.Location.LocationStatus>)value;
+          return this;
+        case "operationalStatus":
+          OperationalStatus = (Hl7.Fhir.Model.Coding)value;
+          return this;
+        case "name":
+          NameElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "alias":
+          AliasElement = (List<Hl7.Fhir.Model.FhirString>)value;
+          return this;
+        case "description":
+          DescriptionElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        case "mode":
+          ModeElement = (Code<Hl7.Fhir.Model.Location.LocationMode>)value;
+          return this;
+        case "type":
+          Type = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "contact":
+          Contact = (List<Hl7.Fhir.Model.ExtendedContactDetail>)value;
+          return this;
+        case "address":
+          Address = (Hl7.Fhir.Model.Address)value;
+          return this;
+        case "form":
+          Form = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "position":
+          Position = (Hl7.Fhir.Model.Location.PositionComponent)value;
+          return this;
+        case "managingOrganization":
+          ManagingOrganization = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "partOf":
+          PartOf = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "characteristic":
+          Characteristic = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "hoursOfOperation":
+          HoursOfOperation = (List<Hl7.Fhir.Model.Availability>)value;
+          return this;
+        case "virtualService":
+          VirtualService = (List<Hl7.Fhir.Model.VirtualServiceDetail>)value;
+          return this;
+        case "endpoint":
+          Endpoint = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/ManufacturedItemDefinition.cs b/src/Hl7.Fhir.R5/Model/Generated/ManufacturedItemDefinition.cs
index 4de2f6d2cd..8999086d25 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/ManufacturedItemDefinition.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/ManufacturedItemDefinition.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model
   /// </summary>
   [Serializable]
   [DataContract]
-  [FhirType("ManufacturedItemDefinition","http://hl7.org/fhir/StructureDefinition/ManufacturedItemDefinition", IsResource=true)]
+  [FhirType("ManufacturedItemDefinition","http://hl7.org/fhir/StructureDefinition/ManufacturedItemDefinition")]
   public partial class ManufacturedItemDefinition : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -61,7 +61,7 @@ public partial class ManufacturedItemDefinition : Hl7.Fhir.Model.DomainResource,
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("ManufacturedItemDefinition#Property", IsNestedType=true)]
+    [FhirType("ManufacturedItemDefinition#Property")]
     [BackboneType("ManufacturedItemDefinition.property")]
     public partial class PropertyComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -184,6 +184,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "type":
+            Type = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "value":
+            Value = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -198,7 +214,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("ManufacturedItemDefinition#Component", IsNestedType=true)]
+    [FhirType("ManufacturedItemDefinition#Component")]
     [BackboneType("ManufacturedItemDefinition.component")]
     public partial class ComponentComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -406,6 +422,34 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "type":
+            Type = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "function":
+            Function = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+            return this;
+          case "amount":
+            Amount = (List<Hl7.Fhir.Model.Quantity>)value;
+            return this;
+          case "constituent":
+            Constituent = (List<Hl7.Fhir.Model.ManufacturedItemDefinition.ConstituentComponent>)value;
+            return this;
+          case "property":
+            Property = (List<Hl7.Fhir.Model.ManufacturedItemDefinition.PropertyComponent>)value;
+            return this;
+          case "component":
+            Component = (List<Hl7.Fhir.Model.ManufacturedItemDefinition.ComponentComponent>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -424,7 +468,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("ManufacturedItemDefinition#Constituent", IsNestedType=true)]
+    [FhirType("ManufacturedItemDefinition#Constituent")]
     [BackboneType("ManufacturedItemDefinition.component.constituent")]
     public partial class ConstituentComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -588,6 +632,28 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "amount":
+            Amount = (List<Hl7.Fhir.Model.Quantity>)value;
+            return this;
+          case "location":
+            Location = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+            return this;
+          case "function":
+            Function = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+            return this;
+          case "hasIngredient":
+            HasIngredient = (List<Hl7.Fhir.Model.CodeableReference>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -929,6 +995,46 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "status":
+          StatusElement = (Code<Hl7.Fhir.Model.PublicationStatus>)value;
+          return this;
+        case "name":
+          NameElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "manufacturedDoseForm":
+          ManufacturedDoseForm = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "unitOfPresentation":
+          UnitOfPresentation = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "manufacturer":
+          Manufacturer = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "marketingStatus":
+          MarketingStatus = (List<Hl7.Fhir.Model.MarketingStatus>)value;
+          return this;
+        case "ingredient":
+          Ingredient = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "property":
+          Property = (List<Hl7.Fhir.Model.ManufacturedItemDefinition.PropertyComponent>)value;
+          return this;
+        case "component":
+          Component = (List<Hl7.Fhir.Model.ManufacturedItemDefinition.ComponentComponent>)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/MarketingStatus.cs b/src/Hl7.Fhir.R5/Model/Generated/MarketingStatus.cs
index abea0c143e..5880ece8ff 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/MarketingStatus.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/MarketingStatus.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -247,6 +247,31 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "country":
+          Country = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "jurisdiction":
+          Jurisdiction = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "status":
+          Status = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "dateRange":
+          DateRange = (Hl7.Fhir.Model.Period)value;
+          return this;
+        case "restoreDate":
+          RestoreDateElement = (Hl7.Fhir.Model.FhirDateTime)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/Measure.cs b/src/Hl7.Fhir.R5/Model/Generated/Measure.cs
index 3e9cdf1e91..9f2b567080 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/Measure.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/Measure.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Measure","http://hl7.org/fhir/StructureDefinition/Measure", IsResource=true)]
+  [FhirType("Measure","http://hl7.org/fhir/StructureDefinition/Measure")]
   public partial class Measure : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -67,7 +67,7 @@ public partial class Measure : Hl7.Fhir.Model.DomainResource, IIdentifiable<List
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Measure#Term", IsNestedType=true)]
+    [FhirType("Measure#Term")]
     [BackboneType("Measure.term")]
     public partial class TermComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -204,6 +204,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "code":
+            Code = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "definition":
+            DefinitionElement = (Hl7.Fhir.Model.Markdown)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -221,7 +237,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Measure#Group", IsNestedType=true)]
+    [FhirType("Measure#Group")]
     [BackboneType("Measure.group")]
     public partial class GroupComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -675,6 +691,55 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "linkId":
+            LinkIdElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "code":
+            Code = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "description":
+            DescriptionElement = (Hl7.Fhir.Model.Markdown)value;
+            return this;
+          case "type":
+            Type = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+            return this;
+          case "subject":
+            Subject = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          case "basis":
+            BasisElement = (Code<Hl7.Fhir.Model.FHIRAllTypes>)value;
+            return this;
+          case "scoring":
+            Scoring = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "scoringUnit":
+            ScoringUnit = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "rateAggregation":
+            RateAggregationElement = (Hl7.Fhir.Model.Markdown)value;
+            return this;
+          case "improvementNotation":
+            ImprovementNotation = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "library":
+            LibraryElement = (List<Hl7.Fhir.Model.Canonical>)value;
+            return this;
+          case "population":
+            Population = (List<Hl7.Fhir.Model.Measure.PopulationComponent>)value;
+            return this;
+          case "stratifier":
+            Stratifier = (List<Hl7.Fhir.Model.Measure.StratifierComponent>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -703,7 +768,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Measure#Population", IsNestedType=true)]
+    [FhirType("Measure#Population")]
     [BackboneType("Measure.group.population")]
     public partial class PopulationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -984,6 +1049,37 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "linkId":
+            LinkIdElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "code":
+            Code = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "description":
+            DescriptionElement = (Hl7.Fhir.Model.Markdown)value;
+            return this;
+          case "criteria":
+            Criteria = (Hl7.Fhir.Model.Expression)value;
+            return this;
+          case "groupDefinition":
+            GroupDefinition = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          case "inputPopulationId":
+            InputPopulationIdElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "aggregateMethod":
+            AggregateMethod = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1006,7 +1102,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Measure#Stratifier", IsNestedType=true)]
+    [FhirType("Measure#Stratifier")]
     [BackboneType("Measure.group.stratifier")]
     public partial class StratifierComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1248,6 +1344,34 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "linkId":
+            LinkIdElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "code":
+            Code = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "description":
+            DescriptionElement = (Hl7.Fhir.Model.Markdown)value;
+            return this;
+          case "criteria":
+            Criteria = (Hl7.Fhir.Model.Expression)value;
+            return this;
+          case "groupDefinition":
+            GroupDefinition = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          case "component":
+            Component = (List<Hl7.Fhir.Model.Measure.ComponentComponent>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1270,7 +1394,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Measure#Component", IsNestedType=true)]
+    [FhirType("Measure#Component")]
     [BackboneType("Measure.group.stratifier.component")]
     public partial class ComponentComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1490,6 +1614,31 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "linkId":
+            LinkIdElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "code":
+            Code = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "description":
+            DescriptionElement = (Hl7.Fhir.Model.Markdown)value;
+            return this;
+          case "criteria":
+            Criteria = (Hl7.Fhir.Model.Expression)value;
+            return this;
+          case "groupDefinition":
+            GroupDefinition = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1511,7 +1660,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Measure#SupplementalData", IsNestedType=true)]
+    [FhirType("Measure#SupplementalData")]
     [BackboneType("Measure.supplementalData")]
     public partial class SupplementalDataComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1732,6 +1881,31 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "linkId":
+            LinkIdElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "code":
+            Code = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "usage":
+            Usage = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+            return this;
+          case "description":
+            DescriptionElement = (Hl7.Fhir.Model.Markdown)value;
+            return this;
+          case "criteria":
+            Criteria = (Hl7.Fhir.Model.Expression)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -3223,6 +3397,151 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "url":
+          UrlElement = (Hl7.Fhir.Model.FhirUri)value;
+          return this;
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "version":
+          VersionElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "versionAlgorithm":
+          VersionAlgorithm = (Hl7.Fhir.Model.DataType)value;
+          return this;
+        case "name":
+          NameElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "title":
+          TitleElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "subtitle":
+          SubtitleElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "status":
+          StatusElement = (Code<Hl7.Fhir.Model.PublicationStatus>)value;
+          return this;
+        case "experimental":
+          ExperimentalElement = (Hl7.Fhir.Model.FhirBoolean)value;
+          return this;
+        case "subject":
+          Subject = (Hl7.Fhir.Model.DataType)value;
+          return this;
+        case "basis":
+          BasisElement = (Code<Hl7.Fhir.Model.FHIRAllTypes>)value;
+          return this;
+        case "date":
+          DateElement = (Hl7.Fhir.Model.FhirDateTime)value;
+          return this;
+        case "publisher":
+          PublisherElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "contact":
+          Contact = (List<Hl7.Fhir.Model.ContactDetail>)value;
+          return this;
+        case "description":
+          DescriptionElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        case "useContext":
+          UseContext = (List<Hl7.Fhir.Model.UsageContext>)value;
+          return this;
+        case "jurisdiction":
+          Jurisdiction = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "purpose":
+          PurposeElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        case "usage":
+          UsageElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        case "copyright":
+          CopyrightElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        case "copyrightLabel":
+          CopyrightLabelElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "approvalDate":
+          ApprovalDateElement = (Hl7.Fhir.Model.Date)value;
+          return this;
+        case "lastReviewDate":
+          LastReviewDateElement = (Hl7.Fhir.Model.Date)value;
+          return this;
+        case "effectivePeriod":
+          EffectivePeriod = (Hl7.Fhir.Model.Period)value;
+          return this;
+        case "topic":
+          Topic = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "author":
+          Author = (List<Hl7.Fhir.Model.ContactDetail>)value;
+          return this;
+        case "editor":
+          Editor = (List<Hl7.Fhir.Model.ContactDetail>)value;
+          return this;
+        case "reviewer":
+          Reviewer = (List<Hl7.Fhir.Model.ContactDetail>)value;
+          return this;
+        case "endorser":
+          Endorser = (List<Hl7.Fhir.Model.ContactDetail>)value;
+          return this;
+        case "relatedArtifact":
+          RelatedArtifact = (List<Hl7.Fhir.Model.RelatedArtifact>)value;
+          return this;
+        case "library":
+          LibraryElement = (List<Hl7.Fhir.Model.Canonical>)value;
+          return this;
+        case "disclaimer":
+          DisclaimerElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        case "scoring":
+          Scoring = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "scoringUnit":
+          ScoringUnit = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "compositeScoring":
+          CompositeScoring = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "type":
+          Type = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "riskAdjustment":
+          RiskAdjustmentElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        case "rateAggregation":
+          RateAggregationElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        case "rationale":
+          RationaleElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        case "clinicalRecommendationStatement":
+          ClinicalRecommendationStatementElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        case "improvementNotation":
+          ImprovementNotation = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "term":
+          Term = (List<Hl7.Fhir.Model.Measure.TermComponent>)value;
+          return this;
+        case "guidance":
+          GuidanceElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        case "group":
+          Group = (List<Hl7.Fhir.Model.Measure.GroupComponent>)value;
+          return this;
+        case "supplementalData":
+          SupplementalData = (List<Hl7.Fhir.Model.Measure.SupplementalDataComponent>)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/MeasureReport.cs b/src/Hl7.Fhir.R5/Model/Generated/MeasureReport.cs
index f930eced41..aec273badb 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/MeasureReport.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/MeasureReport.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("MeasureReport","http://hl7.org/fhir/StructureDefinition/MeasureReport", IsResource=true)]
+  [FhirType("MeasureReport","http://hl7.org/fhir/StructureDefinition/MeasureReport")]
   public partial class MeasureReport : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -151,7 +151,7 @@ public enum SubmitDataUpdateType
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MeasureReport#Group", IsNestedType=true)]
+    [FhirType("MeasureReport#Group")]
     [BackboneType("MeasureReport.group")]
     public partial class GroupComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -378,6 +378,34 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "linkId":
+            LinkIdElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "code":
+            Code = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "subject":
+            Subject = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          case "population":
+            Population = (List<Hl7.Fhir.Model.MeasureReport.PopulationComponent>)value;
+            return this;
+          case "measureScore":
+            MeasureScore = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          case "stratifier":
+            Stratifier = (List<Hl7.Fhir.Model.MeasureReport.StratifierComponent>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -399,7 +427,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MeasureReport#Population", IsNestedType=true)]
+    [FhirType("MeasureReport#Population")]
     [BackboneType("MeasureReport.group.population")]
     public partial class PopulationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -645,6 +673,34 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "linkId":
+            LinkIdElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "code":
+            Code = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "count":
+            CountElement = (Hl7.Fhir.Model.Integer)value;
+            return this;
+          case "subjectResults":
+            SubjectResults = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          case "subjectReport":
+            SubjectReport = (List<Hl7.Fhir.Model.ResourceReference>)value;
+            return this;
+          case "subjects":
+            Subjects = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -666,7 +722,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MeasureReport#Stratifier", IsNestedType=true)]
+    [FhirType("MeasureReport#Stratifier")]
     [BackboneType("MeasureReport.group.stratifier")]
     public partial class StratifierComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -825,6 +881,25 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "linkId":
+            LinkIdElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "code":
+            Code = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "stratum":
+            Stratum = (List<Hl7.Fhir.Model.MeasureReport.StratifierGroupComponent>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -843,7 +918,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MeasureReport#StratifierGroup", IsNestedType=true)]
+    [FhirType("MeasureReport#StratifierGroup")]
     [BackboneType("MeasureReport.group.stratifier.stratum")]
     public partial class StratifierGroupComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1010,6 +1085,28 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "value":
+            Value = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          case "component":
+            Component = (List<Hl7.Fhir.Model.MeasureReport.ComponentComponent>)value;
+            return this;
+          case "population":
+            Population = (List<Hl7.Fhir.Model.MeasureReport.StratifierGroupPopulationComponent>)value;
+            return this;
+          case "measureScore":
+            MeasureScore = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1029,7 +1126,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MeasureReport#Component", IsNestedType=true)]
+    [FhirType("MeasureReport#Component")]
     [BackboneType("MeasureReport.group.stratifier.stratum.component")]
     public partial class ComponentComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1192,6 +1289,25 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "linkId":
+            LinkIdElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "code":
+            Code = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "value":
+            Value = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1210,7 +1326,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MeasureReport#StratifierGroupPopulation", IsNestedType=true)]
+    [FhirType("MeasureReport#StratifierGroupPopulation")]
     [BackboneType("MeasureReport.group.stratifier.stratum.population")]
     public partial class StratifierGroupPopulationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1456,6 +1572,34 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "linkId":
+            LinkIdElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "code":
+            Code = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "count":
+            CountElement = (Hl7.Fhir.Model.Integer)value;
+            return this;
+          case "subjectResults":
+            SubjectResults = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          case "subjectReport":
+            SubjectReport = (List<Hl7.Fhir.Model.ResourceReference>)value;
+            return this;
+          case "subjects":
+            Subjects = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -2014,6 +2158,67 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "status":
+          StatusElement = (Code<Hl7.Fhir.Model.MeasureReport.MeasureReportStatus>)value;
+          return this;
+        case "type":
+          TypeElement = (Code<Hl7.Fhir.Model.MeasureReport.MeasureReportType>)value;
+          return this;
+        case "dataUpdateType":
+          DataUpdateTypeElement = (Code<Hl7.Fhir.Model.MeasureReport.SubmitDataUpdateType>)value;
+          return this;
+        case "measure":
+          MeasureElement = (Hl7.Fhir.Model.Canonical)value;
+          return this;
+        case "subject":
+          Subject = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "date":
+          DateElement = (Hl7.Fhir.Model.FhirDateTime)value;
+          return this;
+        case "reporter":
+          Reporter = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "reportingVendor":
+          ReportingVendor = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "location":
+          Location = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "period":
+          Period = (Hl7.Fhir.Model.Period)value;
+          return this;
+        case "inputParameters":
+          InputParameters = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "scoring":
+          Scoring = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "improvementNotation":
+          ImprovementNotation = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "group":
+          Group = (List<Hl7.Fhir.Model.MeasureReport.GroupComponent>)value;
+          return this;
+        case "supplementalData":
+          SupplementalData = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "evaluatedResource":
+          EvaluatedResource = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/Medication.cs b/src/Hl7.Fhir.R5/Model/Generated/Medication.cs
index 3f59e6ccdf..5ded0fb370 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/Medication.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/Medication.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Medication","http://hl7.org/fhir/StructureDefinition/Medication", IsResource=true)]
+  [FhirType("Medication","http://hl7.org/fhir/StructureDefinition/Medication")]
   public partial class Medication : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -96,7 +96,7 @@ public enum MedicationStatusCodes
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Medication#Ingredient", IsNestedType=true)]
+    [FhirType("Medication#Ingredient")]
     [BackboneType("Medication.ingredient")]
     public partial class IngredientComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -258,6 +258,25 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "item":
+            Item = (Hl7.Fhir.Model.CodeableReference)value;
+            return this;
+          case "isActive":
+            IsActiveElement = (Hl7.Fhir.Model.FhirBoolean)value;
+            return this;
+          case "strength":
+            Strength = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -276,7 +295,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Medication#Batch", IsNestedType=true)]
+    [FhirType("Medication#Batch")]
     [BackboneType("Medication.batch")]
     public partial class BatchComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -430,6 +449,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "lotNumber":
+            LotNumberElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "expirationDate":
+            ExpirationDateElement = (Hl7.Fhir.Model.FhirDateTime)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -725,6 +760,43 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "code":
+          Code = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "status":
+          StatusElement = (Code<Hl7.Fhir.Model.Medication.MedicationStatusCodes>)value;
+          return this;
+        case "marketingAuthorizationHolder":
+          MarketingAuthorizationHolder = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "doseForm":
+          DoseForm = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "totalVolume":
+          TotalVolume = (Hl7.Fhir.Model.Quantity)value;
+          return this;
+        case "ingredient":
+          Ingredient = (List<Hl7.Fhir.Model.Medication.IngredientComponent>)value;
+          return this;
+        case "batch":
+          Batch = (Hl7.Fhir.Model.Medication.BatchComponent)value;
+          return this;
+        case "definition":
+          Definition = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/MedicationAdministration.cs b/src/Hl7.Fhir.R5/Model/Generated/MedicationAdministration.cs
index 51f84cb7cc..1f12efd381 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/MedicationAdministration.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/MedicationAdministration.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("MedicationAdministration","http://hl7.org/fhir/StructureDefinition/MedicationAdministration", IsResource=true)]
+  [FhirType("MedicationAdministration","http://hl7.org/fhir/StructureDefinition/MedicationAdministration")]
   public partial class MedicationAdministration : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -119,7 +119,7 @@ public enum MedicationAdministrationStatusCodes
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationAdministration#Performer", IsNestedType=true)]
+    [FhirType("MedicationAdministration#Performer")]
     [BackboneType("MedicationAdministration.performer")]
     public partial class PerformerComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -239,6 +239,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "function":
+            Function = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "actor":
+            Actor = (Hl7.Fhir.Model.CodeableReference)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -256,7 +272,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationAdministration#Dosage", IsNestedType=true)]
+    [FhirType("MedicationAdministration#Dosage")]
     [BackboneType("MedicationAdministration.dosage")]
     public partial class DosageComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -481,6 +497,34 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "text":
+            TextElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "site":
+            Site = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "route":
+            Route = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "method":
+            Method = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "dose":
+            Dose = (Hl7.Fhir.Model.Quantity)value;
+            return this;
+          case "rate":
+            Rate = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1097,6 +1141,79 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "basedOn":
+          BasedOn = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "partOf":
+          PartOf = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "status":
+          StatusElement = (Code<Hl7.Fhir.Model.MedicationAdministration.MedicationAdministrationStatusCodes>)value;
+          return this;
+        case "statusReason":
+          StatusReason = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "category":
+          Category = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "medication":
+          Medication = (Hl7.Fhir.Model.CodeableReference)value;
+          return this;
+        case "subject":
+          Subject = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "encounter":
+          Encounter = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "supportingInformation":
+          SupportingInformation = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "occurence":
+          Occurence = (Hl7.Fhir.Model.DataType)value;
+          return this;
+        case "recorded":
+          RecordedElement = (Hl7.Fhir.Model.FhirDateTime)value;
+          return this;
+        case "isSubPotent":
+          IsSubPotentElement = (Hl7.Fhir.Model.FhirBoolean)value;
+          return this;
+        case "subPotentReason":
+          SubPotentReason = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "performer":
+          Performer = (List<Hl7.Fhir.Model.MedicationAdministration.PerformerComponent>)value;
+          return this;
+        case "reason":
+          Reason = (List<Hl7.Fhir.Model.CodeableReference>)value;
+          return this;
+        case "request":
+          Request = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "device":
+          Device = (List<Hl7.Fhir.Model.CodeableReference>)value;
+          return this;
+        case "note":
+          Note = (List<Hl7.Fhir.Model.Annotation>)value;
+          return this;
+        case "dosage":
+          Dosage = (Hl7.Fhir.Model.MedicationAdministration.DosageComponent)value;
+          return this;
+        case "eventHistory":
+          EventHistory = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/MedicationDispense.cs b/src/Hl7.Fhir.R5/Model/Generated/MedicationDispense.cs
index 15fac37333..1382da5988 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/MedicationDispense.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/MedicationDispense.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("MedicationDispense","http://hl7.org/fhir/StructureDefinition/MedicationDispense", IsResource=true)]
+  [FhirType("MedicationDispense","http://hl7.org/fhir/StructureDefinition/MedicationDispense")]
   public partial class MedicationDispense : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -131,7 +131,7 @@ public enum MedicationDispenseStatusCodes
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationDispense#Performer", IsNestedType=true)]
+    [FhirType("MedicationDispense#Performer")]
     [BackboneType("MedicationDispense.performer")]
     public partial class PerformerComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -253,6 +253,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "function":
+            Function = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "actor":
+            Actor = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -270,7 +286,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationDispense#Substitution", IsNestedType=true)]
+    [FhirType("MedicationDispense#Substitution")]
     [BackboneType("MedicationDispense.substitution")]
     public partial class SubstitutionComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -454,6 +470,28 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "wasSubstituted":
+            WasSubstitutedElement = (Hl7.Fhir.Model.FhirBoolean)value;
+            return this;
+          case "type":
+            Type = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "reason":
+            Reason = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+            return this;
+          case "responsibleParty":
+            ResponsibleParty = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1249,6 +1287,97 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "basedOn":
+          BasedOn = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "partOf":
+          PartOf = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "status":
+          StatusElement = (Code<Hl7.Fhir.Model.MedicationDispense.MedicationDispenseStatusCodes>)value;
+          return this;
+        case "notPerformedReason":
+          NotPerformedReason = (Hl7.Fhir.Model.CodeableReference)value;
+          return this;
+        case "statusChanged":
+          StatusChangedElement = (Hl7.Fhir.Model.FhirDateTime)value;
+          return this;
+        case "category":
+          Category = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "medication":
+          Medication = (Hl7.Fhir.Model.CodeableReference)value;
+          return this;
+        case "subject":
+          Subject = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "encounter":
+          Encounter = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "supportingInformation":
+          SupportingInformation = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "performer":
+          Performer = (List<Hl7.Fhir.Model.MedicationDispense.PerformerComponent>)value;
+          return this;
+        case "location":
+          Location = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "authorizingPrescription":
+          AuthorizingPrescription = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "type":
+          Type = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "quantity":
+          Quantity = (Hl7.Fhir.Model.Quantity)value;
+          return this;
+        case "daysSupply":
+          DaysSupply = (Hl7.Fhir.Model.Quantity)value;
+          return this;
+        case "recorded":
+          RecordedElement = (Hl7.Fhir.Model.FhirDateTime)value;
+          return this;
+        case "whenPrepared":
+          WhenPreparedElement = (Hl7.Fhir.Model.FhirDateTime)value;
+          return this;
+        case "whenHandedOver":
+          WhenHandedOverElement = (Hl7.Fhir.Model.FhirDateTime)value;
+          return this;
+        case "destination":
+          Destination = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "receiver":
+          Receiver = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "note":
+          Note = (List<Hl7.Fhir.Model.Annotation>)value;
+          return this;
+        case "renderedDosageInstruction":
+          RenderedDosageInstructionElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        case "dosageInstruction":
+          DosageInstruction = (List<Hl7.Fhir.Model.Dosage>)value;
+          return this;
+        case "substitution":
+          Substitution = (Hl7.Fhir.Model.MedicationDispense.SubstitutionComponent)value;
+          return this;
+        case "eventHistory":
+          EventHistory = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/MedicationKnowledge.cs b/src/Hl7.Fhir.R5/Model/Generated/MedicationKnowledge.cs
index e66b7583e2..2d1df6a5db 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/MedicationKnowledge.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/MedicationKnowledge.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("MedicationKnowledge","http://hl7.org/fhir/StructureDefinition/MedicationKnowledge", IsResource=true)]
+  [FhirType("MedicationKnowledge","http://hl7.org/fhir/StructureDefinition/MedicationKnowledge")]
   public partial class MedicationKnowledge : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -95,7 +95,7 @@ public enum MedicationKnowledgeStatusCodes
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationKnowledge#RelatedMedicationKnowledge", IsNestedType=true)]
+    [FhirType("MedicationKnowledge#RelatedMedicationKnowledge")]
     [BackboneType("MedicationKnowledge.relatedMedicationKnowledge")]
     public partial class RelatedMedicationKnowledgeComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -217,6 +217,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "type":
+            Type = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "reference":
+            Reference = (List<Hl7.Fhir.Model.ResourceReference>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -231,7 +247,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationKnowledge#Monograph", IsNestedType=true)]
+    [FhirType("MedicationKnowledge#Monograph")]
     [BackboneType("MedicationKnowledge.monograph")]
     public partial class MonographComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -351,6 +367,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "type":
+            Type = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "source":
+            Source = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -368,7 +400,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationKnowledge#Cost", IsNestedType=true)]
+    [FhirType("MedicationKnowledge#Cost")]
     [BackboneType("MedicationKnowledge.cost")]
     public partial class CostComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -552,6 +584,28 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "effectiveDate":
+            EffectiveDate = (List<Hl7.Fhir.Model.Period>)value;
+            return this;
+          case "type":
+            Type = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "source":
+            SourceElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "cost":
+            Cost = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -571,7 +625,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationKnowledge#MonitoringProgram", IsNestedType=true)]
+    [FhirType("MedicationKnowledge#MonitoringProgram")]
     [BackboneType("MedicationKnowledge.monitoringProgram")]
     public partial class MonitoringProgramComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -707,6 +761,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "type":
+            Type = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "name":
+            NameElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -724,7 +794,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationKnowledge#IndicationGuideline", IsNestedType=true)]
+    [FhirType("MedicationKnowledge#IndicationGuideline")]
     [BackboneType("MedicationKnowledge.indicationGuideline")]
     public partial class IndicationGuidelineComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -844,6 +914,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "indication":
+            Indication = (List<Hl7.Fhir.Model.CodeableReference>)value;
+            return this;
+          case "dosingGuideline":
+            DosingGuideline = (List<Hl7.Fhir.Model.MedicationKnowledge.DosingGuidelineComponent>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -861,7 +947,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationKnowledge#DosingGuideline", IsNestedType=true)]
+    [FhirType("MedicationKnowledge#DosingGuideline")]
     [BackboneType("MedicationKnowledge.indicationGuideline.dosingGuideline")]
     public partial class DosingGuidelineComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1023,6 +1109,28 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "treatmentIntent":
+            TreatmentIntent = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "dosage":
+            Dosage = (List<Hl7.Fhir.Model.MedicationKnowledge.DosageComponent>)value;
+            return this;
+          case "administrationTreatment":
+            AdministrationTreatment = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "patientCharacteristic":
+            PatientCharacteristic = (List<Hl7.Fhir.Model.MedicationKnowledge.PatientCharacteristicComponent>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1039,7 +1147,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationKnowledge#Dosage", IsNestedType=true)]
+    [FhirType("MedicationKnowledge#Dosage")]
     [BackboneType("MedicationKnowledge.indicationGuideline.dosingGuideline.dosage")]
     public partial class DosageComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1159,6 +1267,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "type":
+            Type = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "dosage":
+            Dosage = (List<Hl7.Fhir.Model.Dosage>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1176,7 +1300,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationKnowledge#PatientCharacteristic", IsNestedType=true)]
+    [FhirType("MedicationKnowledge#PatientCharacteristic")]
     [BackboneType("MedicationKnowledge.indicationGuideline.dosingGuideline.patientCharacteristic")]
     public partial class PatientCharacteristicComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1297,6 +1421,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "type":
+            Type = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "value":
+            Value = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1311,7 +1451,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationKnowledge#MedicineClassification", IsNestedType=true)]
+    [FhirType("MedicationKnowledge#MedicineClassification")]
     [BackboneType("MedicationKnowledge.medicineClassification")]
     public partial class MedicineClassificationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1454,6 +1594,25 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "type":
+            Type = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "source":
+            Source = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          case "classification":
+            Classification = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1472,7 +1631,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationKnowledge#Packaging", IsNestedType=true)]
+    [FhirType("MedicationKnowledge#Packaging")]
     [BackboneType("MedicationKnowledge.packaging")]
     public partial class PackagingComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1593,6 +1752,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "cost":
+            Cost = (List<Hl7.Fhir.Model.MedicationKnowledge.CostComponent>)value;
+            return this;
+          case "packagedProduct":
+            PackagedProduct = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1610,7 +1785,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationKnowledge#StorageGuideline", IsNestedType=true)]
+    [FhirType("MedicationKnowledge#StorageGuideline")]
     [BackboneType("MedicationKnowledge.storageGuideline")]
     public partial class StorageGuidelineComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1790,6 +1965,28 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "reference":
+            ReferenceElement = (Hl7.Fhir.Model.FhirUri)value;
+            return this;
+          case "note":
+            Note = (List<Hl7.Fhir.Model.Annotation>)value;
+            return this;
+          case "stabilityDuration":
+            StabilityDuration = (Hl7.Fhir.Model.Duration)value;
+            return this;
+          case "environmentalSetting":
+            EnvironmentalSetting = (List<Hl7.Fhir.Model.MedicationKnowledge.EnvironmentalSettingComponent>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1809,7 +2006,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationKnowledge#EnvironmentalSetting", IsNestedType=true)]
+    [FhirType("MedicationKnowledge#EnvironmentalSetting")]
     [BackboneType("MedicationKnowledge.storageGuideline.environmentalSetting")]
     public partial class EnvironmentalSettingComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1931,6 +2128,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "type":
+            Type = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "value":
+            Value = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1945,7 +2158,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationKnowledge#Regulatory", IsNestedType=true)]
+    [FhirType("MedicationKnowledge#Regulatory")]
     [BackboneType("MedicationKnowledge.regulatory")]
     public partial class RegulatoryComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2110,6 +2323,28 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "regulatoryAuthority":
+            RegulatoryAuthority = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          case "substitution":
+            Substitution = (List<Hl7.Fhir.Model.MedicationKnowledge.SubstitutionComponent>)value;
+            return this;
+          case "schedule":
+            Schedule = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+            return this;
+          case "maxDispense":
+            MaxDispense = (Hl7.Fhir.Model.MedicationKnowledge.MaxDispenseComponent)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -2126,7 +2361,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationKnowledge#Substitution", IsNestedType=true)]
+    [FhirType("MedicationKnowledge#Substitution")]
     [BackboneType("MedicationKnowledge.regulatory.substitution")]
     public partial class SubstitutionComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2264,6 +2499,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "type":
+            Type = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "allowed":
+            AllowedElement = (Hl7.Fhir.Model.FhirBoolean)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -2278,7 +2529,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationKnowledge#MaxDispense", IsNestedType=true)]
+    [FhirType("MedicationKnowledge#MaxDispense")]
     [BackboneType("MedicationKnowledge.regulatory.maxDispense")]
     public partial class MaxDispenseComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2397,6 +2648,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "quantity":
+            Quantity = (Hl7.Fhir.Model.Quantity)value;
+            return this;
+          case "period":
+            Period = (Hl7.Fhir.Model.Duration)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -2414,7 +2681,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationKnowledge#Definitional", IsNestedType=true)]
+    [FhirType("MedicationKnowledge#Definitional")]
     [BackboneType("MedicationKnowledge.definitional")]
     public partial class DefinitionalComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2603,6 +2870,31 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "definition":
+            Definition = (List<Hl7.Fhir.Model.ResourceReference>)value;
+            return this;
+          case "doseForm":
+            DoseForm = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "intendedRoute":
+            IntendedRoute = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+            return this;
+          case "ingredient":
+            Ingredient = (List<Hl7.Fhir.Model.MedicationKnowledge.IngredientComponent>)value;
+            return this;
+          case "drugCharacteristic":
+            DrugCharacteristic = (List<Hl7.Fhir.Model.MedicationKnowledge.DrugCharacteristicComponent>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -2623,7 +2915,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationKnowledge#Ingredient", IsNestedType=true)]
+    [FhirType("MedicationKnowledge#Ingredient")]
     [BackboneType("MedicationKnowledge.definitional.ingredient")]
     public partial class IngredientComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2767,6 +3059,25 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "item":
+            Item = (Hl7.Fhir.Model.CodeableReference)value;
+            return this;
+          case "type":
+            Type = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "strength":
+            Strength = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -2785,7 +3096,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationKnowledge#DrugCharacteristic", IsNestedType=true)]
+    [FhirType("MedicationKnowledge#DrugCharacteristic")]
     [BackboneType("MedicationKnowledge.definitional.drugCharacteristic")]
     public partial class DrugCharacteristicComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2906,6 +3217,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "type":
+            Type = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "value":
+            Value = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -3482,6 +3809,76 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "code":
+          Code = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "status":
+          StatusElement = (Code<Hl7.Fhir.Model.MedicationKnowledge.MedicationKnowledgeStatusCodes>)value;
+          return this;
+        case "author":
+          Author = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "intendedJurisdiction":
+          IntendedJurisdiction = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "name":
+          NameElement = (List<Hl7.Fhir.Model.FhirString>)value;
+          return this;
+        case "relatedMedicationKnowledge":
+          RelatedMedicationKnowledge = (List<Hl7.Fhir.Model.MedicationKnowledge.RelatedMedicationKnowledgeComponent>)value;
+          return this;
+        case "associatedMedication":
+          AssociatedMedication = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "productType":
+          ProductType = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "monograph":
+          Monograph = (List<Hl7.Fhir.Model.MedicationKnowledge.MonographComponent>)value;
+          return this;
+        case "preparationInstruction":
+          PreparationInstructionElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        case "cost":
+          Cost = (List<Hl7.Fhir.Model.MedicationKnowledge.CostComponent>)value;
+          return this;
+        case "monitoringProgram":
+          MonitoringProgram = (List<Hl7.Fhir.Model.MedicationKnowledge.MonitoringProgramComponent>)value;
+          return this;
+        case "indicationGuideline":
+          IndicationGuideline = (List<Hl7.Fhir.Model.MedicationKnowledge.IndicationGuidelineComponent>)value;
+          return this;
+        case "medicineClassification":
+          MedicineClassification = (List<Hl7.Fhir.Model.MedicationKnowledge.MedicineClassificationComponent>)value;
+          return this;
+        case "packaging":
+          Packaging = (List<Hl7.Fhir.Model.MedicationKnowledge.PackagingComponent>)value;
+          return this;
+        case "clinicalUseIssue":
+          ClinicalUseIssue = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "storageGuideline":
+          StorageGuideline = (List<Hl7.Fhir.Model.MedicationKnowledge.StorageGuidelineComponent>)value;
+          return this;
+        case "regulatory":
+          Regulatory = (List<Hl7.Fhir.Model.MedicationKnowledge.RegulatoryComponent>)value;
+          return this;
+        case "definitional":
+          Definitional = (Hl7.Fhir.Model.MedicationKnowledge.DefinitionalComponent)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/MedicationRequest.cs b/src/Hl7.Fhir.R5/Model/Generated/MedicationRequest.cs
index 4cbc8441a9..87b56d389c 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/MedicationRequest.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/MedicationRequest.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("MedicationRequest","http://hl7.org/fhir/StructureDefinition/MedicationRequest", IsResource=true)]
+  [FhirType("MedicationRequest","http://hl7.org/fhir/StructureDefinition/MedicationRequest")]
   public partial class MedicationRequest : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -189,7 +189,7 @@ public enum MedicationRequestIntent
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationRequest#DispenseRequest", IsNestedType=true)]
+    [FhirType("MedicationRequest#DispenseRequest")]
     [BackboneType("MedicationRequest.dispenseRequest")]
     public partial class DispenseRequestComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -476,6 +476,43 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "initialFill":
+            InitialFill = (Hl7.Fhir.Model.MedicationRequest.InitialFillComponent)value;
+            return this;
+          case "dispenseInterval":
+            DispenseInterval = (Hl7.Fhir.Model.Duration)value;
+            return this;
+          case "validityPeriod":
+            ValidityPeriod = (Hl7.Fhir.Model.Period)value;
+            return this;
+          case "numberOfRepeatsAllowed":
+            NumberOfRepeatsAllowedElement = (Hl7.Fhir.Model.UnsignedInt)value;
+            return this;
+          case "quantity":
+            Quantity = (Hl7.Fhir.Model.Quantity)value;
+            return this;
+          case "expectedSupplyDuration":
+            ExpectedSupplyDuration = (Hl7.Fhir.Model.Duration)value;
+            return this;
+          case "dispenser":
+            Dispenser = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          case "dispenserInstruction":
+            DispenserInstruction = (List<Hl7.Fhir.Model.Annotation>)value;
+            return this;
+          case "doseAdministrationAid":
+            DoseAdministrationAid = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -501,7 +538,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationRequest#InitialFill", IsNestedType=true)]
+    [FhirType("MedicationRequest#InitialFill")]
     [BackboneType("MedicationRequest.dispenseRequest.initialFill")]
     public partial class InitialFillComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -619,6 +656,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "quantity":
+            Quantity = (Hl7.Fhir.Model.Quantity)value;
+            return this;
+          case "duration":
+            Duration = (Hl7.Fhir.Model.Duration)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -636,7 +689,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationRequest#Substitution", IsNestedType=true)]
+    [FhirType("MedicationRequest#Substitution")]
     [BackboneType("MedicationRequest.substitution")]
     public partial class SubstitutionComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -759,6 +812,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "allowed":
+            Allowed = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          case "reason":
+            Reason = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1724,6 +1793,115 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "basedOn":
+          BasedOn = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "priorPrescription":
+          PriorPrescription = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "groupIdentifier":
+          GroupIdentifier = (Hl7.Fhir.Model.Identifier)value;
+          return this;
+        case "status":
+          StatusElement = (Code<Hl7.Fhir.Model.MedicationRequest.MedicationrequestStatus>)value;
+          return this;
+        case "statusReason":
+          StatusReason = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "statusChanged":
+          StatusChangedElement = (Hl7.Fhir.Model.FhirDateTime)value;
+          return this;
+        case "intent":
+          IntentElement = (Code<Hl7.Fhir.Model.MedicationRequest.MedicationRequestIntent>)value;
+          return this;
+        case "category":
+          Category = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "priority":
+          PriorityElement = (Code<Hl7.Fhir.Model.RequestPriority>)value;
+          return this;
+        case "doNotPerform":
+          DoNotPerformElement = (Hl7.Fhir.Model.FhirBoolean)value;
+          return this;
+        case "medication":
+          Medication = (Hl7.Fhir.Model.CodeableReference)value;
+          return this;
+        case "subject":
+          Subject = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "informationSource":
+          InformationSource = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "encounter":
+          Encounter = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "supportingInformation":
+          SupportingInformation = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "authoredOn":
+          AuthoredOnElement = (Hl7.Fhir.Model.FhirDateTime)value;
+          return this;
+        case "requester":
+          Requester = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "reported":
+          ReportedElement = (Hl7.Fhir.Model.FhirBoolean)value;
+          return this;
+        case "performerType":
+          PerformerType = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "performer":
+          Performer = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "device":
+          Device = (List<Hl7.Fhir.Model.CodeableReference>)value;
+          return this;
+        case "recorder":
+          Recorder = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "reason":
+          Reason = (List<Hl7.Fhir.Model.CodeableReference>)value;
+          return this;
+        case "courseOfTherapyType":
+          CourseOfTherapyType = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "insurance":
+          Insurance = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "note":
+          Note = (List<Hl7.Fhir.Model.Annotation>)value;
+          return this;
+        case "renderedDosageInstruction":
+          RenderedDosageInstructionElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        case "effectiveDosePeriod":
+          EffectiveDosePeriod = (Hl7.Fhir.Model.Period)value;
+          return this;
+        case "dosageInstruction":
+          DosageInstruction = (List<Hl7.Fhir.Model.Dosage>)value;
+          return this;
+        case "dispenseRequest":
+          DispenseRequest = (Hl7.Fhir.Model.MedicationRequest.DispenseRequestComponent)value;
+          return this;
+        case "substitution":
+          Substitution = (Hl7.Fhir.Model.MedicationRequest.SubstitutionComponent)value;
+          return this;
+        case "eventHistory":
+          EventHistory = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/MedicationStatement.cs b/src/Hl7.Fhir.R5/Model/Generated/MedicationStatement.cs
index 4b3b9adb35..7bad0808b1 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/MedicationStatement.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/MedicationStatement.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -53,7 +53,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("MedicationStatement","http://hl7.org/fhir/StructureDefinition/MedicationStatement", IsResource=true)]
+  [FhirType("MedicationStatement","http://hl7.org/fhir/StructureDefinition/MedicationStatement")]
   public partial class MedicationStatement : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -97,7 +97,7 @@ public enum MedicationStatementStatusCodes
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationStatement#Adherence", IsNestedType=true)]
+    [FhirType("MedicationStatement#Adherence")]
     [BackboneType("MedicationStatement.adherence")]
     public partial class AdherenceComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -218,6 +218,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "code":
+            Code = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "reason":
+            Reason = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -738,6 +754,67 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "partOf":
+          PartOf = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "status":
+          StatusElement = (Code<Hl7.Fhir.Model.MedicationStatement.MedicationStatementStatusCodes>)value;
+          return this;
+        case "category":
+          Category = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "medication":
+          Medication = (Hl7.Fhir.Model.CodeableReference)value;
+          return this;
+        case "subject":
+          Subject = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "encounter":
+          Encounter = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "effective":
+          Effective = (Hl7.Fhir.Model.DataType)value;
+          return this;
+        case "dateAsserted":
+          DateAssertedElement = (Hl7.Fhir.Model.FhirDateTime)value;
+          return this;
+        case "informationSource":
+          InformationSource = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "derivedFrom":
+          DerivedFrom = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "reason":
+          Reason = (List<Hl7.Fhir.Model.CodeableReference>)value;
+          return this;
+        case "note":
+          Note = (List<Hl7.Fhir.Model.Annotation>)value;
+          return this;
+        case "relatedClinicalInformation":
+          RelatedClinicalInformation = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "renderedDosageInstruction":
+          RenderedDosageInstructionElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        case "dosage":
+          Dosage = (List<Hl7.Fhir.Model.Dosage>)value;
+          return this;
+        case "adherence":
+          Adherence = (Hl7.Fhir.Model.MedicationStatement.AdherenceComponent)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/MedicinalProductDefinition.cs b/src/Hl7.Fhir.R5/Model/Generated/MedicinalProductDefinition.cs
index d4b596ee77..f6c09098d5 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/MedicinalProductDefinition.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/MedicinalProductDefinition.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("MedicinalProductDefinition","http://hl7.org/fhir/StructureDefinition/MedicinalProductDefinition", IsResource=true)]
+  [FhirType("MedicinalProductDefinition","http://hl7.org/fhir/StructureDefinition/MedicinalProductDefinition")]
   public partial class MedicinalProductDefinition : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -64,7 +64,7 @@ public partial class MedicinalProductDefinition : Hl7.Fhir.Model.DomainResource,
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("MedicinalProductDefinition#Contact", IsNestedType=true)]
+    [FhirType("MedicinalProductDefinition#Contact")]
     [BackboneType("MedicinalProductDefinition.contact")]
     public partial class ContactComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -186,6 +186,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "type":
+            Type = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "contact":
+            Contact = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -200,7 +216,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("MedicinalProductDefinition#Name", IsNestedType=true)]
+    [FhirType("MedicinalProductDefinition#Name")]
     [BackboneType("MedicinalProductDefinition.name")]
     public partial class NameComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -382,6 +398,28 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "productName":
+            ProductNameElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "type":
+            Type = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "part":
+            Part = (List<Hl7.Fhir.Model.MedicinalProductDefinition.PartComponent>)value;
+            return this;
+          case "usage":
+            Usage = (List<Hl7.Fhir.Model.MedicinalProductDefinition.UsageComponent>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -398,7 +436,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("MedicinalProductDefinition#Part", IsNestedType=true)]
+    [FhirType("MedicinalProductDefinition#Part")]
     [BackboneType("MedicinalProductDefinition.name.part")]
     public partial class PartComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -537,6 +575,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "part":
+            PartElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "type":
+            Type = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -554,7 +608,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MedicinalProductDefinition#Usage", IsNestedType=true)]
+    [FhirType("MedicinalProductDefinition#Usage")]
     [BackboneType("MedicinalProductDefinition.name.usage")]
     public partial class UsageComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -698,6 +752,25 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "country":
+            Country = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "jurisdiction":
+            Jurisdiction = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "language":
+            Language = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -716,7 +789,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MedicinalProductDefinition#CrossReference", IsNestedType=true)]
+    [FhirType("MedicinalProductDefinition#CrossReference")]
     [BackboneType("MedicinalProductDefinition.crossReference")]
     public partial class CrossReferenceComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -836,6 +909,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "product":
+            Product = (Hl7.Fhir.Model.CodeableReference)value;
+            return this;
+          case "type":
+            Type = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -853,7 +942,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MedicinalProductDefinition#Operation", IsNestedType=true)]
+    [FhirType("MedicinalProductDefinition#Operation")]
     [BackboneType("MedicinalProductDefinition.operation")]
     public partial class OperationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1017,6 +1106,28 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "type":
+            Type = (Hl7.Fhir.Model.CodeableReference)value;
+            return this;
+          case "effectiveDate":
+            EffectiveDate = (Hl7.Fhir.Model.Period)value;
+            return this;
+          case "organization":
+            Organization = (List<Hl7.Fhir.Model.ResourceReference>)value;
+            return this;
+          case "confidentialityIndicator":
+            ConfidentialityIndicator = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1036,7 +1147,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MedicinalProductDefinition#Characteristic", IsNestedType=true)]
+    [FhirType("MedicinalProductDefinition#Characteristic")]
     [BackboneType("MedicinalProductDefinition.characteristic")]
     public partial class CharacteristicComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1158,6 +1269,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "type":
+            Type = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "value":
+            Value = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1957,6 +2084,103 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "type":
+          Type = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "domain":
+          Domain = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "version":
+          VersionElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "status":
+          Status = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "statusDate":
+          StatusDateElement = (Hl7.Fhir.Model.FhirDateTime)value;
+          return this;
+        case "description":
+          DescriptionElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        case "combinedPharmaceuticalDoseForm":
+          CombinedPharmaceuticalDoseForm = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "route":
+          Route = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "indication":
+          IndicationElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        case "legalStatusOfSupply":
+          LegalStatusOfSupply = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "additionalMonitoringIndicator":
+          AdditionalMonitoringIndicator = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "specialMeasures":
+          SpecialMeasures = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "pediatricUseIndicator":
+          PediatricUseIndicator = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "classification":
+          Classification = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "marketingStatus":
+          MarketingStatus = (List<Hl7.Fhir.Model.MarketingStatus>)value;
+          return this;
+        case "packagedMedicinalProduct":
+          PackagedMedicinalProduct = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "comprisedOf":
+          ComprisedOf = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "ingredient":
+          Ingredient = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "impurity":
+          Impurity = (List<Hl7.Fhir.Model.CodeableReference>)value;
+          return this;
+        case "attachedDocument":
+          AttachedDocument = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "masterFile":
+          MasterFile = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "contact":
+          Contact = (List<Hl7.Fhir.Model.MedicinalProductDefinition.ContactComponent>)value;
+          return this;
+        case "clinicalTrial":
+          ClinicalTrial = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "code":
+          Code = (List<Hl7.Fhir.Model.Coding>)value;
+          return this;
+        case "name":
+          Name = (List<Hl7.Fhir.Model.MedicinalProductDefinition.NameComponent>)value;
+          return this;
+        case "crossReference":
+          CrossReference = (List<Hl7.Fhir.Model.MedicinalProductDefinition.CrossReferenceComponent>)value;
+          return this;
+        case "operation":
+          Operation = (List<Hl7.Fhir.Model.MedicinalProductDefinition.OperationComponent>)value;
+          return this;
+        case "characteristic":
+          Characteristic = (List<Hl7.Fhir.Model.MedicinalProductDefinition.CharacteristicComponent>)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/MessageDefinition.cs b/src/Hl7.Fhir.R5/Model/Generated/MessageDefinition.cs
index 2e7cd172e8..de985a3a5b 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/MessageDefinition.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/MessageDefinition.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("MessageDefinition","http://hl7.org/fhir/StructureDefinition/MessageDefinition", IsResource=true)]
+  [FhirType("MessageDefinition","http://hl7.org/fhir/StructureDefinition/MessageDefinition")]
   public partial class MessageDefinition : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -130,7 +130,7 @@ public enum MessageheaderResponseRequest
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MessageDefinition#Focus", IsNestedType=true)]
+    [FhirType("MessageDefinition#Focus")]
     [BackboneType("MessageDefinition.focus")]
     public partial class FocusComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -366,6 +366,28 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "code":
+            CodeElement = (Code<Hl7.Fhir.Model.ResourceType>)value;
+            return this;
+          case "profile":
+            ProfileElement = (Hl7.Fhir.Model.Canonical)value;
+            return this;
+          case "min":
+            MinElement = (Hl7.Fhir.Model.UnsignedInt)value;
+            return this;
+          case "max":
+            MaxElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -386,7 +408,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MessageDefinition#AllowedResponse", IsNestedType=true)]
+    [FhirType("MessageDefinition#AllowedResponse")]
     [BackboneType("MessageDefinition.allowedResponse")]
     public partial class AllowedResponseComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -541,6 +563,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "message":
+            MessageElement = (Hl7.Fhir.Model.Canonical)value;
+            return this;
+          case "situation":
+            SituationElement = (Hl7.Fhir.Model.Markdown)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1512,6 +1550,94 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "url":
+          UrlElement = (Hl7.Fhir.Model.FhirUri)value;
+          return this;
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "version":
+          VersionElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "versionAlgorithm":
+          VersionAlgorithm = (Hl7.Fhir.Model.DataType)value;
+          return this;
+        case "name":
+          NameElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "title":
+          TitleElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "replaces":
+          ReplacesElement = (List<Hl7.Fhir.Model.Canonical>)value;
+          return this;
+        case "status":
+          StatusElement = (Code<Hl7.Fhir.Model.PublicationStatus>)value;
+          return this;
+        case "experimental":
+          ExperimentalElement = (Hl7.Fhir.Model.FhirBoolean)value;
+          return this;
+        case "date":
+          DateElement = (Hl7.Fhir.Model.FhirDateTime)value;
+          return this;
+        case "publisher":
+          PublisherElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "contact":
+          Contact = (List<Hl7.Fhir.Model.ContactDetail>)value;
+          return this;
+        case "description":
+          DescriptionElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        case "useContext":
+          UseContext = (List<Hl7.Fhir.Model.UsageContext>)value;
+          return this;
+        case "jurisdiction":
+          Jurisdiction = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "purpose":
+          PurposeElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        case "copyright":
+          CopyrightElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        case "copyrightLabel":
+          CopyrightLabelElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "base":
+          BaseElement = (Hl7.Fhir.Model.Canonical)value;
+          return this;
+        case "parent":
+          ParentElement = (List<Hl7.Fhir.Model.Canonical>)value;
+          return this;
+        case "event":
+          Event = (Hl7.Fhir.Model.DataType)value;
+          return this;
+        case "category":
+          CategoryElement = (Code<Hl7.Fhir.Model.MessageDefinition.MessageSignificanceCategory>)value;
+          return this;
+        case "focus":
+          Focus = (List<Hl7.Fhir.Model.MessageDefinition.FocusComponent>)value;
+          return this;
+        case "responseRequired":
+          ResponseRequiredElement = (Code<Hl7.Fhir.Model.MessageDefinition.MessageheaderResponseRequest>)value;
+          return this;
+        case "allowedResponse":
+          AllowedResponse = (List<Hl7.Fhir.Model.MessageDefinition.AllowedResponseComponent>)value;
+          return this;
+        case "graph":
+          GraphElement = (Hl7.Fhir.Model.Canonical)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/MessageHeader.cs b/src/Hl7.Fhir.R5/Model/Generated/MessageHeader.cs
index 7530a6c70b..2cd1a96938 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/MessageHeader.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/MessageHeader.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("MessageHeader","http://hl7.org/fhir/StructureDefinition/MessageHeader", IsResource=true)]
+  [FhirType("MessageHeader","http://hl7.org/fhir/StructureDefinition/MessageHeader")]
   public partial class MessageHeader : Hl7.Fhir.Model.DomainResource
   {
     /// <summary>
@@ -96,7 +96,7 @@ public enum ResponseType
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MessageHeader#MessageDestination", IsNestedType=true)]
+    [FhirType("MessageHeader#MessageDestination")]
     [BackboneType("MessageHeader.destination")]
     public partial class MessageDestinationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -281,6 +281,28 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "endpoint":
+            Endpoint = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          case "name":
+            NameElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "target":
+            Target = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          case "receiver":
+            Receiver = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -300,7 +322,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MessageHeader#MessageSource", IsNestedType=true)]
+    [FhirType("MessageHeader#MessageSource")]
     [BackboneType("MessageHeader.source")]
     public partial class MessageSourceComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -538,6 +560,31 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "endpoint":
+            Endpoint = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          case "name":
+            NameElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "software":
+            SoftwareElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "version":
+            VersionElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "contact":
+            Contact = (Hl7.Fhir.Model.ContactPoint)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -558,7 +605,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MessageHeader#Response", IsNestedType=true)]
+    [FhirType("MessageHeader#Response")]
     [BackboneType("MessageHeader.response")]
     public partial class ResponseComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -721,6 +768,25 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "identifier":
+            Identifier = (Hl7.Fhir.Model.Identifier)value;
+            return this;
+          case "code":
+            CodeElement = (Code<Hl7.Fhir.Model.MessageHeader.ResponseType>)value;
+            return this;
+          case "details":
+            Details = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1042,6 +1108,46 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "event":
+          Event = (Hl7.Fhir.Model.DataType)value;
+          return this;
+        case "destination":
+          Destination = (List<Hl7.Fhir.Model.MessageHeader.MessageDestinationComponent>)value;
+          return this;
+        case "sender":
+          Sender = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "author":
+          Author = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "source":
+          Source = (Hl7.Fhir.Model.MessageHeader.MessageSourceComponent)value;
+          return this;
+        case "responsible":
+          Responsible = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "reason":
+          Reason = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "response":
+          Response = (Hl7.Fhir.Model.MessageHeader.ResponseComponent)value;
+          return this;
+        case "focus":
+          Focus = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "definition":
+          DefinitionElement = (Hl7.Fhir.Model.Canonical)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/MolecularSequence.cs b/src/Hl7.Fhir.R5/Model/Generated/MolecularSequence.cs
index 628dcce85f..5e0cd88563 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/MolecularSequence.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/MolecularSequence.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model
   /// </summary>
   [Serializable]
   [DataContract]
-  [FhirType("MolecularSequence","http://hl7.org/fhir/StructureDefinition/MolecularSequence", IsResource=true)]
+  [FhirType("MolecularSequence","http://hl7.org/fhir/StructureDefinition/MolecularSequence")]
   public partial class MolecularSequence : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -133,7 +133,7 @@ public enum StrandType
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("MolecularSequence#Relative", IsNestedType=true)]
+    [FhirType("MolecularSequence#Relative")]
     [BackboneType("MolecularSequence.relative")]
     public partial class RelativeComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -335,6 +335,31 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "coordinateSystem":
+            CoordinateSystem = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "ordinalPosition":
+            OrdinalPositionElement = (Hl7.Fhir.Model.Integer)value;
+            return this;
+          case "sequenceRange":
+            SequenceRange = (Hl7.Fhir.Model.Range)value;
+            return this;
+          case "startingSequence":
+            StartingSequence = (Hl7.Fhir.Model.MolecularSequence.StartingSequenceComponent)value;
+            return this;
+          case "edit":
+            Edit = (List<Hl7.Fhir.Model.MolecularSequence.EditComponent>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -355,7 +380,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MolecularSequence#StartingSequence", IsNestedType=true)]
+    [FhirType("MolecularSequence#StartingSequence")]
     [BackboneType("MolecularSequence.relative.startingSequence")]
     public partial class StartingSequenceComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -660,6 +685,37 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "genomeAssembly":
+            GenomeAssembly = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "chromosome":
+            Chromosome = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "sequence":
+            Sequence = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          case "windowStart":
+            WindowStartElement = (Hl7.Fhir.Model.Integer)value;
+            return this;
+          case "windowEnd":
+            WindowEndElement = (Hl7.Fhir.Model.Integer)value;
+            return this;
+          case "orientation":
+            OrientationElement = (Code<Hl7.Fhir.Model.MolecularSequence.OrientationType>)value;
+            return this;
+          case "strand":
+            StrandElement = (Code<Hl7.Fhir.Model.MolecularSequence.StrandType>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -679,7 +735,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("MolecularSequence#Edit", IsNestedType=true)]
+    [FhirType("MolecularSequence#Edit")]
     [BackboneType("MolecularSequence.relative.edit")]
     public partial class EditComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -911,6 +967,28 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "start":
+            StartElement = (Hl7.Fhir.Model.Integer)value;
+            return this;
+          case "end":
+            EndElement = (Hl7.Fhir.Model.Integer)value;
+            return this;
+          case "replacementSequence":
+            ReplacementSequenceElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "replacedSequence":
+            ReplacedSequenceElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1253,6 +1331,46 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "type":
+          TypeElement = (Code<Hl7.Fhir.Model.MolecularSequence.SequenceType>)value;
+          return this;
+        case "subject":
+          Subject = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "focus":
+          Focus = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "specimen":
+          Specimen = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "device":
+          Device = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "performer":
+          Performer = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "literal":
+          LiteralElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "formatted":
+          Formatted = (List<Hl7.Fhir.Model.Attachment>)value;
+          return this;
+        case "relative":
+          Relative = (List<Hl7.Fhir.Model.MolecularSequence.RelativeComponent>)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/MonetaryComponent.cs b/src/Hl7.Fhir.R5/Model/Generated/MonetaryComponent.cs
index d72dc1627a..fbc9e1a62d 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/MonetaryComponent.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/MonetaryComponent.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -293,6 +293,28 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "type":
+          TypeElement = (Code<Hl7.Fhir.Model.MonetaryComponent.PriceComponentType>)value;
+          return this;
+        case "code":
+          Code = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "factor":
+          FactorElement = (Hl7.Fhir.Model.FhirDecimal)value;
+          return this;
+        case "amount":
+          Amount = (Hl7.Fhir.Model.Money)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/Money.cs b/src/Hl7.Fhir.R5/Model/Generated/Money.cs
index fbd780e81d..470d98a40a 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/Money.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/Money.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -203,6 +203,22 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "value":
+          ValueElement = (Hl7.Fhir.Model.FhirDecimal)value;
+          return this;
+        case "currency":
+          CurrencyElement = (Code<Hl7.Fhir.Model.Currencies>)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/NamingSystem.cs b/src/Hl7.Fhir.R5/Model/Generated/NamingSystem.cs
index a3db0319ce..21739e7f11 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/NamingSystem.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/NamingSystem.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("NamingSystem","http://hl7.org/fhir/StructureDefinition/NamingSystem", IsResource=true)]
+  [FhirType("NamingSystem","http://hl7.org/fhir/StructureDefinition/NamingSystem")]
   public partial class NamingSystem : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -142,7 +142,7 @@ public enum NamingSystemIdentifierType
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("NamingSystem#UniqueId", IsNestedType=true)]
+    [FhirType("NamingSystem#UniqueId")]
     [BackboneType("NamingSystem.uniqueId")]
     public partial class UniqueIdComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -438,6 +438,34 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "type":
+            TypeElement = (Code<Hl7.Fhir.Model.NamingSystem.NamingSystemIdentifierType>)value;
+            return this;
+          case "value":
+            ValueElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "preferred":
+            PreferredElement = (Hl7.Fhir.Model.FhirBoolean)value;
+            return this;
+          case "comment":
+            CommentElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "period":
+            Period = (Hl7.Fhir.Model.Period)value;
+            return this;
+          case "authoritative":
+            AuthoritativeElement = (Hl7.Fhir.Model.FhirBoolean)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1501,6 +1529,109 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "url":
+          UrlElement = (Hl7.Fhir.Model.FhirUri)value;
+          return this;
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "version":
+          VersionElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "versionAlgorithm":
+          VersionAlgorithm = (Hl7.Fhir.Model.DataType)value;
+          return this;
+        case "name":
+          NameElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "title":
+          TitleElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "status":
+          StatusElement = (Code<Hl7.Fhir.Model.PublicationStatus>)value;
+          return this;
+        case "kind":
+          KindElement = (Code<Hl7.Fhir.Model.NamingSystem.NamingSystemType>)value;
+          return this;
+        case "experimental":
+          ExperimentalElement = (Hl7.Fhir.Model.FhirBoolean)value;
+          return this;
+        case "date":
+          DateElement = (Hl7.Fhir.Model.FhirDateTime)value;
+          return this;
+        case "publisher":
+          PublisherElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "contact":
+          Contact = (List<Hl7.Fhir.Model.ContactDetail>)value;
+          return this;
+        case "responsible":
+          ResponsibleElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "type":
+          Type = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "description":
+          DescriptionElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        case "useContext":
+          UseContext = (List<Hl7.Fhir.Model.UsageContext>)value;
+          return this;
+        case "jurisdiction":
+          Jurisdiction = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "purpose":
+          PurposeElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        case "copyright":
+          CopyrightElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        case "copyrightLabel":
+          CopyrightLabelElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "approvalDate":
+          ApprovalDateElement = (Hl7.Fhir.Model.Date)value;
+          return this;
+        case "lastReviewDate":
+          LastReviewDateElement = (Hl7.Fhir.Model.Date)value;
+          return this;
+        case "effectivePeriod":
+          EffectivePeriod = (Hl7.Fhir.Model.Period)value;
+          return this;
+        case "topic":
+          Topic = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "author":
+          Author = (List<Hl7.Fhir.Model.ContactDetail>)value;
+          return this;
+        case "editor":
+          Editor = (List<Hl7.Fhir.Model.ContactDetail>)value;
+          return this;
+        case "reviewer":
+          Reviewer = (List<Hl7.Fhir.Model.ContactDetail>)value;
+          return this;
+        case "endorser":
+          Endorser = (List<Hl7.Fhir.Model.ContactDetail>)value;
+          return this;
+        case "relatedArtifact":
+          RelatedArtifact = (List<Hl7.Fhir.Model.RelatedArtifact>)value;
+          return this;
+        case "usage":
+          UsageElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "uniqueId":
+          UniqueId = (List<Hl7.Fhir.Model.NamingSystem.UniqueIdComponent>)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/NutritionIntake.cs b/src/Hl7.Fhir.R5/Model/Generated/NutritionIntake.cs
index ec09950074..8a2218362b 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/NutritionIntake.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/NutritionIntake.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("NutritionIntake","http://hl7.org/fhir/StructureDefinition/NutritionIntake", IsResource=true)]
+  [FhirType("NutritionIntake","http://hl7.org/fhir/StructureDefinition/NutritionIntake")]
   public partial class NutritionIntake : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -64,7 +64,7 @@ public partial class NutritionIntake : Hl7.Fhir.Model.DomainResource, IIdentifia
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("NutritionIntake#ConsumedItem", IsNestedType=true)]
+    [FhirType("NutritionIntake#ConsumedItem")]
     [BackboneType("NutritionIntake.consumedItem")]
     public partial class ConsumedItemComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -310,6 +310,37 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "type":
+            Type = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "nutritionProduct":
+            NutritionProduct = (Hl7.Fhir.Model.CodeableReference)value;
+            return this;
+          case "schedule":
+            Schedule = (Hl7.Fhir.Model.Timing)value;
+            return this;
+          case "amount":
+            Amount = (Hl7.Fhir.Model.Quantity)value;
+            return this;
+          case "rate":
+            Rate = (Hl7.Fhir.Model.Quantity)value;
+            return this;
+          case "notConsumed":
+            NotConsumedElement = (Hl7.Fhir.Model.FhirBoolean)value;
+            return this;
+          case "notConsumedReason":
+            NotConsumedReason = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -333,7 +364,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("NutritionIntake#IngredientLabel", IsNestedType=true)]
+    [FhirType("NutritionIntake#IngredientLabel")]
     [BackboneType("NutritionIntake.ingredientLabel")]
     public partial class IngredientLabelComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -454,6 +485,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "nutrient":
+            Nutrient = (Hl7.Fhir.Model.CodeableReference)value;
+            return this;
+          case "amount":
+            Amount = (Hl7.Fhir.Model.Quantity)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -471,7 +518,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("NutritionIntake#Performer", IsNestedType=true)]
+    [FhirType("NutritionIntake#Performer")]
     [BackboneType("NutritionIntake.performer")]
     public partial class PerformerComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -593,6 +640,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "function":
+            Function = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "actor":
+            Actor = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1199,6 +1262,76 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "instantiatesCanonical":
+          InstantiatesCanonicalElement = (List<Hl7.Fhir.Model.Canonical>)value;
+          return this;
+        case "instantiatesUri":
+          InstantiatesUriElement = (List<Hl7.Fhir.Model.FhirUri>)value;
+          return this;
+        case "basedOn":
+          BasedOn = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "partOf":
+          PartOf = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "status":
+          StatusElement = (Code<Hl7.Fhir.Model.EventStatus>)value;
+          return this;
+        case "statusReason":
+          StatusReason = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "code":
+          Code = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "subject":
+          Subject = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "encounter":
+          Encounter = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "occurrence":
+          Occurrence = (Hl7.Fhir.Model.DataType)value;
+          return this;
+        case "recorded":
+          RecordedElement = (Hl7.Fhir.Model.FhirDateTime)value;
+          return this;
+        case "reported":
+          Reported = (Hl7.Fhir.Model.DataType)value;
+          return this;
+        case "consumedItem":
+          ConsumedItem = (List<Hl7.Fhir.Model.NutritionIntake.ConsumedItemComponent>)value;
+          return this;
+        case "ingredientLabel":
+          IngredientLabel = (List<Hl7.Fhir.Model.NutritionIntake.IngredientLabelComponent>)value;
+          return this;
+        case "performer":
+          Performer = (List<Hl7.Fhir.Model.NutritionIntake.PerformerComponent>)value;
+          return this;
+        case "location":
+          Location = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "derivedFrom":
+          DerivedFrom = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "reason":
+          Reason = (List<Hl7.Fhir.Model.CodeableReference>)value;
+          return this;
+        case "note":
+          Note = (List<Hl7.Fhir.Model.Annotation>)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/NutritionOrder.cs b/src/Hl7.Fhir.R5/Model/Generated/NutritionOrder.cs
index 638c788602..478f620285 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/NutritionOrder.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/NutritionOrder.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("NutritionOrder","http://hl7.org/fhir/StructureDefinition/NutritionOrder", IsResource=true)]
+  [FhirType("NutritionOrder","http://hl7.org/fhir/StructureDefinition/NutritionOrder")]
   public partial class NutritionOrder : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -68,7 +68,7 @@ public partial class NutritionOrder : Hl7.Fhir.Model.DomainResource, IIdentifiab
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("NutritionOrder#OralDiet", IsNestedType=true)]
+    [FhirType("NutritionOrder#OralDiet")]
     [BackboneType("NutritionOrder.oralDiet")]
     public partial class OralDietComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -294,6 +294,34 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "type":
+            Type = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+            return this;
+          case "schedule":
+            Schedule = (Hl7.Fhir.Model.NutritionOrder.OralDietScheduleComponent)value;
+            return this;
+          case "nutrient":
+            Nutrient = (List<Hl7.Fhir.Model.NutritionOrder.NutrientComponent>)value;
+            return this;
+          case "texture":
+            Texture = (List<Hl7.Fhir.Model.NutritionOrder.TextureComponent>)value;
+            return this;
+          case "fluidConsistencyType":
+            FluidConsistencyType = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+            return this;
+          case "instruction":
+            InstructionElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -315,7 +343,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("NutritionOrder#OralDietSchedule", IsNestedType=true)]
+    [FhirType("NutritionOrder#OralDietSchedule")]
     [BackboneType("NutritionOrder.oralDiet.schedule")]
     public partial class OralDietScheduleComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -474,6 +502,25 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "timing":
+            Timing = (List<Hl7.Fhir.Model.Timing>)value;
+            return this;
+          case "asNeeded":
+            AsNeededElement = (Hl7.Fhir.Model.FhirBoolean)value;
+            return this;
+          case "asNeededFor":
+            AsNeededFor = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -492,7 +539,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("NutritionOrder#Nutrient", IsNestedType=true)]
+    [FhirType("NutritionOrder#Nutrient")]
     [BackboneType("NutritionOrder.oralDiet.nutrient")]
     public partial class NutrientComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -611,6 +658,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "modifier":
+            Modifier = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "amount":
+            Amount = (Hl7.Fhir.Model.Quantity)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -628,7 +691,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("NutritionOrder#Texture", IsNestedType=true)]
+    [FhirType("NutritionOrder#Texture")]
     [BackboneType("NutritionOrder.oralDiet.texture")]
     public partial class TextureComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -748,6 +811,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "modifier":
+            Modifier = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "foodType":
+            FoodType = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -765,7 +844,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("NutritionOrder#Supplement", IsNestedType=true)]
+    [FhirType("NutritionOrder#Supplement")]
     [BackboneType("NutritionOrder.supplement")]
     public partial class SupplementComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -983,6 +1062,31 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "type":
+            Type = (Hl7.Fhir.Model.CodeableReference)value;
+            return this;
+          case "productName":
+            ProductNameElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "schedule":
+            Schedule = (Hl7.Fhir.Model.NutritionOrder.SupplementScheduleComponent)value;
+            return this;
+          case "quantity":
+            Quantity = (Hl7.Fhir.Model.Quantity)value;
+            return this;
+          case "instruction":
+            InstructionElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1003,7 +1107,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("NutritionOrder#SupplementSchedule", IsNestedType=true)]
+    [FhirType("NutritionOrder#SupplementSchedule")]
     [BackboneType("NutritionOrder.supplement.schedule")]
     public partial class SupplementScheduleComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1162,6 +1266,25 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "timing":
+            Timing = (List<Hl7.Fhir.Model.Timing>)value;
+            return this;
+          case "asNeeded":
+            AsNeededElement = (Hl7.Fhir.Model.FhirBoolean)value;
+            return this;
+          case "asNeededFor":
+            AsNeededFor = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1180,7 +1303,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("NutritionOrder#EnteralFormula", IsNestedType=true)]
+    [FhirType("NutritionOrder#EnteralFormula")]
     [BackboneType("NutritionOrder.enteralFormula")]
     public partial class EnteralFormulaComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1486,6 +1609,43 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "baseFormulaType":
+            BaseFormulaType = (Hl7.Fhir.Model.CodeableReference)value;
+            return this;
+          case "baseFormulaProductName":
+            BaseFormulaProductNameElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "deliveryDevice":
+            DeliveryDevice = (List<Hl7.Fhir.Model.CodeableReference>)value;
+            return this;
+          case "additive":
+            Additive = (List<Hl7.Fhir.Model.NutritionOrder.AdditiveComponent>)value;
+            return this;
+          case "caloricDensity":
+            CaloricDensity = (Hl7.Fhir.Model.Quantity)value;
+            return this;
+          case "routeOfAdministration":
+            RouteOfAdministration = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "administration":
+            Administration = (List<Hl7.Fhir.Model.NutritionOrder.AdministrationComponent>)value;
+            return this;
+          case "maxVolumeToDeliver":
+            MaxVolumeToDeliver = (Hl7.Fhir.Model.Quantity)value;
+            return this;
+          case "administrationInstruction":
+            AdministrationInstructionElement = (Hl7.Fhir.Model.Markdown)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1510,7 +1670,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("NutritionOrder#Additive", IsNestedType=true)]
+    [FhirType("NutritionOrder#Additive")]
     [BackboneType("NutritionOrder.enteralFormula.additive")]
     public partial class AdditiveComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1668,6 +1828,25 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "type":
+            Type = (Hl7.Fhir.Model.CodeableReference)value;
+            return this;
+          case "productName":
+            ProductNameElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "quantity":
+            Quantity = (Hl7.Fhir.Model.Quantity)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1687,7 +1866,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("NutritionOrder#Administration", IsNestedType=true)]
+    [FhirType("NutritionOrder#Administration")]
     [BackboneType("NutritionOrder.enteralFormula.administration")]
     public partial class AdministrationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1828,6 +2007,25 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "schedule":
+            Schedule = (Hl7.Fhir.Model.NutritionOrder.EnteralFormulaScheduleComponent)value;
+            return this;
+          case "quantity":
+            Quantity = (Hl7.Fhir.Model.Quantity)value;
+            return this;
+          case "rate":
+            Rate = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1846,7 +2044,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("NutritionOrder#EnteralFormulaSchedule", IsNestedType=true)]
+    [FhirType("NutritionOrder#EnteralFormulaSchedule")]
     [BackboneType("NutritionOrder.enteralFormula.administration.schedule")]
     public partial class EnteralFormulaScheduleComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2005,6 +2203,25 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "timing":
+            Timing = (List<Hl7.Fhir.Model.Timing>)value;
+            return this;
+          case "asNeeded":
+            AsNeededElement = (Hl7.Fhir.Model.FhirBoolean)value;
+            return this;
+          case "asNeededFor":
+            AsNeededFor = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -2747,6 +2964,85 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "instantiatesCanonical":
+          InstantiatesCanonicalElement = (List<Hl7.Fhir.Model.Canonical>)value;
+          return this;
+        case "instantiatesUri":
+          InstantiatesUriElement = (List<Hl7.Fhir.Model.FhirUri>)value;
+          return this;
+        case "instantiates":
+          InstantiatesElement = (List<Hl7.Fhir.Model.FhirUri>)value;
+          return this;
+        case "basedOn":
+          BasedOn = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "groupIdentifier":
+          GroupIdentifier = (Hl7.Fhir.Model.Identifier)value;
+          return this;
+        case "status":
+          StatusElement = (Code<Hl7.Fhir.Model.RequestStatus>)value;
+          return this;
+        case "intent":
+          IntentElement = (Code<Hl7.Fhir.Model.RequestIntent>)value;
+          return this;
+        case "priority":
+          PriorityElement = (Code<Hl7.Fhir.Model.RequestPriority>)value;
+          return this;
+        case "subject":
+          Subject = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "encounter":
+          Encounter = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "supportingInformation":
+          SupportingInformation = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "dateTime":
+          DateTimeElement = (Hl7.Fhir.Model.FhirDateTime)value;
+          return this;
+        case "orderer":
+          Orderer = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "performer":
+          Performer = (List<Hl7.Fhir.Model.CodeableReference>)value;
+          return this;
+        case "allergyIntolerance":
+          AllergyIntolerance = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "foodPreferenceModifier":
+          FoodPreferenceModifier = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "excludeFoodModifier":
+          ExcludeFoodModifier = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "outsideFoodAllowed":
+          OutsideFoodAllowedElement = (Hl7.Fhir.Model.FhirBoolean)value;
+          return this;
+        case "oralDiet":
+          OralDiet = (Hl7.Fhir.Model.NutritionOrder.OralDietComponent)value;
+          return this;
+        case "supplement":
+          Supplement = (List<Hl7.Fhir.Model.NutritionOrder.SupplementComponent>)value;
+          return this;
+        case "enteralFormula":
+          EnteralFormula = (Hl7.Fhir.Model.NutritionOrder.EnteralFormulaComponent)value;
+          return this;
+        case "note":
+          Note = (List<Hl7.Fhir.Model.Annotation>)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/NutritionProduct.cs b/src/Hl7.Fhir.R5/Model/Generated/NutritionProduct.cs
index 37a572f979..5a4dd56bf6 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/NutritionProduct.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/NutritionProduct.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("NutritionProduct","http://hl7.org/fhir/StructureDefinition/NutritionProduct", IsResource=true)]
+  [FhirType("NutritionProduct","http://hl7.org/fhir/StructureDefinition/NutritionProduct")]
   public partial class NutritionProduct : Hl7.Fhir.Model.DomainResource
   {
     /// <summary>
@@ -95,7 +95,7 @@ public enum NutritionProductStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("NutritionProduct#Nutrient", IsNestedType=true)]
+    [FhirType("NutritionProduct#Nutrient")]
     [BackboneType("NutritionProduct.nutrient")]
     public partial class NutrientComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -215,6 +215,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "item":
+            Item = (Hl7.Fhir.Model.CodeableReference)value;
+            return this;
+          case "amount":
+            Amount = (List<Hl7.Fhir.Model.Ratio>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -229,7 +245,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("NutritionProduct#Ingredient", IsNestedType=true)]
+    [FhirType("NutritionProduct#Ingredient")]
     [BackboneType("NutritionProduct.ingredient")]
     public partial class IngredientComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -349,6 +365,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "item":
+            Item = (Hl7.Fhir.Model.CodeableReference)value;
+            return this;
+          case "amount":
+            Amount = (List<Hl7.Fhir.Model.Ratio>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -363,7 +395,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("NutritionProduct#Characteristic", IsNestedType=true)]
+    [FhirType("NutritionProduct#Characteristic")]
     [BackboneType("NutritionProduct.characteristic")]
     public partial class CharacteristicComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -486,6 +518,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "type":
+            Type = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "value":
+            Value = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -503,7 +551,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("NutritionProduct#Instance", IsNestedType=true)]
+    [FhirType("NutritionProduct#Instance")]
     [BackboneType("NutritionProduct.instance")]
     public partial class InstanceComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -799,6 +847,37 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "quantity":
+            Quantity = (Hl7.Fhir.Model.Quantity)value;
+            return this;
+          case "identifier":
+            Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+            return this;
+          case "name":
+            NameElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "lotNumber":
+            LotNumberElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "expiry":
+            ExpiryElement = (Hl7.Fhir.Model.FhirDateTime)value;
+            return this;
+          case "useBy":
+            UseByElement = (Hl7.Fhir.Model.FhirDateTime)value;
+            return this;
+          case "biologicalSourceEvent":
+            BiologicalSourceEvent = (Hl7.Fhir.Model.Identifier)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1124,6 +1203,46 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "code":
+          Code = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "status":
+          StatusElement = (Code<Hl7.Fhir.Model.NutritionProduct.NutritionProductStatus>)value;
+          return this;
+        case "category":
+          Category = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "manufacturer":
+          Manufacturer = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "nutrient":
+          Nutrient = (List<Hl7.Fhir.Model.NutritionProduct.NutrientComponent>)value;
+          return this;
+        case "ingredient":
+          Ingredient = (List<Hl7.Fhir.Model.NutritionProduct.IngredientComponent>)value;
+          return this;
+        case "knownAllergen":
+          KnownAllergen = (List<Hl7.Fhir.Model.CodeableReference>)value;
+          return this;
+        case "characteristic":
+          Characteristic = (List<Hl7.Fhir.Model.NutritionProduct.CharacteristicComponent>)value;
+          return this;
+        case "instance":
+          Instance = (List<Hl7.Fhir.Model.NutritionProduct.InstanceComponent>)value;
+          return this;
+        case "note":
+          Note = (List<Hl7.Fhir.Model.Annotation>)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/Observation.cs b/src/Hl7.Fhir.R5/Model/Generated/Observation.cs
index 84a070964f..c8d306ade7 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/Observation.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/Observation.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Observation","http://hl7.org/fhir/StructureDefinition/Observation", IsResource=true)]
+  [FhirType("Observation","http://hl7.org/fhir/StructureDefinition/Observation")]
   public partial class Observation : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -96,7 +96,7 @@ public enum TriggeredBytype
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Observation#TriggeredBy", IsNestedType=true)]
+    [FhirType("Observation#TriggeredBy")]
     [BackboneType("Observation.triggeredBy")]
     public partial class TriggeredByComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -277,6 +277,25 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "observation":
+            Observation = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          case "type":
+            TypeElement = (Code<Hl7.Fhir.Model.Observation.TriggeredBytype>)value;
+            return this;
+          case "reason":
+            ReasonElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -296,7 +315,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Observation#ReferenceRange", IsNestedType=true)]
+    [FhirType("Observation#ReferenceRange")]
     [BackboneType("Observation.referenceRange")]
     public partial class ReferenceRangeComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -541,6 +560,37 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "low":
+            Low = (Hl7.Fhir.Model.Quantity)value;
+            return this;
+          case "high":
+            High = (Hl7.Fhir.Model.Quantity)value;
+            return this;
+          case "normalValue":
+            NormalValue = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "type":
+            Type = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "appliesTo":
+            AppliesTo = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+            return this;
+          case "age":
+            Age = (Hl7.Fhir.Model.Range)value;
+            return this;
+          case "text":
+            TextElement = (Hl7.Fhir.Model.Markdown)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -564,7 +614,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Observation#Component", IsNestedType=true)]
+    [FhirType("Observation#Component")]
     [BackboneType("Observation.component")]
     public partial class ComponentComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -754,6 +804,31 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "code":
+            Code = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "value":
+            Value = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          case "dataAbsentReason":
+            DataAbsentReason = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "interpretation":
+            Interpretation = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+            return this;
+          case "referenceRange":
+            ReferenceRange = (List<Hl7.Fhir.Model.Observation.ReferenceRangeComponent>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1491,6 +1566,97 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "instantiates":
+          Instantiates = (Hl7.Fhir.Model.DataType)value;
+          return this;
+        case "basedOn":
+          BasedOn = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "triggeredBy":
+          TriggeredBy = (List<Hl7.Fhir.Model.Observation.TriggeredByComponent>)value;
+          return this;
+        case "partOf":
+          PartOf = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "status":
+          StatusElement = (Code<Hl7.Fhir.Model.ObservationStatus>)value;
+          return this;
+        case "category":
+          Category = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "code":
+          Code = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "subject":
+          Subject = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "focus":
+          Focus = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "encounter":
+          Encounter = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "effective":
+          Effective = (Hl7.Fhir.Model.DataType)value;
+          return this;
+        case "issued":
+          IssuedElement = (Hl7.Fhir.Model.Instant)value;
+          return this;
+        case "performer":
+          Performer = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "value":
+          Value = (Hl7.Fhir.Model.DataType)value;
+          return this;
+        case "dataAbsentReason":
+          DataAbsentReason = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "interpretation":
+          Interpretation = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "note":
+          Note = (List<Hl7.Fhir.Model.Annotation>)value;
+          return this;
+        case "bodySite":
+          BodySite = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "bodyStructure":
+          BodyStructure = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "method":
+          Method = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "specimen":
+          Specimen = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "device":
+          Device = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "referenceRange":
+          ReferenceRange = (List<Hl7.Fhir.Model.Observation.ReferenceRangeComponent>)value;
+          return this;
+        case "hasMember":
+          HasMember = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "derivedFrom":
+          DerivedFrom = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "component":
+          Component = (List<Hl7.Fhir.Model.Observation.ComponentComponent>)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/ObservationDefinition.cs b/src/Hl7.Fhir.R5/Model/Generated/ObservationDefinition.cs
index fb7318a5e0..6603ec62ab 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/ObservationDefinition.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/ObservationDefinition.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("ObservationDefinition","http://hl7.org/fhir/StructureDefinition/ObservationDefinition", IsResource=true)]
+  [FhirType("ObservationDefinition","http://hl7.org/fhir/StructureDefinition/ObservationDefinition")]
   public partial class ObservationDefinition : Hl7.Fhir.Model.DomainResource, IIdentifiable<Identifier>
   {
     /// <summary>
@@ -172,7 +172,7 @@ public enum ObservationRangeCategory
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ObservationDefinition#QualifiedValue", IsNestedType=true)]
+    [FhirType("ObservationDefinition#QualifiedValue")]
     [BackboneType("ObservationDefinition.qualifiedValue")]
     public partial class QualifiedValueComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -633,6 +633,52 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "context":
+            Context = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "appliesTo":
+            AppliesTo = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+            return this;
+          case "gender":
+            GenderElement = (Code<Hl7.Fhir.Model.AdministrativeGender>)value;
+            return this;
+          case "age":
+            Age = (Hl7.Fhir.Model.Range)value;
+            return this;
+          case "gestationalAge":
+            GestationalAge = (Hl7.Fhir.Model.Range)value;
+            return this;
+          case "condition":
+            ConditionElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "rangeCategory":
+            RangeCategoryElement = (Code<Hl7.Fhir.Model.ObservationDefinition.ObservationRangeCategory>)value;
+            return this;
+          case "range":
+            Range = (Hl7.Fhir.Model.Range)value;
+            return this;
+          case "validCodedValueSet":
+            ValidCodedValueSetElement = (Hl7.Fhir.Model.Canonical)value;
+            return this;
+          case "normalCodedValueSet":
+            NormalCodedValueSetElement = (Hl7.Fhir.Model.Canonical)value;
+            return this;
+          case "abnormalCodedValueSet":
+            AbnormalCodedValueSetElement = (Hl7.Fhir.Model.Canonical)value;
+            return this;
+          case "criticalCodedValueSet":
+            CriticalCodedValueSetElement = (Hl7.Fhir.Model.Canonical)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -660,7 +706,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ObservationDefinition#Component", IsNestedType=true)]
+    [FhirType("ObservationDefinition#Component")]
     [BackboneType("ObservationDefinition.component")]
     public partial class ComponentComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -846,6 +892,28 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "code":
+            Code = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "permittedDataType":
+            PermittedDataTypeElement = (List<Code<Hl7.Fhir.Model.ObservationDefinition.ObservationDataType>>)value;
+            return this;
+          case "permittedUnit":
+            PermittedUnit = (List<Hl7.Fhir.Model.Coding>)value;
+            return this;
+          case "qualifiedValue":
+            QualifiedValue = (List<Hl7.Fhir.Model.ObservationDefinition.QualifiedValueComponent>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -2079,6 +2147,127 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "url":
+          UrlElement = (Hl7.Fhir.Model.FhirUri)value;
+          return this;
+        case "identifier":
+          Identifier = (Hl7.Fhir.Model.Identifier)value;
+          return this;
+        case "version":
+          VersionElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "versionAlgorithm":
+          VersionAlgorithm = (Hl7.Fhir.Model.DataType)value;
+          return this;
+        case "name":
+          NameElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "title":
+          TitleElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "status":
+          StatusElement = (Code<Hl7.Fhir.Model.PublicationStatus>)value;
+          return this;
+        case "experimental":
+          ExperimentalElement = (Hl7.Fhir.Model.FhirBoolean)value;
+          return this;
+        case "date":
+          DateElement = (Hl7.Fhir.Model.FhirDateTime)value;
+          return this;
+        case "publisher":
+          PublisherElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "contact":
+          Contact = (List<Hl7.Fhir.Model.ContactDetail>)value;
+          return this;
+        case "description":
+          DescriptionElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        case "useContext":
+          UseContext = (List<Hl7.Fhir.Model.UsageContext>)value;
+          return this;
+        case "jurisdiction":
+          Jurisdiction = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "purpose":
+          PurposeElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        case "copyright":
+          CopyrightElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        case "copyrightLabel":
+          CopyrightLabelElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "approvalDate":
+          ApprovalDateElement = (Hl7.Fhir.Model.Date)value;
+          return this;
+        case "lastReviewDate":
+          LastReviewDateElement = (Hl7.Fhir.Model.Date)value;
+          return this;
+        case "effectivePeriod":
+          EffectivePeriod = (Hl7.Fhir.Model.Period)value;
+          return this;
+        case "derivedFromCanonical":
+          DerivedFromCanonicalElement = (List<Hl7.Fhir.Model.Canonical>)value;
+          return this;
+        case "derivedFromUri":
+          DerivedFromUriElement = (List<Hl7.Fhir.Model.FhirUri>)value;
+          return this;
+        case "subject":
+          Subject = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "performerType":
+          PerformerType = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "category":
+          Category = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "code":
+          Code = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "permittedDataType":
+          PermittedDataTypeElement = (List<Code<Hl7.Fhir.Model.ObservationDefinition.ObservationDataType>>)value;
+          return this;
+        case "multipleResultsAllowed":
+          MultipleResultsAllowedElement = (Hl7.Fhir.Model.FhirBoolean)value;
+          return this;
+        case "bodySite":
+          BodySite = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "method":
+          Method = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "specimen":
+          Specimen = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "device":
+          Device = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "preferredReportName":
+          PreferredReportNameElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "permittedUnit":
+          PermittedUnit = (List<Hl7.Fhir.Model.Coding>)value;
+          return this;
+        case "qualifiedValue":
+          QualifiedValue = (List<Hl7.Fhir.Model.ObservationDefinition.QualifiedValueComponent>)value;
+          return this;
+        case "hasMember":
+          HasMember = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "component":
+          Component = (List<Hl7.Fhir.Model.ObservationDefinition.ComponentComponent>)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/OperationDefinition.cs b/src/Hl7.Fhir.R5/Model/Generated/OperationDefinition.cs
index 8509193aef..376f53e23f 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/OperationDefinition.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/OperationDefinition.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("OperationDefinition","http://hl7.org/fhir/StructureDefinition/OperationDefinition", IsResource=true)]
+  [FhirType("OperationDefinition","http://hl7.org/fhir/StructureDefinition/OperationDefinition")]
   public partial class OperationDefinition : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -118,7 +118,7 @@ public enum OperationParameterScope
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("OperationDefinition#Parameter", IsNestedType=true)]
+    [FhirType("OperationDefinition#Parameter")]
     [BackboneType("OperationDefinition.parameter")]
     public partial class ParameterComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -666,6 +666,55 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "name":
+            NameElement = (Hl7.Fhir.Model.Code)value;
+            return this;
+          case "use":
+            UseElement = (Code<Hl7.Fhir.Model.OperationParameterUse>)value;
+            return this;
+          case "scope":
+            ScopeElement = (List<Code<Hl7.Fhir.Model.OperationDefinition.OperationParameterScope>>)value;
+            return this;
+          case "min":
+            MinElement = (Hl7.Fhir.Model.Integer)value;
+            return this;
+          case "max":
+            MaxElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "documentation":
+            DocumentationElement = (Hl7.Fhir.Model.Markdown)value;
+            return this;
+          case "type":
+            TypeElement = (Code<Hl7.Fhir.Model.FHIRAllTypes>)value;
+            return this;
+          case "allowedType":
+            AllowedTypeElement = (List<Code<Hl7.Fhir.Model.FHIRAllTypes>>)value;
+            return this;
+          case "targetProfile":
+            TargetProfileElement = (List<Hl7.Fhir.Model.Canonical>)value;
+            return this;
+          case "searchType":
+            SearchTypeElement = (Code<Hl7.Fhir.Model.SearchParamType>)value;
+            return this;
+          case "binding":
+            Binding = (Hl7.Fhir.Model.OperationDefinition.BindingComponent)value;
+            return this;
+          case "referencedFrom":
+            ReferencedFrom = (List<Hl7.Fhir.Model.OperationDefinition.ReferencedFromComponent>)value;
+            return this;
+          case "part":
+            Part = (List<Hl7.Fhir.Model.OperationDefinition.ParameterComponent>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -694,7 +743,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("OperationDefinition#Binding", IsNestedType=true)]
+    [FhirType("OperationDefinition#Binding")]
     [BackboneType("OperationDefinition.parameter.binding")]
     public partial class BindingComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -852,6 +901,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "strength":
+            StrengthElement = (Code<Hl7.Fhir.Model.BindingStrength>)value;
+            return this;
+          case "valueSet":
+            ValueSetElement = (Hl7.Fhir.Model.Canonical)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -870,7 +935,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("OperationDefinition#ReferencedFrom", IsNestedType=true)]
+    [FhirType("OperationDefinition#ReferencedFrom")]
     [BackboneType("OperationDefinition.parameter.referencedFrom")]
     public partial class ReferencedFromComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1025,6 +1090,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "source":
+            SourceElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "sourceId":
+            SourceIdElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1043,7 +1124,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("OperationDefinition#Overload", IsNestedType=true)]
+    [FhirType("OperationDefinition#Overload")]
     [BackboneType("OperationDefinition.overload")]
     public partial class OverloadComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1198,6 +1279,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "parameterName":
+            ParameterNameElement = (List<Hl7.Fhir.Model.FhirString>)value;
+            return this;
+          case "comment":
+            CommentElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -2343,6 +2440,106 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "url":
+          UrlElement = (Hl7.Fhir.Model.FhirUri)value;
+          return this;
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "version":
+          VersionElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "versionAlgorithm":
+          VersionAlgorithm = (Hl7.Fhir.Model.DataType)value;
+          return this;
+        case "name":
+          NameElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "title":
+          TitleElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "status":
+          StatusElement = (Code<Hl7.Fhir.Model.PublicationStatus>)value;
+          return this;
+        case "kind":
+          KindElement = (Code<Hl7.Fhir.Model.OperationDefinition.OperationKind>)value;
+          return this;
+        case "experimental":
+          ExperimentalElement = (Hl7.Fhir.Model.FhirBoolean)value;
+          return this;
+        case "date":
+          DateElement = (Hl7.Fhir.Model.FhirDateTime)value;
+          return this;
+        case "publisher":
+          PublisherElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "contact":
+          Contact = (List<Hl7.Fhir.Model.ContactDetail>)value;
+          return this;
+        case "description":
+          DescriptionElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        case "useContext":
+          UseContext = (List<Hl7.Fhir.Model.UsageContext>)value;
+          return this;
+        case "jurisdiction":
+          Jurisdiction = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "purpose":
+          PurposeElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        case "copyright":
+          CopyrightElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        case "copyrightLabel":
+          CopyrightLabelElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "affectsState":
+          AffectsStateElement = (Hl7.Fhir.Model.FhirBoolean)value;
+          return this;
+        case "code":
+          CodeElement = (Hl7.Fhir.Model.Code)value;
+          return this;
+        case "comment":
+          CommentElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        case "base":
+          BaseElement = (Hl7.Fhir.Model.Canonical)value;
+          return this;
+        case "resource":
+          ResourceElement = (List<Code<Hl7.Fhir.Model.VersionIndependentResourceTypesAll>>)value;
+          return this;
+        case "system":
+          SystemElement = (Hl7.Fhir.Model.FhirBoolean)value;
+          return this;
+        case "type":
+          TypeElement = (Hl7.Fhir.Model.FhirBoolean)value;
+          return this;
+        case "instance":
+          InstanceElement = (Hl7.Fhir.Model.FhirBoolean)value;
+          return this;
+        case "inputProfile":
+          InputProfileElement = (Hl7.Fhir.Model.Canonical)value;
+          return this;
+        case "outputProfile":
+          OutputProfileElement = (Hl7.Fhir.Model.Canonical)value;
+          return this;
+        case "parameter":
+          Parameter = (List<Hl7.Fhir.Model.OperationDefinition.ParameterComponent>)value;
+          return this;
+        case "overload":
+          Overload = (List<Hl7.Fhir.Model.OperationDefinition.OverloadComponent>)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/Organization.cs b/src/Hl7.Fhir.R5/Model/Generated/Organization.cs
index 37058df76c..f310821423 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/Organization.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/Organization.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Organization","http://hl7.org/fhir/StructureDefinition/Organization", IsResource=true)]
+  [FhirType("Organization","http://hl7.org/fhir/StructureDefinition/Organization")]
   public partial class Organization : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -68,7 +68,7 @@ public partial class Organization : Hl7.Fhir.Model.DomainResource, IIdentifiable
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Organization#Qualification", IsNestedType=true)]
+    [FhirType("Organization#Qualification")]
     [BackboneType("Organization.qualification")]
     public partial class QualificationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -233,6 +233,28 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "identifier":
+            Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+            return this;
+          case "code":
+            Code = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "period":
+            Period = (Hl7.Fhir.Model.Period)value;
+            return this;
+          case "issuer":
+            Issuer = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -606,6 +628,46 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "active":
+          ActiveElement = (Hl7.Fhir.Model.FhirBoolean)value;
+          return this;
+        case "type":
+          Type = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "name":
+          NameElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "alias":
+          AliasElement = (List<Hl7.Fhir.Model.FhirString>)value;
+          return this;
+        case "description":
+          DescriptionElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        case "contact":
+          Contact = (List<Hl7.Fhir.Model.ExtendedContactDetail>)value;
+          return this;
+        case "partOf":
+          PartOf = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "endpoint":
+          Endpoint = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "qualification":
+          Qualification = (List<Hl7.Fhir.Model.Organization.QualificationComponent>)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/OrganizationAffiliation.cs b/src/Hl7.Fhir.R5/Model/Generated/OrganizationAffiliation.cs
index 58de081e63..0a450ddae9 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/OrganizationAffiliation.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/OrganizationAffiliation.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model
   /// </summary>
   [Serializable]
   [DataContract]
-  [FhirType("OrganizationAffiliation","http://hl7.org/fhir/StructureDefinition/OrganizationAffiliation", IsResource=true)]
+  [FhirType("OrganizationAffiliation","http://hl7.org/fhir/StructureDefinition/OrganizationAffiliation")]
   public partial class OrganizationAffiliation : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -417,6 +417,52 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "active":
+          ActiveElement = (Hl7.Fhir.Model.FhirBoolean)value;
+          return this;
+        case "period":
+          Period = (Hl7.Fhir.Model.Period)value;
+          return this;
+        case "organization":
+          Organization = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "participatingOrganization":
+          ParticipatingOrganization = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "network":
+          Network = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "code":
+          Code = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "specialty":
+          Specialty = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "location":
+          Location = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "healthcareService":
+          HealthcareService = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "contact":
+          Contact = (List<Hl7.Fhir.Model.ExtendedContactDetail>)value;
+          return this;
+        case "endpoint":
+          Endpoint = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/PackagedProductDefinition.cs b/src/Hl7.Fhir.R5/Model/Generated/PackagedProductDefinition.cs
index 9a223411cc..dfe75850f7 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/PackagedProductDefinition.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/PackagedProductDefinition.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model
   /// </summary>
   [Serializable]
   [DataContract]
-  [FhirType("PackagedProductDefinition","http://hl7.org/fhir/StructureDefinition/PackagedProductDefinition", IsResource=true)]
+  [FhirType("PackagedProductDefinition","http://hl7.org/fhir/StructureDefinition/PackagedProductDefinition")]
   public partial class PackagedProductDefinition : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -61,7 +61,7 @@ public partial class PackagedProductDefinition : Hl7.Fhir.Model.DomainResource,
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("PackagedProductDefinition#LegalStatusOfSupply", IsNestedType=true)]
+    [FhirType("PackagedProductDefinition#LegalStatusOfSupply")]
     [BackboneType("PackagedProductDefinition.legalStatusOfSupply")]
     public partial class LegalStatusOfSupplyComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -181,6 +181,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "code":
+            Code = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "jurisdiction":
+            Jurisdiction = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -198,7 +214,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("PackagedProductDefinition#Packaging", IsNestedType=true)]
+    [FhirType("PackagedProductDefinition#Packaging")]
     [BackboneType("PackagedProductDefinition.packaging")]
     public partial class PackagingComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -554,6 +570,49 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "identifier":
+            Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+            return this;
+          case "type":
+            Type = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "componentPart":
+            ComponentPartElement = (Hl7.Fhir.Model.FhirBoolean)value;
+            return this;
+          case "quantity":
+            QuantityElement = (Hl7.Fhir.Model.Integer)value;
+            return this;
+          case "material":
+            Material = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+            return this;
+          case "alternateMaterial":
+            AlternateMaterial = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+            return this;
+          case "shelfLifeStorage":
+            ShelfLifeStorage = (List<Hl7.Fhir.Model.ProductShelfLife>)value;
+            return this;
+          case "manufacturer":
+            Manufacturer = (List<Hl7.Fhir.Model.ResourceReference>)value;
+            return this;
+          case "property":
+            Property = (List<Hl7.Fhir.Model.PackagedProductDefinition.PropertyComponent>)value;
+            return this;
+          case "containedItem":
+            ContainedItem = (List<Hl7.Fhir.Model.PackagedProductDefinition.ContainedItemComponent>)value;
+            return this;
+          case "packaging":
+            Packaging = (List<Hl7.Fhir.Model.PackagedProductDefinition.PackagingComponent>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -577,7 +636,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("PackagedProductDefinition#Property", IsNestedType=true)]
+    [FhirType("PackagedProductDefinition#Property")]
     [BackboneType("PackagedProductDefinition.packaging.property")]
     public partial class PropertyComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -699,6 +758,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "type":
+            Type = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "value":
+            Value = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -713,7 +788,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("PackagedProductDefinition#ContainedItem", IsNestedType=true)]
+    [FhirType("PackagedProductDefinition#ContainedItem")]
     [BackboneType("PackagedProductDefinition.packaging.containedItem")]
     public partial class ContainedItemComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -832,6 +907,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "item":
+            Item = (Hl7.Fhir.Model.CodeableReference)value;
+            return this;
+          case "amount":
+            Amount = (Hl7.Fhir.Model.Quantity)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1313,6 +1404,61 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "name":
+          NameElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "type":
+          Type = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "packageFor":
+          PackageFor = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "status":
+          Status = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "statusDate":
+          StatusDateElement = (Hl7.Fhir.Model.FhirDateTime)value;
+          return this;
+        case "containedItemQuantity":
+          ContainedItemQuantity = (List<Hl7.Fhir.Model.Quantity>)value;
+          return this;
+        case "description":
+          DescriptionElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        case "legalStatusOfSupply":
+          LegalStatusOfSupply = (List<Hl7.Fhir.Model.PackagedProductDefinition.LegalStatusOfSupplyComponent>)value;
+          return this;
+        case "marketingStatus":
+          MarketingStatus = (List<Hl7.Fhir.Model.MarketingStatus>)value;
+          return this;
+        case "copackagedIndicator":
+          CopackagedIndicatorElement = (Hl7.Fhir.Model.FhirBoolean)value;
+          return this;
+        case "manufacturer":
+          Manufacturer = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "attachedDocument":
+          AttachedDocument = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "packaging":
+          Packaging = (Hl7.Fhir.Model.PackagedProductDefinition.PackagingComponent)value;
+          return this;
+        case "characteristic":
+          Characteristic = (List<Hl7.Fhir.Model.PackagedProductDefinition.PropertyComponent>)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/ParameterDefinition.cs b/src/Hl7.Fhir.R5/Model/Generated/ParameterDefinition.cs
index 75a9ebc240..eee08e3459 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/ParameterDefinition.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/ParameterDefinition.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -405,6 +405,37 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "name":
+          NameElement = (Hl7.Fhir.Model.Code)value;
+          return this;
+        case "use":
+          UseElement = (Code<Hl7.Fhir.Model.OperationParameterUse>)value;
+          return this;
+        case "min":
+          MinElement = (Hl7.Fhir.Model.Integer)value;
+          return this;
+        case "max":
+          MaxElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "documentation":
+          DocumentationElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "type":
+          TypeElement = (Code<Hl7.Fhir.Model.FHIRAllTypes>)value;
+          return this;
+        case "profile":
+          ProfileElement = (Hl7.Fhir.Model.Canonical)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/Patient.cs b/src/Hl7.Fhir.R5/Model/Generated/Patient.cs
index 9a66f0065d..a0cde86134 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/Patient.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/Patient.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Patient","http://hl7.org/fhir/StructureDefinition/Patient", IsResource=true)]
+  [FhirType("Patient","http://hl7.org/fhir/StructureDefinition/Patient")]
   public partial class Patient : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -101,7 +101,7 @@ public enum LinkType
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Patient#Contact", IsNestedType=true)]
+    [FhirType("Patient#Contact")]
     [BackboneType("Patient.contact")]
     public partial class ContactComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -349,6 +349,37 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "relationship":
+            Relationship = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+            return this;
+          case "name":
+            Name = (Hl7.Fhir.Model.HumanName)value;
+            return this;
+          case "telecom":
+            Telecom = (List<Hl7.Fhir.Model.ContactPoint>)value;
+            return this;
+          case "address":
+            Address = (Hl7.Fhir.Model.Address)value;
+            return this;
+          case "gender":
+            GenderElement = (Code<Hl7.Fhir.Model.AdministrativeGender>)value;
+            return this;
+          case "organization":
+            Organization = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          case "period":
+            Period = (Hl7.Fhir.Model.Period)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -371,7 +402,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Patient#Communication", IsNestedType=true)]
+    [FhirType("Patient#Communication")]
     [BackboneType("Patient.communication")]
     public partial class CommunicationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -509,6 +540,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "language":
+            Language = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "preferred":
+            PreferredElement = (Hl7.Fhir.Model.FhirBoolean)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -526,7 +573,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Patient#Link", IsNestedType=true)]
+    [FhirType("Patient#Link")]
     [BackboneType("Patient.link")]
     public partial class LinkComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -668,6 +715,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "other":
+            Other = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          case "type":
+            TypeElement = (Code<Hl7.Fhir.Model.Patient.LinkType>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1156,6 +1219,64 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "active":
+          ActiveElement = (Hl7.Fhir.Model.FhirBoolean)value;
+          return this;
+        case "name":
+          Name = (List<Hl7.Fhir.Model.HumanName>)value;
+          return this;
+        case "telecom":
+          Telecom = (List<Hl7.Fhir.Model.ContactPoint>)value;
+          return this;
+        case "gender":
+          GenderElement = (Code<Hl7.Fhir.Model.AdministrativeGender>)value;
+          return this;
+        case "birthDate":
+          BirthDateElement = (Hl7.Fhir.Model.Date)value;
+          return this;
+        case "deceased":
+          Deceased = (Hl7.Fhir.Model.DataType)value;
+          return this;
+        case "address":
+          Address = (List<Hl7.Fhir.Model.Address>)value;
+          return this;
+        case "maritalStatus":
+          MaritalStatus = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "multipleBirth":
+          MultipleBirth = (Hl7.Fhir.Model.DataType)value;
+          return this;
+        case "photo":
+          Photo = (List<Hl7.Fhir.Model.Attachment>)value;
+          return this;
+        case "contact":
+          Contact = (List<Hl7.Fhir.Model.Patient.ContactComponent>)value;
+          return this;
+        case "communication":
+          Communication = (List<Hl7.Fhir.Model.Patient.CommunicationComponent>)value;
+          return this;
+        case "generalPractitioner":
+          GeneralPractitioner = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "managingOrganization":
+          ManagingOrganization = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "link":
+          Link = (List<Hl7.Fhir.Model.Patient.LinkComponent>)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/PaymentNotice.cs b/src/Hl7.Fhir.R5/Model/Generated/PaymentNotice.cs
index 8f213d09da..995124c7f6 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/PaymentNotice.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/PaymentNotice.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("PaymentNotice","http://hl7.org/fhir/StructureDefinition/PaymentNotice", IsResource=true)]
+  [FhirType("PaymentNotice","http://hl7.org/fhir/StructureDefinition/PaymentNotice")]
   public partial class PaymentNotice : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -454,6 +454,52 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "status":
+          StatusElement = (Code<Hl7.Fhir.Model.FinancialResourceStatusCodes>)value;
+          return this;
+        case "request":
+          Request = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "response":
+          Response = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "created":
+          CreatedElement = (Hl7.Fhir.Model.FhirDateTime)value;
+          return this;
+        case "reporter":
+          Reporter = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "payment":
+          Payment = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "paymentDate":
+          PaymentDateElement = (Hl7.Fhir.Model.Date)value;
+          return this;
+        case "payee":
+          Payee = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "recipient":
+          Recipient = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "amount":
+          Amount = (Hl7.Fhir.Model.Money)value;
+          return this;
+        case "paymentStatus":
+          PaymentStatus = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/PaymentReconciliation.cs b/src/Hl7.Fhir.R5/Model/Generated/PaymentReconciliation.cs
index a6dad8ed1d..4077fd50ba 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/PaymentReconciliation.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/PaymentReconciliation.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("PaymentReconciliation","http://hl7.org/fhir/StructureDefinition/PaymentReconciliation", IsResource=true)]
+  [FhirType("PaymentReconciliation","http://hl7.org/fhir/StructureDefinition/PaymentReconciliation")]
   public partial class PaymentReconciliation : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -101,7 +101,7 @@ public enum PaymentOutcome
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("PaymentReconciliation#Allocation", IsNestedType=true)]
+    [FhirType("PaymentReconciliation#Allocation")]
     [BackboneType("PaymentReconciliation.allocation")]
     public partial class AllocationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -485,6 +485,55 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "identifier":
+            Identifier = (Hl7.Fhir.Model.Identifier)value;
+            return this;
+          case "predecessor":
+            Predecessor = (Hl7.Fhir.Model.Identifier)value;
+            return this;
+          case "target":
+            Target = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          case "targetItem":
+            TargetItem = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          case "encounter":
+            Encounter = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          case "account":
+            Account = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          case "type":
+            Type = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "submitter":
+            Submitter = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          case "response":
+            Response = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          case "date":
+            DateElement = (Hl7.Fhir.Model.Date)value;
+            return this;
+          case "responsible":
+            Responsible = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          case "payee":
+            Payee = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          case "amount":
+            Amount = (Hl7.Fhir.Model.Money)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -513,7 +562,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("PaymentReconciliation#Notes", IsNestedType=true)]
+    [FhirType("PaymentReconciliation#Notes")]
     [BackboneType("PaymentReconciliation.processNote")]
     public partial class NotesComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -669,6 +718,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "type":
+            TypeElement = (Code<Hl7.Fhir.Model.NoteType>)value;
+            return this;
+          case "text":
+            TextElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1581,6 +1646,103 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "type":
+          Type = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "status":
+          StatusElement = (Code<Hl7.Fhir.Model.FinancialResourceStatusCodes>)value;
+          return this;
+        case "kind":
+          Kind = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "period":
+          Period = (Hl7.Fhir.Model.Period)value;
+          return this;
+        case "created":
+          CreatedElement = (Hl7.Fhir.Model.FhirDateTime)value;
+          return this;
+        case "enterer":
+          Enterer = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "issuerType":
+          IssuerType = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "paymentIssuer":
+          PaymentIssuer = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "request":
+          Request = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "requestor":
+          Requestor = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "outcome":
+          OutcomeElement = (Code<Hl7.Fhir.Model.PaymentReconciliation.PaymentOutcome>)value;
+          return this;
+        case "disposition":
+          DispositionElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "date":
+          DateElement = (Hl7.Fhir.Model.Date)value;
+          return this;
+        case "location":
+          Location = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "method":
+          Method = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "cardBrand":
+          CardBrandElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "accountNumber":
+          AccountNumberElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "expirationDate":
+          ExpirationDateElement = (Hl7.Fhir.Model.Date)value;
+          return this;
+        case "processor":
+          ProcessorElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "referenceNumber":
+          ReferenceNumberElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "authorization":
+          AuthorizationElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "tenderedAmount":
+          TenderedAmount = (Hl7.Fhir.Model.Money)value;
+          return this;
+        case "returnedAmount":
+          ReturnedAmount = (Hl7.Fhir.Model.Money)value;
+          return this;
+        case "amount":
+          Amount = (Hl7.Fhir.Model.Money)value;
+          return this;
+        case "paymentIdentifier":
+          PaymentIdentifier = (Hl7.Fhir.Model.Identifier)value;
+          return this;
+        case "allocation":
+          Allocation = (List<Hl7.Fhir.Model.PaymentReconciliation.AllocationComponent>)value;
+          return this;
+        case "formCode":
+          FormCode = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "processNote":
+          ProcessNote = (List<Hl7.Fhir.Model.PaymentReconciliation.NotesComponent>)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/Permission.cs b/src/Hl7.Fhir.R5/Model/Generated/Permission.cs
index 8b18a9f40f..1de32f98ca 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/Permission.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/Permission.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Permission","http://hl7.org/fhir/StructureDefinition/Permission", IsResource=true)]
+  [FhirType("Permission","http://hl7.org/fhir/StructureDefinition/Permission")]
   public partial class Permission : Hl7.Fhir.Model.DomainResource
   {
     /// <summary>
@@ -144,7 +144,7 @@ public enum PermissionRuleCombining
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Permission#Justification", IsNestedType=true)]
+    [FhirType("Permission#Justification")]
     [BackboneType("Permission.justification")]
     public partial class JustificationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -267,6 +267,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "basis":
+            Basis = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+            return this;
+          case "evidence":
+            Evidence = (List<Hl7.Fhir.Model.ResourceReference>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -284,7 +300,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Permission#Rule", IsNestedType=true)]
+    [FhirType("Permission#Rule")]
     [BackboneType("Permission.rule")]
     public partial class RuleComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -468,6 +484,28 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "type":
+            TypeElement = (Code<Hl7.Fhir.Model.ConsentProvisionType>)value;
+            return this;
+          case "data":
+            Data = (List<Hl7.Fhir.Model.Permission.DataComponent>)value;
+            return this;
+          case "activity":
+            Activity = (List<Hl7.Fhir.Model.Permission.ActivityComponent>)value;
+            return this;
+          case "limit":
+            Limit = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -487,7 +525,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Permission#Data", IsNestedType=true)]
+    [FhirType("Permission#Data")]
     [BackboneType("Permission.rule.data")]
     public partial class DataComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -650,6 +688,28 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "resource":
+            Resource = (List<Hl7.Fhir.Model.Permission.ResourceComponent>)value;
+            return this;
+          case "security":
+            Security = (List<Hl7.Fhir.Model.Coding>)value;
+            return this;
+          case "period":
+            Period = (List<Hl7.Fhir.Model.Period>)value;
+            return this;
+          case "expression":
+            Expression = (Hl7.Fhir.Model.Expression)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -666,7 +726,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Permission#Resource", IsNestedType=true)]
+    [FhirType("Permission#Resource")]
     [BackboneType("Permission.rule.data.resource")]
     public partial class ResourceComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -808,6 +868,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "meaning":
+            MeaningElement = (Code<Hl7.Fhir.Model.ConsentDataMeaning>)value;
+            return this;
+          case "reference":
+            Reference = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -822,7 +898,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Permission#Activity", IsNestedType=true)]
+    [FhirType("Permission#Activity")]
     [BackboneType("Permission.rule.activity")]
     public partial class ActivityComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -968,6 +1044,25 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "actor":
+            Actor = (List<Hl7.Fhir.Model.ResourceReference>)value;
+            return this;
+          case "action":
+            Action = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+            return this;
+          case "purpose":
+            Purpose = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1256,6 +1351,37 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "status":
+          StatusElement = (Code<Hl7.Fhir.Model.Permission.PermissionStatus>)value;
+          return this;
+        case "asserter":
+          Asserter = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "date":
+          DateElement = (List<Hl7.Fhir.Model.FhirDateTime>)value;
+          return this;
+        case "validity":
+          Validity = (Hl7.Fhir.Model.Period)value;
+          return this;
+        case "justification":
+          Justification = (Hl7.Fhir.Model.Permission.JustificationComponent)value;
+          return this;
+        case "combining":
+          CombiningElement = (Code<Hl7.Fhir.Model.Permission.PermissionRuleCombining>)value;
+          return this;
+        case "rule":
+          Rule = (List<Hl7.Fhir.Model.Permission.RuleComponent>)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/Person.cs b/src/Hl7.Fhir.R5/Model/Generated/Person.cs
index 9b37fe74c2..9123d5ff0f 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/Person.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/Person.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Person","http://hl7.org/fhir/StructureDefinition/Person", IsResource=true)]
+  [FhirType("Person","http://hl7.org/fhir/StructureDefinition/Person")]
   public partial class Person : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -103,7 +103,7 @@ public enum IdentityAssuranceLevel
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Person#Communication", IsNestedType=true)]
+    [FhirType("Person#Communication")]
     [BackboneType("Person.communication")]
     public partial class CommunicationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -241,6 +241,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "language":
+            Language = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "preferred":
+            PreferredElement = (Hl7.Fhir.Model.FhirBoolean)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -255,7 +271,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Person#Link", IsNestedType=true)]
+    [FhirType("Person#Link")]
     [BackboneType("Person.link")]
     public partial class LinkComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -396,6 +412,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "target":
+            Target = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          case "assurance":
+            AssuranceElement = (Code<Hl7.Fhir.Model.Person.IdentityAssuranceLevel>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -815,6 +847,55 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "active":
+          ActiveElement = (Hl7.Fhir.Model.FhirBoolean)value;
+          return this;
+        case "name":
+          Name = (List<Hl7.Fhir.Model.HumanName>)value;
+          return this;
+        case "telecom":
+          Telecom = (List<Hl7.Fhir.Model.ContactPoint>)value;
+          return this;
+        case "gender":
+          GenderElement = (Code<Hl7.Fhir.Model.AdministrativeGender>)value;
+          return this;
+        case "birthDate":
+          BirthDateElement = (Hl7.Fhir.Model.Date)value;
+          return this;
+        case "deceased":
+          Deceased = (Hl7.Fhir.Model.DataType)value;
+          return this;
+        case "address":
+          Address = (List<Hl7.Fhir.Model.Address>)value;
+          return this;
+        case "maritalStatus":
+          MaritalStatus = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "photo":
+          Photo = (List<Hl7.Fhir.Model.Attachment>)value;
+          return this;
+        case "communication":
+          Communication = (List<Hl7.Fhir.Model.Person.CommunicationComponent>)value;
+          return this;
+        case "managingOrganization":
+          ManagingOrganization = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "link":
+          Link = (List<Hl7.Fhir.Model.Person.LinkComponent>)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/PlanDefinition.cs b/src/Hl7.Fhir.R5/Model/Generated/PlanDefinition.cs
index 6c8ff8090a..0854f58af9 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/PlanDefinition.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/PlanDefinition.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("PlanDefinition","http://hl7.org/fhir/StructureDefinition/PlanDefinition", IsResource=true)]
+  [FhirType("PlanDefinition","http://hl7.org/fhir/StructureDefinition/PlanDefinition")]
   public partial class PlanDefinition : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -67,7 +67,7 @@ public partial class PlanDefinition : Hl7.Fhir.Model.DomainResource, IIdentifiab
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("PlanDefinition#Goal", IsNestedType=true)]
+    [FhirType("PlanDefinition#Goal")]
     [BackboneType("PlanDefinition.goal")]
     public partial class GoalComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -299,6 +299,37 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "category":
+            Category = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "description":
+            Description = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "priority":
+            Priority = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "start":
+            Start = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "addresses":
+            Addresses = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+            return this;
+          case "documentation":
+            Documentation = (List<Hl7.Fhir.Model.RelatedArtifact>)value;
+            return this;
+          case "target":
+            Target = (List<Hl7.Fhir.Model.PlanDefinition.TargetComponent>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -321,7 +352,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("PlanDefinition#Target", IsNestedType=true)]
+    [FhirType("PlanDefinition#Target")]
     [BackboneType("PlanDefinition.goal.target")]
     public partial class TargetComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -463,6 +494,25 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "measure":
+            Measure = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "detail":
+            Detail = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          case "due":
+            Due = (Hl7.Fhir.Model.Duration)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -481,7 +531,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("PlanDefinition#Actor", IsNestedType=true)]
+    [FhirType("PlanDefinition#Actor")]
     [BackboneType("PlanDefinition.actor")]
     public partial class ActorComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -657,6 +707,25 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "title":
+            TitleElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "description":
+            DescriptionElement = (Hl7.Fhir.Model.Markdown)value;
+            return this;
+          case "option":
+            Option = (List<Hl7.Fhir.Model.PlanDefinition.OptionComponent>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -675,7 +744,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("PlanDefinition#Option", IsNestedType=true)]
+    [FhirType("PlanDefinition#Option")]
     [BackboneType("PlanDefinition.actor.option")]
     public partial class OptionComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -876,6 +945,28 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "type":
+            TypeElement = (Code<Hl7.Fhir.Model.ActionParticipantType>)value;
+            return this;
+          case "typeCanonical":
+            TypeCanonicalElement = (Hl7.Fhir.Model.Canonical)value;
+            return this;
+          case "typeReference":
+            TypeReference = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          case "role":
+            Role = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -896,7 +987,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("PlanDefinition#Action", IsNestedType=true)]
+    [FhirType("PlanDefinition#Action")]
     [BackboneType("PlanDefinition.action")]
     public partial class ActionComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1849,6 +1940,103 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "linkId":
+            LinkIdElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "prefix":
+            PrefixElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "title":
+            TitleElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "description":
+            DescriptionElement = (Hl7.Fhir.Model.Markdown)value;
+            return this;
+          case "textEquivalent":
+            TextEquivalentElement = (Hl7.Fhir.Model.Markdown)value;
+            return this;
+          case "priority":
+            PriorityElement = (Code<Hl7.Fhir.Model.RequestPriority>)value;
+            return this;
+          case "code":
+            Code = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "reason":
+            Reason = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+            return this;
+          case "documentation":
+            Documentation = (List<Hl7.Fhir.Model.RelatedArtifact>)value;
+            return this;
+          case "goalId":
+            GoalIdElement = (List<Hl7.Fhir.Model.Id>)value;
+            return this;
+          case "subject":
+            Subject = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          case "trigger":
+            Trigger = (List<Hl7.Fhir.Model.TriggerDefinition>)value;
+            return this;
+          case "condition":
+            Condition = (List<Hl7.Fhir.Model.PlanDefinition.ConditionComponent>)value;
+            return this;
+          case "input":
+            Input = (List<Hl7.Fhir.Model.PlanDefinition.InputComponent>)value;
+            return this;
+          case "output":
+            Output = (List<Hl7.Fhir.Model.PlanDefinition.OutputComponent>)value;
+            return this;
+          case "relatedAction":
+            RelatedAction = (List<Hl7.Fhir.Model.PlanDefinition.RelatedActionComponent>)value;
+            return this;
+          case "timing":
+            Timing = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          case "location":
+            Location = (Hl7.Fhir.Model.CodeableReference)value;
+            return this;
+          case "participant":
+            Participant = (List<Hl7.Fhir.Model.PlanDefinition.ParticipantComponent>)value;
+            return this;
+          case "type":
+            Type = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "groupingBehavior":
+            GroupingBehaviorElement = (Code<Hl7.Fhir.Model.ActionGroupingBehavior>)value;
+            return this;
+          case "selectionBehavior":
+            SelectionBehaviorElement = (Code<Hl7.Fhir.Model.ActionSelectionBehavior>)value;
+            return this;
+          case "requiredBehavior":
+            RequiredBehaviorElement = (Code<Hl7.Fhir.Model.ActionRequiredBehavior>)value;
+            return this;
+          case "precheckBehavior":
+            PrecheckBehaviorElement = (Code<Hl7.Fhir.Model.ActionPrecheckBehavior>)value;
+            return this;
+          case "cardinalityBehavior":
+            CardinalityBehaviorElement = (Code<Hl7.Fhir.Model.ActionCardinalityBehavior>)value;
+            return this;
+          case "definition":
+            Definition = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          case "transform":
+            TransformElement = (Hl7.Fhir.Model.Canonical)value;
+            return this;
+          case "dynamicValue":
+            DynamicValue = (List<Hl7.Fhir.Model.PlanDefinition.DynamicValueComponent>)value;
+            return this;
+          case "action":
+            Action = (List<Hl7.Fhir.Model.PlanDefinition.ActionComponent>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1894,7 +2082,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("PlanDefinition#Condition", IsNestedType=true)]
+    [FhirType("PlanDefinition#Condition")]
     [BackboneType("PlanDefinition.action.condition")]
     public partial class ConditionComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2033,6 +2221,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "kind":
+            KindElement = (Code<Hl7.Fhir.Model.ActionConditionKind>)value;
+            return this;
+          case "expression":
+            Expression = (Hl7.Fhir.Model.Expression)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -2050,7 +2254,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("PlanDefinition#Input", IsNestedType=true)]
+    [FhirType("PlanDefinition#Input")]
     [BackboneType("PlanDefinition.action.input")]
     public partial class InputComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2225,6 +2429,25 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "title":
+            TitleElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "requirement":
+            Requirement = (Hl7.Fhir.Model.DataRequirement)value;
+            return this;
+          case "relatedData":
+            RelatedDataElement = (Hl7.Fhir.Model.Id)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -2243,7 +2466,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("PlanDefinition#Output", IsNestedType=true)]
+    [FhirType("PlanDefinition#Output")]
     [BackboneType("PlanDefinition.action.output")]
     public partial class OutputComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2418,6 +2641,25 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "title":
+            TitleElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "requirement":
+            Requirement = (Hl7.Fhir.Model.DataRequirement)value;
+            return this;
+          case "relatedData":
+            RelatedDataElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -2437,7 +2679,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("PlanDefinition#RelatedAction", IsNestedType=true)]
+    [FhirType("PlanDefinition#RelatedAction")]
     [BackboneType("PlanDefinition.action.relatedAction")]
     public partial class RelatedActionComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2659,6 +2901,28 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "targetId":
+            TargetIdElement = (Hl7.Fhir.Model.Id)value;
+            return this;
+          case "relationship":
+            RelationshipElement = (Code<Hl7.Fhir.Model.ActionRelationshipType>)value;
+            return this;
+          case "endRelationship":
+            EndRelationshipElement = (Code<Hl7.Fhir.Model.ActionRelationshipType>)value;
+            return this;
+          case "offset":
+            Offset = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -2678,7 +2942,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("PlanDefinition#Participant", IsNestedType=true)]
+    [FhirType("PlanDefinition#Participant")]
     [BackboneType("PlanDefinition.action.participant")]
     public partial class ParticipantComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2940,6 +3204,34 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "actorId":
+            ActorIdElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "type":
+            TypeElement = (Code<Hl7.Fhir.Model.ActionParticipantType>)value;
+            return this;
+          case "typeCanonical":
+            TypeCanonicalElement = (Hl7.Fhir.Model.Canonical)value;
+            return this;
+          case "typeReference":
+            TypeReference = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          case "role":
+            Role = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "function":
+            Function = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -2962,7 +3254,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("PlanDefinition#DynamicValue", IsNestedType=true)]
+    [FhirType("PlanDefinition#DynamicValue")]
     [BackboneType("PlanDefinition.action.dynamicValue")]
     public partial class DynamicValueComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -3098,6 +3390,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "path":
+            PathElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "expression":
+            Expression = (Hl7.Fhir.Model.Expression)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -4246,6 +4554,121 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "url":
+          UrlElement = (Hl7.Fhir.Model.FhirUri)value;
+          return this;
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "version":
+          VersionElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "versionAlgorithm":
+          VersionAlgorithm = (Hl7.Fhir.Model.DataType)value;
+          return this;
+        case "name":
+          NameElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "title":
+          TitleElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "subtitle":
+          SubtitleElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "type":
+          Type = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "status":
+          StatusElement = (Code<Hl7.Fhir.Model.PublicationStatus>)value;
+          return this;
+        case "experimental":
+          ExperimentalElement = (Hl7.Fhir.Model.FhirBoolean)value;
+          return this;
+        case "subject":
+          Subject = (Hl7.Fhir.Model.DataType)value;
+          return this;
+        case "date":
+          DateElement = (Hl7.Fhir.Model.FhirDateTime)value;
+          return this;
+        case "publisher":
+          PublisherElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "contact":
+          Contact = (List<Hl7.Fhir.Model.ContactDetail>)value;
+          return this;
+        case "description":
+          DescriptionElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        case "useContext":
+          UseContext = (List<Hl7.Fhir.Model.UsageContext>)value;
+          return this;
+        case "jurisdiction":
+          Jurisdiction = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "purpose":
+          PurposeElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        case "usage":
+          UsageElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        case "copyright":
+          CopyrightElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        case "copyrightLabel":
+          CopyrightLabelElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "approvalDate":
+          ApprovalDateElement = (Hl7.Fhir.Model.Date)value;
+          return this;
+        case "lastReviewDate":
+          LastReviewDateElement = (Hl7.Fhir.Model.Date)value;
+          return this;
+        case "effectivePeriod":
+          EffectivePeriod = (Hl7.Fhir.Model.Period)value;
+          return this;
+        case "topic":
+          Topic = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "author":
+          Author = (List<Hl7.Fhir.Model.ContactDetail>)value;
+          return this;
+        case "editor":
+          Editor = (List<Hl7.Fhir.Model.ContactDetail>)value;
+          return this;
+        case "reviewer":
+          Reviewer = (List<Hl7.Fhir.Model.ContactDetail>)value;
+          return this;
+        case "endorser":
+          Endorser = (List<Hl7.Fhir.Model.ContactDetail>)value;
+          return this;
+        case "relatedArtifact":
+          RelatedArtifact = (List<Hl7.Fhir.Model.RelatedArtifact>)value;
+          return this;
+        case "library":
+          LibraryElement = (List<Hl7.Fhir.Model.Canonical>)value;
+          return this;
+        case "goal":
+          Goal = (List<Hl7.Fhir.Model.PlanDefinition.GoalComponent>)value;
+          return this;
+        case "actor":
+          Actor = (List<Hl7.Fhir.Model.PlanDefinition.ActorComponent>)value;
+          return this;
+        case "action":
+          Action = (List<Hl7.Fhir.Model.PlanDefinition.ActionComponent>)value;
+          return this;
+        case "asNeeded":
+          AsNeeded = (Hl7.Fhir.Model.DataType)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/Practitioner.cs b/src/Hl7.Fhir.R5/Model/Generated/Practitioner.cs
index 473d8b08fc..d672ed439c 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/Practitioner.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/Practitioner.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Practitioner","http://hl7.org/fhir/StructureDefinition/Practitioner", IsResource=true)]
+  [FhirType("Practitioner","http://hl7.org/fhir/StructureDefinition/Practitioner")]
   public partial class Practitioner : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -69,7 +69,7 @@ public partial class Practitioner : Hl7.Fhir.Model.DomainResource, IIdentifiable
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Practitioner#Qualification", IsNestedType=true)]
+    [FhirType("Practitioner#Qualification")]
     [BackboneType("Practitioner.qualification")]
     public partial class QualificationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -234,6 +234,28 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "identifier":
+            Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+            return this;
+          case "code":
+            Code = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "period":
+            Period = (Hl7.Fhir.Model.Period)value;
+            return this;
+          case "issuer":
+            Issuer = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -256,7 +278,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Practitioner#Communication", IsNestedType=true)]
+    [FhirType("Practitioner#Communication")]
     [BackboneType("Practitioner.communication")]
     public partial class CommunicationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -394,6 +416,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "language":
+            Language = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "preferred":
+            PreferredElement = (Hl7.Fhir.Model.FhirBoolean)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -768,6 +806,49 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "active":
+          ActiveElement = (Hl7.Fhir.Model.FhirBoolean)value;
+          return this;
+        case "name":
+          Name = (List<Hl7.Fhir.Model.HumanName>)value;
+          return this;
+        case "telecom":
+          Telecom = (List<Hl7.Fhir.Model.ContactPoint>)value;
+          return this;
+        case "gender":
+          GenderElement = (Code<Hl7.Fhir.Model.AdministrativeGender>)value;
+          return this;
+        case "birthDate":
+          BirthDateElement = (Hl7.Fhir.Model.Date)value;
+          return this;
+        case "deceased":
+          Deceased = (Hl7.Fhir.Model.DataType)value;
+          return this;
+        case "address":
+          Address = (List<Hl7.Fhir.Model.Address>)value;
+          return this;
+        case "photo":
+          Photo = (List<Hl7.Fhir.Model.Attachment>)value;
+          return this;
+        case "qualification":
+          Qualification = (List<Hl7.Fhir.Model.Practitioner.QualificationComponent>)value;
+          return this;
+        case "communication":
+          Communication = (List<Hl7.Fhir.Model.Practitioner.CommunicationComponent>)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/PractitionerRole.cs b/src/Hl7.Fhir.R5/Model/Generated/PractitionerRole.cs
index 9e9fce22d3..4348f7fd85 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/PractitionerRole.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/PractitionerRole.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("PractitionerRole","http://hl7.org/fhir/StructureDefinition/PractitionerRole", IsResource=true)]
+  [FhirType("PractitionerRole","http://hl7.org/fhir/StructureDefinition/PractitionerRole")]
   public partial class PractitionerRole : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -464,6 +464,58 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "active":
+          ActiveElement = (Hl7.Fhir.Model.FhirBoolean)value;
+          return this;
+        case "period":
+          Period = (Hl7.Fhir.Model.Period)value;
+          return this;
+        case "practitioner":
+          Practitioner = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "organization":
+          Organization = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "code":
+          Code = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "specialty":
+          Specialty = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "location":
+          Location = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "healthcareService":
+          HealthcareService = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "contact":
+          Contact = (List<Hl7.Fhir.Model.ExtendedContactDetail>)value;
+          return this;
+        case "characteristic":
+          Characteristic = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "communication":
+          Communication = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "availability":
+          Availability = (List<Hl7.Fhir.Model.Availability>)value;
+          return this;
+        case "endpoint":
+          Endpoint = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/Procedure.cs b/src/Hl7.Fhir.R5/Model/Generated/Procedure.cs
index a54d2c327f..c32fa2e875 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/Procedure.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/Procedure.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Procedure","http://hl7.org/fhir/StructureDefinition/Procedure", IsResource=true)]
+  [FhirType("Procedure","http://hl7.org/fhir/StructureDefinition/Procedure")]
   public partial class Procedure : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -67,7 +67,7 @@ public partial class Procedure : Hl7.Fhir.Model.DomainResource, IIdentifiable<Li
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Procedure#Performer", IsNestedType=true)]
+    [FhirType("Procedure#Performer")]
     [BackboneType("Procedure.performer")]
     public partial class PerformerComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -233,6 +233,28 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "function":
+            Function = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "actor":
+            Actor = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          case "onBehalfOf":
+            OnBehalfOf = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          case "period":
+            Period = (Hl7.Fhir.Model.Period)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -252,7 +274,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Procedure#FocalDevice", IsNestedType=true)]
+    [FhirType("Procedure#FocalDevice")]
     [BackboneType("Procedure.focalDevice")]
     public partial class FocalDeviceComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -374,6 +396,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "action":
+            Action = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "manipulated":
+            Manipulated = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1164,6 +1202,100 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "instantiatesCanonical":
+          InstantiatesCanonicalElement = (List<Hl7.Fhir.Model.Canonical>)value;
+          return this;
+        case "instantiatesUri":
+          InstantiatesUriElement = (List<Hl7.Fhir.Model.FhirUri>)value;
+          return this;
+        case "basedOn":
+          BasedOn = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "partOf":
+          PartOf = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "status":
+          StatusElement = (Code<Hl7.Fhir.Model.EventStatus>)value;
+          return this;
+        case "statusReason":
+          StatusReason = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "category":
+          Category = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "code":
+          Code = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "subject":
+          Subject = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "focus":
+          Focus = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "encounter":
+          Encounter = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "occurrence":
+          Occurrence = (Hl7.Fhir.Model.DataType)value;
+          return this;
+        case "recorded":
+          RecordedElement = (Hl7.Fhir.Model.FhirDateTime)value;
+          return this;
+        case "recorder":
+          Recorder = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "reported":
+          Reported = (Hl7.Fhir.Model.DataType)value;
+          return this;
+        case "performer":
+          Performer = (List<Hl7.Fhir.Model.Procedure.PerformerComponent>)value;
+          return this;
+        case "location":
+          Location = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "reason":
+          Reason = (List<Hl7.Fhir.Model.CodeableReference>)value;
+          return this;
+        case "bodySite":
+          BodySite = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "outcome":
+          Outcome = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "report":
+          Report = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "complication":
+          Complication = (List<Hl7.Fhir.Model.CodeableReference>)value;
+          return this;
+        case "followUp":
+          FollowUp = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "note":
+          Note = (List<Hl7.Fhir.Model.Annotation>)value;
+          return this;
+        case "focalDevice":
+          FocalDevice = (List<Hl7.Fhir.Model.Procedure.FocalDeviceComponent>)value;
+          return this;
+        case "used":
+          Used = (List<Hl7.Fhir.Model.CodeableReference>)value;
+          return this;
+        case "supportingInfo":
+          SupportingInfo = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/ProductShelfLife.cs b/src/Hl7.Fhir.R5/Model/Generated/ProductShelfLife.cs
index 346d2d8eab..c8698349ab 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/ProductShelfLife.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/ProductShelfLife.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -189,6 +189,25 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "type":
+          Type = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "period":
+          Period = (Hl7.Fhir.Model.DataType)value;
+          return this;
+        case "specialPrecautionsForStorage":
+          SpecialPrecautionsForStorage = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/Provenance.cs b/src/Hl7.Fhir.R5/Model/Generated/Provenance.cs
index 9b9a4d8a92..2f18f3e96b 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/Provenance.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/Provenance.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Provenance","http://hl7.org/fhir/StructureDefinition/Provenance", IsResource=true)]
+  [FhirType("Provenance","http://hl7.org/fhir/StructureDefinition/Provenance")]
   public partial class Provenance : Hl7.Fhir.Model.DomainResource
   {
     /// <summary>
@@ -109,7 +109,7 @@ public enum ProvenanceEntityRole
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Provenance#Agent", IsNestedType=true)]
+    [FhirType("Provenance#Agent")]
     [BackboneType("Provenance.agent")]
     public partial class AgentComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -277,6 +277,28 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "type":
+            Type = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "role":
+            Role = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+            return this;
+          case "who":
+            Who = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          case "onBehalfOf":
+            OnBehalfOf = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -293,7 +315,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Provenance#Entity", IsNestedType=true)]
+    [FhirType("Provenance#Entity")]
     [BackboneType("Provenance.entity")]
     public partial class EntityComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -457,6 +479,25 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "role":
+            RoleElement = (Code<Hl7.Fhir.Model.Provenance.ProvenanceEntityRole>)value;
+            return this;
+          case "what":
+            What = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          case "agent":
+            Agent = (List<Hl7.Fhir.Model.Provenance.AgentComponent>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -864,6 +905,55 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "target":
+          Target = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "occurred":
+          Occurred = (Hl7.Fhir.Model.DataType)value;
+          return this;
+        case "recorded":
+          RecordedElement = (Hl7.Fhir.Model.Instant)value;
+          return this;
+        case "policy":
+          PolicyElement = (List<Hl7.Fhir.Model.FhirUri>)value;
+          return this;
+        case "location":
+          Location = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "authorization":
+          Authorization = (List<Hl7.Fhir.Model.CodeableReference>)value;
+          return this;
+        case "activity":
+          Activity = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "basedOn":
+          BasedOn = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "patient":
+          Patient = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "encounter":
+          Encounter = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "agent":
+          Agent = (List<Hl7.Fhir.Model.Provenance.AgentComponent>)value;
+          return this;
+        case "entity":
+          Entity = (List<Hl7.Fhir.Model.Provenance.EntityComponent>)value;
+          return this;
+        case "signature":
+          Signature = (List<Hl7.Fhir.Model.Signature>)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/Questionnaire.cs b/src/Hl7.Fhir.R5/Model/Generated/Questionnaire.cs
index d8eaaefee3..430b03f74f 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/Questionnaire.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/Questionnaire.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Questionnaire","http://hl7.org/fhir/StructureDefinition/Questionnaire", IsResource=true)]
+  [FhirType("Questionnaire","http://hl7.org/fhir/StructureDefinition/Questionnaire")]
   public partial class Questionnaire : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -298,7 +298,7 @@ public enum QuestionnaireItemOperator
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Questionnaire#Item", IsNestedType=true)]
+    [FhirType("Questionnaire#Item")]
     [BackboneType("Questionnaire.item")]
     public partial class ItemComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1002,6 +1002,70 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "linkId":
+            LinkIdElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "definition":
+            DefinitionElement = (Hl7.Fhir.Model.FhirUri)value;
+            return this;
+          case "code":
+            Code = (List<Hl7.Fhir.Model.Coding>)value;
+            return this;
+          case "prefix":
+            PrefixElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "text":
+            TextElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "type":
+            TypeElement = (Code<Hl7.Fhir.Model.Questionnaire.QuestionnaireItemType>)value;
+            return this;
+          case "enableWhen":
+            EnableWhen = (List<Hl7.Fhir.Model.Questionnaire.EnableWhenComponent>)value;
+            return this;
+          case "enableBehavior":
+            EnableBehaviorElement = (Code<Hl7.Fhir.Model.Questionnaire.EnableWhenBehavior>)value;
+            return this;
+          case "disabledDisplay":
+            DisabledDisplayElement = (Code<Hl7.Fhir.Model.Questionnaire.QuestionnaireItemDisabledDisplay>)value;
+            return this;
+          case "required":
+            RequiredElement = (Hl7.Fhir.Model.FhirBoolean)value;
+            return this;
+          case "repeats":
+            RepeatsElement = (Hl7.Fhir.Model.FhirBoolean)value;
+            return this;
+          case "readOnly":
+            ReadOnlyElement = (Hl7.Fhir.Model.FhirBoolean)value;
+            return this;
+          case "maxLength":
+            MaxLengthElement = (Hl7.Fhir.Model.Integer)value;
+            return this;
+          case "answerConstraint":
+            AnswerConstraintElement = (Code<Hl7.Fhir.Model.Questionnaire.QuestionnaireAnswerConstraint>)value;
+            return this;
+          case "answerValueSet":
+            AnswerValueSetElement = (Hl7.Fhir.Model.Canonical)value;
+            return this;
+          case "answerOption":
+            AnswerOption = (List<Hl7.Fhir.Model.Questionnaire.AnswerOptionComponent>)value;
+            return this;
+          case "initial":
+            Initial = (List<Hl7.Fhir.Model.Questionnaire.InitialComponent>)value;
+            return this;
+          case "item":
+            Item = (List<Hl7.Fhir.Model.Questionnaire.ItemComponent>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1036,7 +1100,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Questionnaire#EnableWhen", IsNestedType=true)]
+    [FhirType("Questionnaire#EnableWhen")]
     [BackboneType("Questionnaire.item.enableWhen")]
     public partial class EnableWhenComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1220,6 +1284,25 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "question":
+            QuestionElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "operator":
+            OperatorElement = (Code<Hl7.Fhir.Model.Questionnaire.QuestionnaireItemOperator>)value;
+            return this;
+          case "answer":
+            Answer = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1239,7 +1322,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Questionnaire#AnswerOption", IsNestedType=true)]
+    [FhirType("Questionnaire#AnswerOption")]
     [BackboneType("Questionnaire.item.answerOption")]
     public partial class AnswerOptionComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1380,6 +1463,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "value":
+            Value = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          case "initialSelected":
+            InitialSelectedElement = (Hl7.Fhir.Model.FhirBoolean)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1398,7 +1497,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Questionnaire#Initial", IsNestedType=true)]
+    [FhirType("Questionnaire#Initial")]
     [BackboneType("Questionnaire.item.initial")]
     public partial class InitialComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1500,6 +1599,19 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "value":
+            Value = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -2386,6 +2498,88 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "url":
+          UrlElement = (Hl7.Fhir.Model.FhirUri)value;
+          return this;
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "version":
+          VersionElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "versionAlgorithm":
+          VersionAlgorithm = (Hl7.Fhir.Model.DataType)value;
+          return this;
+        case "name":
+          NameElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "title":
+          TitleElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "derivedFrom":
+          DerivedFromElement = (List<Hl7.Fhir.Model.Canonical>)value;
+          return this;
+        case "status":
+          StatusElement = (Code<Hl7.Fhir.Model.PublicationStatus>)value;
+          return this;
+        case "experimental":
+          ExperimentalElement = (Hl7.Fhir.Model.FhirBoolean)value;
+          return this;
+        case "subjectType":
+          SubjectTypeElement = (List<Code<Hl7.Fhir.Model.ResourceType>>)value;
+          return this;
+        case "date":
+          DateElement = (Hl7.Fhir.Model.FhirDateTime)value;
+          return this;
+        case "publisher":
+          PublisherElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "contact":
+          Contact = (List<Hl7.Fhir.Model.ContactDetail>)value;
+          return this;
+        case "description":
+          DescriptionElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        case "useContext":
+          UseContext = (List<Hl7.Fhir.Model.UsageContext>)value;
+          return this;
+        case "jurisdiction":
+          Jurisdiction = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "purpose":
+          PurposeElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        case "copyright":
+          CopyrightElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        case "copyrightLabel":
+          CopyrightLabelElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "approvalDate":
+          ApprovalDateElement = (Hl7.Fhir.Model.Date)value;
+          return this;
+        case "lastReviewDate":
+          LastReviewDateElement = (Hl7.Fhir.Model.Date)value;
+          return this;
+        case "effectivePeriod":
+          EffectivePeriod = (Hl7.Fhir.Model.Period)value;
+          return this;
+        case "code":
+          Code = (List<Hl7.Fhir.Model.Coding>)value;
+          return this;
+        case "item":
+          Item = (List<Hl7.Fhir.Model.Questionnaire.ItemComponent>)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/QuestionnaireResponse.cs b/src/Hl7.Fhir.R5/Model/Generated/QuestionnaireResponse.cs
index 3c78d3fe35..970fc46966 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/QuestionnaireResponse.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/QuestionnaireResponse.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("QuestionnaireResponse","http://hl7.org/fhir/StructureDefinition/QuestionnaireResponse", IsResource=true)]
+  [FhirType("QuestionnaireResponse","http://hl7.org/fhir/StructureDefinition/QuestionnaireResponse")]
   public partial class QuestionnaireResponse : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -109,7 +109,7 @@ public enum QuestionnaireResponseStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("QuestionnaireResponse#Item", IsNestedType=true)]
+    [FhirType("QuestionnaireResponse#Item")]
     [BackboneType("QuestionnaireResponse.item")]
     public partial class ItemComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -347,6 +347,31 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "linkId":
+            LinkIdElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "definition":
+            DefinitionElement = (Hl7.Fhir.Model.FhirUri)value;
+            return this;
+          case "text":
+            TextElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "answer":
+            Answer = (List<Hl7.Fhir.Model.QuestionnaireResponse.AnswerComponent>)value;
+            return this;
+          case "item":
+            Item = (List<Hl7.Fhir.Model.QuestionnaireResponse.ItemComponent>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -368,7 +393,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("QuestionnaireResponse#Answer", IsNestedType=true)]
+    [FhirType("QuestionnaireResponse#Answer")]
     [BackboneType("QuestionnaireResponse.item.answer")]
     public partial class AnswerComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -492,6 +517,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "value":
+            Value = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          case "item":
+            Item = (List<Hl7.Fhir.Model.QuestionnaireResponse.ItemComponent>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -875,6 +916,49 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "basedOn":
+          BasedOn = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "partOf":
+          PartOf = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "questionnaire":
+          QuestionnaireElement = (Hl7.Fhir.Model.Canonical)value;
+          return this;
+        case "status":
+          StatusElement = (Code<Hl7.Fhir.Model.QuestionnaireResponse.QuestionnaireResponseStatus>)value;
+          return this;
+        case "subject":
+          Subject = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "encounter":
+          Encounter = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "authored":
+          AuthoredElement = (Hl7.Fhir.Model.FhirDateTime)value;
+          return this;
+        case "author":
+          Author = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "source":
+          Source = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "item":
+          Item = (List<Hl7.Fhir.Model.QuestionnaireResponse.ItemComponent>)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/Ratio.cs b/src/Hl7.Fhir.R5/Model/Generated/Ratio.cs
index d9c4437827..2c482cf2a1 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/Ratio.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/Ratio.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -169,6 +169,22 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "numerator":
+          Numerator = (Hl7.Fhir.Model.Quantity)value;
+          return this;
+        case "denominator":
+          Denominator = (Hl7.Fhir.Model.Quantity)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/RatioRange.cs b/src/Hl7.Fhir.R5/Model/Generated/RatioRange.cs
index 1970196d90..bc866d60fd 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/RatioRange.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/RatioRange.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -190,6 +190,25 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "lowNumerator":
+          LowNumerator = (Hl7.Fhir.Model.Quantity)value;
+          return this;
+        case "highNumerator":
+          HighNumerator = (Hl7.Fhir.Model.Quantity)value;
+          return this;
+        case "denominator":
+          Denominator = (Hl7.Fhir.Model.Quantity)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/RegulatedAuthorization.cs b/src/Hl7.Fhir.R5/Model/Generated/RegulatedAuthorization.cs
index 6ae84bad29..2c79c3d860 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/RegulatedAuthorization.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/RegulatedAuthorization.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("RegulatedAuthorization","http://hl7.org/fhir/StructureDefinition/RegulatedAuthorization", IsResource=true)]
+  [FhirType("RegulatedAuthorization","http://hl7.org/fhir/StructureDefinition/RegulatedAuthorization")]
   public partial class RegulatedAuthorization : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -67,7 +67,7 @@ public partial class RegulatedAuthorization : Hl7.Fhir.Model.DomainResource, IId
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("RegulatedAuthorization#Case", IsNestedType=true)]
+    [FhirType("RegulatedAuthorization#Case")]
     [BackboneType("RegulatedAuthorization.case")]
     public partial class CaseComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -253,6 +253,31 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "identifier":
+            Identifier = (Hl7.Fhir.Model.Identifier)value;
+            return this;
+          case "type":
+            Type = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "status":
+            Status = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "date":
+            Date = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          case "application":
+            Application = (List<Hl7.Fhir.Model.RegulatedAuthorization.CaseComponent>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -704,6 +729,61 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "subject":
+          Subject = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "type":
+          Type = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "description":
+          DescriptionElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        case "region":
+          Region = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "status":
+          Status = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "statusDate":
+          StatusDateElement = (Hl7.Fhir.Model.FhirDateTime)value;
+          return this;
+        case "validityPeriod":
+          ValidityPeriod = (Hl7.Fhir.Model.Period)value;
+          return this;
+        case "indication":
+          Indication = (List<Hl7.Fhir.Model.CodeableReference>)value;
+          return this;
+        case "intendedUse":
+          IntendedUse = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "basis":
+          Basis = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "holder":
+          Holder = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "regulator":
+          Regulator = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "attachedDocument":
+          AttachedDocument = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "case":
+          Case = (Hl7.Fhir.Model.RegulatedAuthorization.CaseComponent)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/RelatedPerson.cs b/src/Hl7.Fhir.R5/Model/Generated/RelatedPerson.cs
index 6e27e510c6..4f93eb4fe5 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/RelatedPerson.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/RelatedPerson.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("RelatedPerson","http://hl7.org/fhir/StructureDefinition/RelatedPerson", IsResource=true)]
+  [FhirType("RelatedPerson","http://hl7.org/fhir/StructureDefinition/RelatedPerson")]
   public partial class RelatedPerson : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -67,7 +67,7 @@ public partial class RelatedPerson : Hl7.Fhir.Model.DomainResource, IIdentifiabl
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("RelatedPerson#Communication", IsNestedType=true)]
+    [FhirType("RelatedPerson#Communication")]
     [BackboneType("RelatedPerson.communication")]
     public partial class CommunicationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -205,6 +205,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "language":
+            Language = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "preferred":
+            PreferredElement = (Hl7.Fhir.Model.FhirBoolean)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -602,6 +618,52 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "active":
+          ActiveElement = (Hl7.Fhir.Model.FhirBoolean)value;
+          return this;
+        case "patient":
+          Patient = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "relationship":
+          Relationship = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "name":
+          Name = (List<Hl7.Fhir.Model.HumanName>)value;
+          return this;
+        case "telecom":
+          Telecom = (List<Hl7.Fhir.Model.ContactPoint>)value;
+          return this;
+        case "gender":
+          GenderElement = (Code<Hl7.Fhir.Model.AdministrativeGender>)value;
+          return this;
+        case "birthDate":
+          BirthDateElement = (Hl7.Fhir.Model.Date)value;
+          return this;
+        case "address":
+          Address = (List<Hl7.Fhir.Model.Address>)value;
+          return this;
+        case "photo":
+          Photo = (List<Hl7.Fhir.Model.Attachment>)value;
+          return this;
+        case "period":
+          Period = (Hl7.Fhir.Model.Period)value;
+          return this;
+        case "communication":
+          Communication = (List<Hl7.Fhir.Model.RelatedPerson.CommunicationComponent>)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/RequestOrchestration.cs b/src/Hl7.Fhir.R5/Model/Generated/RequestOrchestration.cs
index 4e691f70d6..672a4fd555 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/RequestOrchestration.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/RequestOrchestration.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("RequestOrchestration","http://hl7.org/fhir/StructureDefinition/RequestOrchestration", IsResource=true)]
+  [FhirType("RequestOrchestration","http://hl7.org/fhir/StructureDefinition/RequestOrchestration")]
   public partial class RequestOrchestration : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -67,7 +67,7 @@ public partial class RequestOrchestration : Hl7.Fhir.Model.DomainResource, IIden
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("RequestOrchestration#Action", IsNestedType=true)]
+    [FhirType("RequestOrchestration#Action")]
     [BackboneType("RequestOrchestration.action")]
     public partial class ActionComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -958,6 +958,97 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "linkId":
+            LinkIdElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "prefix":
+            PrefixElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "title":
+            TitleElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "description":
+            DescriptionElement = (Hl7.Fhir.Model.Markdown)value;
+            return this;
+          case "textEquivalent":
+            TextEquivalentElement = (Hl7.Fhir.Model.Markdown)value;
+            return this;
+          case "priority":
+            PriorityElement = (Code<Hl7.Fhir.Model.RequestPriority>)value;
+            return this;
+          case "code":
+            Code = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+            return this;
+          case "documentation":
+            Documentation = (List<Hl7.Fhir.Model.RelatedArtifact>)value;
+            return this;
+          case "goal":
+            Goal = (List<Hl7.Fhir.Model.ResourceReference>)value;
+            return this;
+          case "condition":
+            Condition = (List<Hl7.Fhir.Model.RequestOrchestration.ConditionComponent>)value;
+            return this;
+          case "input":
+            Input = (List<Hl7.Fhir.Model.RequestOrchestration.InputComponent>)value;
+            return this;
+          case "output":
+            Output = (List<Hl7.Fhir.Model.RequestOrchestration.OutputComponent>)value;
+            return this;
+          case "relatedAction":
+            RelatedAction = (List<Hl7.Fhir.Model.RequestOrchestration.RelatedActionComponent>)value;
+            return this;
+          case "timing":
+            Timing = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          case "location":
+            Location = (Hl7.Fhir.Model.CodeableReference)value;
+            return this;
+          case "participant":
+            Participant = (List<Hl7.Fhir.Model.RequestOrchestration.ParticipantComponent>)value;
+            return this;
+          case "type":
+            Type = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "groupingBehavior":
+            GroupingBehaviorElement = (Code<Hl7.Fhir.Model.ActionGroupingBehavior>)value;
+            return this;
+          case "selectionBehavior":
+            SelectionBehaviorElement = (Code<Hl7.Fhir.Model.ActionSelectionBehavior>)value;
+            return this;
+          case "requiredBehavior":
+            RequiredBehaviorElement = (Code<Hl7.Fhir.Model.ActionRequiredBehavior>)value;
+            return this;
+          case "precheckBehavior":
+            PrecheckBehaviorElement = (Code<Hl7.Fhir.Model.ActionPrecheckBehavior>)value;
+            return this;
+          case "cardinalityBehavior":
+            CardinalityBehaviorElement = (Code<Hl7.Fhir.Model.ActionCardinalityBehavior>)value;
+            return this;
+          case "resource":
+            Resource = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          case "definition":
+            Definition = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          case "transform":
+            TransformElement = (Hl7.Fhir.Model.Canonical)value;
+            return this;
+          case "dynamicValue":
+            DynamicValue = (List<Hl7.Fhir.Model.RequestOrchestration.DynamicValueComponent>)value;
+            return this;
+          case "action":
+            Action = (List<Hl7.Fhir.Model.RequestOrchestration.ActionComponent>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1001,7 +1092,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("RequestOrchestration#Condition", IsNestedType=true)]
+    [FhirType("RequestOrchestration#Condition")]
     [BackboneType("RequestOrchestration.action.condition")]
     public partial class ConditionComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1140,6 +1231,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "kind":
+            KindElement = (Code<Hl7.Fhir.Model.ActionConditionKind>)value;
+            return this;
+          case "expression":
+            Expression = (Hl7.Fhir.Model.Expression)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1157,7 +1264,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("RequestOrchestration#Input", IsNestedType=true)]
+    [FhirType("RequestOrchestration#Input")]
     [BackboneType("RequestOrchestration.action.input")]
     public partial class InputComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1332,6 +1439,25 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "title":
+            TitleElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "requirement":
+            Requirement = (Hl7.Fhir.Model.DataRequirement)value;
+            return this;
+          case "relatedData":
+            RelatedDataElement = (Hl7.Fhir.Model.Id)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1350,7 +1476,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("RequestOrchestration#Output", IsNestedType=true)]
+    [FhirType("RequestOrchestration#Output")]
     [BackboneType("RequestOrchestration.action.output")]
     public partial class OutputComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1525,6 +1651,25 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "title":
+            TitleElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "requirement":
+            Requirement = (Hl7.Fhir.Model.DataRequirement)value;
+            return this;
+          case "relatedData":
+            RelatedDataElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1543,7 +1688,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("RequestOrchestration#RelatedAction", IsNestedType=true)]
+    [FhirType("RequestOrchestration#RelatedAction")]
     [BackboneType("RequestOrchestration.action.relatedAction")]
     public partial class RelatedActionComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1765,6 +1910,28 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "targetId":
+            TargetIdElement = (Hl7.Fhir.Model.Id)value;
+            return this;
+          case "relationship":
+            RelationshipElement = (Code<Hl7.Fhir.Model.ActionRelationshipType>)value;
+            return this;
+          case "endRelationship":
+            EndRelationshipElement = (Code<Hl7.Fhir.Model.ActionRelationshipType>)value;
+            return this;
+          case "offset":
+            Offset = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1785,7 +1952,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("RequestOrchestration#Participant", IsNestedType=true)]
+    [FhirType("RequestOrchestration#Participant")]
     [BackboneType("RequestOrchestration.action.participant")]
     public partial class ParticipantComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2032,6 +2199,34 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "type":
+            TypeElement = (Code<Hl7.Fhir.Model.ActionParticipantType>)value;
+            return this;
+          case "typeCanonical":
+            TypeCanonicalElement = (Hl7.Fhir.Model.Canonical)value;
+            return this;
+          case "typeReference":
+            TypeReference = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          case "role":
+            Role = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "function":
+            Function = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "actor":
+            Actor = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -2054,7 +2249,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("RequestOrchestration#DynamicValue", IsNestedType=true)]
+    [FhirType("RequestOrchestration#DynamicValue")]
     [BackboneType("RequestOrchestration.action.dynamicValue")]
     public partial class DynamicValueComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2190,6 +2385,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "path":
+            PathElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "expression":
+            Expression = (Hl7.Fhir.Model.Expression)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -2785,6 +2996,70 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "instantiatesCanonical":
+          InstantiatesCanonicalElement = (List<Hl7.Fhir.Model.Canonical>)value;
+          return this;
+        case "instantiatesUri":
+          InstantiatesUriElement = (List<Hl7.Fhir.Model.FhirUri>)value;
+          return this;
+        case "basedOn":
+          BasedOn = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "replaces":
+          Replaces = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "groupIdentifier":
+          GroupIdentifier = (Hl7.Fhir.Model.Identifier)value;
+          return this;
+        case "status":
+          StatusElement = (Code<Hl7.Fhir.Model.RequestStatus>)value;
+          return this;
+        case "intent":
+          IntentElement = (Code<Hl7.Fhir.Model.RequestIntent>)value;
+          return this;
+        case "priority":
+          PriorityElement = (Code<Hl7.Fhir.Model.RequestPriority>)value;
+          return this;
+        case "code":
+          Code = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "subject":
+          Subject = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "encounter":
+          Encounter = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "authoredOn":
+          AuthoredOnElement = (Hl7.Fhir.Model.FhirDateTime)value;
+          return this;
+        case "author":
+          Author = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "reason":
+          Reason = (List<Hl7.Fhir.Model.CodeableReference>)value;
+          return this;
+        case "goal":
+          Goal = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "note":
+          Note = (List<Hl7.Fhir.Model.Annotation>)value;
+          return this;
+        case "action":
+          Action = (List<Hl7.Fhir.Model.RequestOrchestration.ActionComponent>)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/Requirements.cs b/src/Hl7.Fhir.R5/Model/Generated/Requirements.cs
index f1c60b6c23..be2ee2bb9b 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/Requirements.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/Requirements.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Requirements","http://hl7.org/fhir/StructureDefinition/Requirements", IsResource=true)]
+  [FhirType("Requirements","http://hl7.org/fhir/StructureDefinition/Requirements")]
   public partial class Requirements : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -101,7 +101,7 @@ public enum ConformanceExpectation
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Requirements#Statement", IsNestedType=true)]
+    [FhirType("Requirements#Statement")]
     [BackboneType("Requirements.statement")]
     public partial class StatementComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -559,6 +559,46 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "key":
+            KeyElement = (Hl7.Fhir.Model.Id)value;
+            return this;
+          case "label":
+            LabelElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "conformance":
+            ConformanceElement = (List<Code<Hl7.Fhir.Model.Requirements.ConformanceExpectation>>)value;
+            return this;
+          case "conditionality":
+            ConditionalityElement = (Hl7.Fhir.Model.FhirBoolean)value;
+            return this;
+          case "requirement":
+            RequirementElement = (Hl7.Fhir.Model.Markdown)value;
+            return this;
+          case "derivedFrom":
+            DerivedFromElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "parent":
+            ParentElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "satisfiedBy":
+            SatisfiedByElement = (List<Hl7.Fhir.Model.FhirUrl>)value;
+            return this;
+          case "reference":
+            ReferenceElement = (List<Hl7.Fhir.Model.FhirUrl>)value;
+            return this;
+          case "source":
+            Source = (List<Hl7.Fhir.Model.ResourceReference>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1370,6 +1410,79 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "url":
+          UrlElement = (Hl7.Fhir.Model.FhirUri)value;
+          return this;
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "version":
+          VersionElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "versionAlgorithm":
+          VersionAlgorithm = (Hl7.Fhir.Model.DataType)value;
+          return this;
+        case "name":
+          NameElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "title":
+          TitleElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "status":
+          StatusElement = (Code<Hl7.Fhir.Model.PublicationStatus>)value;
+          return this;
+        case "experimental":
+          ExperimentalElement = (Hl7.Fhir.Model.FhirBoolean)value;
+          return this;
+        case "date":
+          DateElement = (Hl7.Fhir.Model.FhirDateTime)value;
+          return this;
+        case "publisher":
+          PublisherElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "contact":
+          Contact = (List<Hl7.Fhir.Model.ContactDetail>)value;
+          return this;
+        case "description":
+          DescriptionElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        case "useContext":
+          UseContext = (List<Hl7.Fhir.Model.UsageContext>)value;
+          return this;
+        case "jurisdiction":
+          Jurisdiction = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "purpose":
+          PurposeElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        case "copyright":
+          CopyrightElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        case "copyrightLabel":
+          CopyrightLabelElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "derivedFrom":
+          DerivedFromElement = (List<Hl7.Fhir.Model.Canonical>)value;
+          return this;
+        case "reference":
+          ReferenceElement = (List<Hl7.Fhir.Model.FhirUrl>)value;
+          return this;
+        case "actor":
+          ActorElement = (List<Hl7.Fhir.Model.Canonical>)value;
+          return this;
+        case "statement":
+          Statement = (List<Hl7.Fhir.Model.Requirements.StatementComponent>)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/ResearchStudy.cs b/src/Hl7.Fhir.R5/Model/Generated/ResearchStudy.cs
index 72150a5a5a..021375d329 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/ResearchStudy.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/ResearchStudy.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("ResearchStudy","http://hl7.org/fhir/StructureDefinition/ResearchStudy", IsResource=true)]
+  [FhirType("ResearchStudy","http://hl7.org/fhir/StructureDefinition/ResearchStudy")]
   public partial class ResearchStudy : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -65,7 +65,7 @@ public partial class ResearchStudy : Hl7.Fhir.Model.DomainResource, IIdentifiabl
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("ResearchStudy#Label", IsNestedType=true)]
+    [FhirType("ResearchStudy#Label")]
     [BackboneType("ResearchStudy.label")]
     public partial class LabelComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -202,6 +202,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "type":
+            Type = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "value":
+            ValueElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -219,7 +235,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ResearchStudy#AssociatedParty", IsNestedType=true)]
+    [FhirType("ResearchStudy#AssociatedParty")]
     [BackboneType("ResearchStudy.associatedParty")]
     public partial class AssociatedPartyComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -425,6 +441,31 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "name":
+            NameElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "role":
+            Role = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "period":
+            Period = (List<Hl7.Fhir.Model.Period>)value;
+            return this;
+          case "classifier":
+            Classifier = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+            return this;
+          case "party":
+            Party = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -442,7 +483,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("ResearchStudy#ProgressStatus", IsNestedType=true)]
+    [FhirType("ResearchStudy#ProgressStatus")]
     [BackboneType("ResearchStudy.progressStatus")]
     public partial class ProgressStatusComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -601,6 +642,25 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "state":
+            State = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "actual":
+            ActualElement = (Hl7.Fhir.Model.FhirBoolean)value;
+            return this;
+          case "period":
+            Period = (Hl7.Fhir.Model.Period)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -616,7 +676,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("ResearchStudy#Recruitment", IsNestedType=true)]
+    [FhirType("ResearchStudy#Recruitment")]
     [BackboneType("ResearchStudy.recruitment")]
     public partial class RecruitmentComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -816,6 +876,28 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "targetNumber":
+            TargetNumberElement = (Hl7.Fhir.Model.UnsignedInt)value;
+            return this;
+          case "actualNumber":
+            ActualNumberElement = (Hl7.Fhir.Model.UnsignedInt)value;
+            return this;
+          case "eligibility":
+            Eligibility = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          case "actualGroup":
+            ActualGroup = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -836,7 +918,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ResearchStudy#ComparisonGroup", IsNestedType=true)]
+    [FhirType("ResearchStudy#ComparisonGroup")]
     [BackboneType("ResearchStudy.comparisonGroup")]
     public partial class ComparisonGroupComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1099,6 +1181,34 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "linkId":
+            LinkIdElement = (Hl7.Fhir.Model.Id)value;
+            return this;
+          case "name":
+            NameElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "type":
+            Type = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "description":
+            DescriptionElement = (Hl7.Fhir.Model.Markdown)value;
+            return this;
+          case "intendedExposure":
+            IntendedExposure = (List<Hl7.Fhir.Model.ResourceReference>)value;
+            return this;
+          case "observedGroup":
+            ObservedGroup = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1120,7 +1230,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ResearchStudy#Objective", IsNestedType=true)]
+    [FhirType("ResearchStudy#Objective")]
     [BackboneType("ResearchStudy.objective")]
     public partial class ObjectiveComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1296,6 +1406,25 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "name":
+            NameElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "type":
+            Type = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "description":
+            DescriptionElement = (Hl7.Fhir.Model.Markdown)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1315,7 +1444,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ResearchStudy#OutcomeMeasure", IsNestedType=true)]
+    [FhirType("ResearchStudy#OutcomeMeasure")]
     [BackboneType("ResearchStudy.outcomeMeasure")]
     public partial class OutcomeMeasureComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1515,6 +1644,28 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "name":
+            NameElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "type":
+            Type = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+            return this;
+          case "description":
+            DescriptionElement = (Hl7.Fhir.Model.Markdown)value;
+            return this;
+          case "reference":
+            Reference = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -2450,6 +2601,112 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "url":
+          UrlElement = (Hl7.Fhir.Model.FhirUri)value;
+          return this;
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "version":
+          VersionElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "name":
+          NameElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "title":
+          TitleElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "label":
+          Label = (List<Hl7.Fhir.Model.ResearchStudy.LabelComponent>)value;
+          return this;
+        case "protocol":
+          Protocol = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "partOf":
+          PartOf = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "relatedArtifact":
+          RelatedArtifact = (List<Hl7.Fhir.Model.RelatedArtifact>)value;
+          return this;
+        case "date":
+          DateElement = (Hl7.Fhir.Model.FhirDateTime)value;
+          return this;
+        case "status":
+          StatusElement = (Code<Hl7.Fhir.Model.PublicationStatus>)value;
+          return this;
+        case "primaryPurposeType":
+          PrimaryPurposeType = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "phase":
+          Phase = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "studyDesign":
+          StudyDesign = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "focus":
+          Focus = (List<Hl7.Fhir.Model.CodeableReference>)value;
+          return this;
+        case "condition":
+          Condition = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "keyword":
+          Keyword = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "region":
+          Region = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "descriptionSummary":
+          DescriptionSummaryElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        case "description":
+          DescriptionElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        case "period":
+          Period = (Hl7.Fhir.Model.Period)value;
+          return this;
+        case "site":
+          Site = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "note":
+          Note = (List<Hl7.Fhir.Model.Annotation>)value;
+          return this;
+        case "classifier":
+          Classifier = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "associatedParty":
+          AssociatedParty = (List<Hl7.Fhir.Model.ResearchStudy.AssociatedPartyComponent>)value;
+          return this;
+        case "progressStatus":
+          ProgressStatus = (List<Hl7.Fhir.Model.ResearchStudy.ProgressStatusComponent>)value;
+          return this;
+        case "whyStopped":
+          WhyStopped = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "recruitment":
+          Recruitment = (Hl7.Fhir.Model.ResearchStudy.RecruitmentComponent)value;
+          return this;
+        case "comparisonGroup":
+          ComparisonGroup = (List<Hl7.Fhir.Model.ResearchStudy.ComparisonGroupComponent>)value;
+          return this;
+        case "objective":
+          Objective = (List<Hl7.Fhir.Model.ResearchStudy.ObjectiveComponent>)value;
+          return this;
+        case "outcomeMeasure":
+          OutcomeMeasure = (List<Hl7.Fhir.Model.ResearchStudy.OutcomeMeasureComponent>)value;
+          return this;
+        case "result":
+          Result = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/ResearchSubject.cs b/src/Hl7.Fhir.R5/Model/Generated/ResearchSubject.cs
index 7cfc7f53f4..bef6659c6a 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/ResearchSubject.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/ResearchSubject.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("ResearchSubject","http://hl7.org/fhir/StructureDefinition/ResearchSubject", IsResource=true)]
+  [FhirType("ResearchSubject","http://hl7.org/fhir/StructureDefinition/ResearchSubject")]
   public partial class ResearchSubject : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -158,7 +158,7 @@ public enum ResearchSubjectState
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ResearchSubject#Progress", IsNestedType=true)]
+    [FhirType("ResearchSubject#Progress")]
     [BackboneType("ResearchSubject.progress")]
     public partial class ProgressComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -400,6 +400,34 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "type":
+            Type = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "subjectState":
+            SubjectState = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "milestone":
+            Milestone = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "reason":
+            Reason = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "startDate":
+            StartDateElement = (Hl7.Fhir.Model.FhirDateTime)value;
+            return this;
+          case "endDate":
+            EndDateElement = (Hl7.Fhir.Model.FhirDateTime)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -739,6 +767,43 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "status":
+          StatusElement = (Code<Hl7.Fhir.Model.PublicationStatus>)value;
+          return this;
+        case "progress":
+          Progress = (List<Hl7.Fhir.Model.ResearchSubject.ProgressComponent>)value;
+          return this;
+        case "period":
+          Period = (Hl7.Fhir.Model.Period)value;
+          return this;
+        case "study":
+          Study = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "subject":
+          Subject = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "assignedComparisonGroup":
+          AssignedComparisonGroupElement = (Hl7.Fhir.Model.Id)value;
+          return this;
+        case "actualComparisonGroup":
+          ActualComparisonGroupElement = (Hl7.Fhir.Model.Id)value;
+          return this;
+        case "consent":
+          Consent = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/RiskAssessment.cs b/src/Hl7.Fhir.R5/Model/Generated/RiskAssessment.cs
index 50ae6ee53d..880e0b42da 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/RiskAssessment.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/RiskAssessment.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("RiskAssessment","http://hl7.org/fhir/StructureDefinition/RiskAssessment", IsResource=true)]
+  [FhirType("RiskAssessment","http://hl7.org/fhir/StructureDefinition/RiskAssessment")]
   public partial class RiskAssessment : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -68,7 +68,7 @@ public partial class RiskAssessment : Hl7.Fhir.Model.DomainResource, IIdentifiab
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("RiskAssessment#Prediction", IsNestedType=true)]
+    [FhirType("RiskAssessment#Prediction")]
     [BackboneType("RiskAssessment.prediction")]
     public partial class PredictionComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -312,6 +312,34 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "outcome":
+            Outcome = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "probability":
+            Probability = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          case "qualitativeRisk":
+            QualitativeRisk = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "relativeRisk":
+            RelativeRiskElement = (Hl7.Fhir.Model.FhirDecimal)value;
+            return this;
+          case "when":
+            When = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          case "rationale":
+            RationaleElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -792,6 +820,64 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "basedOn":
+          BasedOn = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "parent":
+          Parent = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "status":
+          StatusElement = (Code<Hl7.Fhir.Model.ObservationStatus>)value;
+          return this;
+        case "method":
+          Method = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "code":
+          Code = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "subject":
+          Subject = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "encounter":
+          Encounter = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "occurrence":
+          Occurrence = (Hl7.Fhir.Model.DataType)value;
+          return this;
+        case "condition":
+          Condition = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "performer":
+          Performer = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "reason":
+          Reason = (List<Hl7.Fhir.Model.CodeableReference>)value;
+          return this;
+        case "basis":
+          Basis = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "prediction":
+          Prediction = (List<Hl7.Fhir.Model.RiskAssessment.PredictionComponent>)value;
+          return this;
+        case "mitigation":
+          MitigationElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "note":
+          Note = (List<Hl7.Fhir.Model.Annotation>)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/SampledData.cs b/src/Hl7.Fhir.R5/Model/Generated/SampledData.cs
index db69a0301f..679e41fd5a 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/SampledData.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/SampledData.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -503,6 +503,46 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "origin":
+          Origin = (Hl7.Fhir.Model.Quantity)value;
+          return this;
+        case "interval":
+          IntervalElement = (Hl7.Fhir.Model.FhirDecimal)value;
+          return this;
+        case "intervalUnit":
+          IntervalUnitElement = (Hl7.Fhir.Model.Code)value;
+          return this;
+        case "factor":
+          FactorElement = (Hl7.Fhir.Model.FhirDecimal)value;
+          return this;
+        case "lowerLimit":
+          LowerLimitElement = (Hl7.Fhir.Model.FhirDecimal)value;
+          return this;
+        case "upperLimit":
+          UpperLimitElement = (Hl7.Fhir.Model.FhirDecimal)value;
+          return this;
+        case "dimensions":
+          DimensionsElement = (Hl7.Fhir.Model.PositiveInt)value;
+          return this;
+        case "codeMap":
+          CodeMapElement = (Hl7.Fhir.Model.Canonical)value;
+          return this;
+        case "offsets":
+          OffsetsElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "data":
+          DataElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/Schedule.cs b/src/Hl7.Fhir.R5/Model/Generated/Schedule.cs
index b005276c89..b98ac57d11 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/Schedule.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/Schedule.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model
   /// </summary>
   [Serializable]
   [DataContract]
-  [FhirType("Schedule","http://hl7.org/fhir/StructureDefinition/Schedule", IsResource=true)]
+  [FhirType("Schedule","http://hl7.org/fhir/StructureDefinition/Schedule")]
   public partial class Schedule : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -378,6 +378,43 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "active":
+          ActiveElement = (Hl7.Fhir.Model.FhirBoolean)value;
+          return this;
+        case "serviceCategory":
+          ServiceCategory = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "serviceType":
+          ServiceType = (List<Hl7.Fhir.Model.CodeableReference>)value;
+          return this;
+        case "specialty":
+          Specialty = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "name":
+          NameElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "actor":
+          Actor = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "planningHorizon":
+          PlanningHorizon = (Hl7.Fhir.Model.Period)value;
+          return this;
+        case "comment":
+          CommentElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/SearchParameter.cs b/src/Hl7.Fhir.R5/Model/Generated/SearchParameter.cs
index 408f1826b3..4200c55376 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/SearchParameter.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/SearchParameter.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("SearchParameter","http://hl7.org/fhir/StructureDefinition/SearchParameter", IsResource=true)]
+  [FhirType("SearchParameter","http://hl7.org/fhir/StructureDefinition/SearchParameter")]
   public partial class SearchParameter : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -96,7 +96,7 @@ public enum SearchProcessingModeType
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("SearchParameter#Component", IsNestedType=true)]
+    [FhirType("SearchParameter#Component")]
     [BackboneType("SearchParameter.component")]
     public partial class ComponentComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -252,6 +252,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "definition":
+            DefinitionElement = (Hl7.Fhir.Model.Canonical)value;
+            return this;
+          case "expression":
+            ExpressionElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1464,6 +1480,109 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "url":
+          UrlElement = (Hl7.Fhir.Model.FhirUri)value;
+          return this;
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "version":
+          VersionElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "versionAlgorithm":
+          VersionAlgorithm = (Hl7.Fhir.Model.DataType)value;
+          return this;
+        case "name":
+          NameElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "title":
+          TitleElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "derivedFrom":
+          DerivedFromElement = (Hl7.Fhir.Model.Canonical)value;
+          return this;
+        case "status":
+          StatusElement = (Code<Hl7.Fhir.Model.PublicationStatus>)value;
+          return this;
+        case "experimental":
+          ExperimentalElement = (Hl7.Fhir.Model.FhirBoolean)value;
+          return this;
+        case "date":
+          DateElement = (Hl7.Fhir.Model.FhirDateTime)value;
+          return this;
+        case "publisher":
+          PublisherElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "contact":
+          Contact = (List<Hl7.Fhir.Model.ContactDetail>)value;
+          return this;
+        case "description":
+          DescriptionElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        case "useContext":
+          UseContext = (List<Hl7.Fhir.Model.UsageContext>)value;
+          return this;
+        case "jurisdiction":
+          Jurisdiction = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "purpose":
+          PurposeElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        case "copyright":
+          CopyrightElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        case "copyrightLabel":
+          CopyrightLabelElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "code":
+          CodeElement = (Hl7.Fhir.Model.Code)value;
+          return this;
+        case "base":
+          BaseElement = (List<Code<Hl7.Fhir.Model.VersionIndependentResourceTypesAll>>)value;
+          return this;
+        case "type":
+          TypeElement = (Code<Hl7.Fhir.Model.SearchParamType>)value;
+          return this;
+        case "expression":
+          ExpressionElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "processingMode":
+          ProcessingModeElement = (Code<Hl7.Fhir.Model.SearchParameter.SearchProcessingModeType>)value;
+          return this;
+        case "constraint":
+          ConstraintElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "target":
+          TargetElement = (List<Code<Hl7.Fhir.Model.VersionIndependentResourceTypesAll>>)value;
+          return this;
+        case "multipleOr":
+          MultipleOrElement = (Hl7.Fhir.Model.FhirBoolean)value;
+          return this;
+        case "multipleAnd":
+          MultipleAndElement = (Hl7.Fhir.Model.FhirBoolean)value;
+          return this;
+        case "comparator":
+          ComparatorElement = (List<Code<Hl7.Fhir.Model.SearchComparator>>)value;
+          return this;
+        case "modifier":
+          ModifierElement = (List<Code<Hl7.Fhir.Model.SearchModifierCode>>)value;
+          return this;
+        case "chain":
+          ChainElement = (List<Hl7.Fhir.Model.FhirString>)value;
+          return this;
+        case "component":
+          Component = (List<Hl7.Fhir.Model.SearchParameter.ComponentComponent>)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/ServiceRequest.cs b/src/Hl7.Fhir.R5/Model/Generated/ServiceRequest.cs
index 254b640545..2de6beec03 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/ServiceRequest.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/ServiceRequest.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("ServiceRequest","http://hl7.org/fhir/StructureDefinition/ServiceRequest", IsResource=true)]
+  [FhirType("ServiceRequest","http://hl7.org/fhir/StructureDefinition/ServiceRequest")]
   public partial class ServiceRequest : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -68,7 +68,7 @@ public partial class ServiceRequest : Hl7.Fhir.Model.DomainResource, IIdentifiab
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ServiceRequest#OrderDetail", IsNestedType=true)]
+    [FhirType("ServiceRequest#OrderDetail")]
     [BackboneType("ServiceRequest.orderDetail")]
     public partial class OrderDetailComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -187,6 +187,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "parameterFocus":
+            ParameterFocus = (Hl7.Fhir.Model.CodeableReference)value;
+            return this;
+          case "parameter":
+            Parameter = (List<Hl7.Fhir.Model.ServiceRequest.ParameterComponent>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -201,7 +217,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("ServiceRequest#Parameter", IsNestedType=true)]
+    [FhirType("ServiceRequest#Parameter")]
     [BackboneType("ServiceRequest.orderDetail.parameter")]
     public partial class ParameterComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -324,6 +340,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "code":
+            Code = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "value":
+            Value = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -341,7 +373,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ServiceRequest#PatientInstruction", IsNestedType=true)]
+    [FhirType("ServiceRequest#PatientInstruction")]
     [BackboneType("ServiceRequest.patientInstruction")]
     public partial class PatientInstructionComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -441,6 +473,19 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "instruction":
+            Instruction = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1399,6 +1444,115 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "instantiatesCanonical":
+          InstantiatesCanonicalElement = (List<Hl7.Fhir.Model.Canonical>)value;
+          return this;
+        case "instantiatesUri":
+          InstantiatesUriElement = (List<Hl7.Fhir.Model.FhirUri>)value;
+          return this;
+        case "basedOn":
+          BasedOn = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "replaces":
+          Replaces = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "requisition":
+          Requisition = (Hl7.Fhir.Model.Identifier)value;
+          return this;
+        case "status":
+          StatusElement = (Code<Hl7.Fhir.Model.RequestStatus>)value;
+          return this;
+        case "intent":
+          IntentElement = (Code<Hl7.Fhir.Model.RequestIntent>)value;
+          return this;
+        case "category":
+          Category = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "priority":
+          PriorityElement = (Code<Hl7.Fhir.Model.RequestPriority>)value;
+          return this;
+        case "doNotPerform":
+          DoNotPerformElement = (Hl7.Fhir.Model.FhirBoolean)value;
+          return this;
+        case "code":
+          Code = (Hl7.Fhir.Model.CodeableReference)value;
+          return this;
+        case "orderDetail":
+          OrderDetail = (List<Hl7.Fhir.Model.ServiceRequest.OrderDetailComponent>)value;
+          return this;
+        case "quantity":
+          Quantity = (Hl7.Fhir.Model.DataType)value;
+          return this;
+        case "subject":
+          Subject = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "focus":
+          Focus = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "encounter":
+          Encounter = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "occurrence":
+          Occurrence = (Hl7.Fhir.Model.DataType)value;
+          return this;
+        case "asNeeded":
+          AsNeeded = (Hl7.Fhir.Model.DataType)value;
+          return this;
+        case "authoredOn":
+          AuthoredOnElement = (Hl7.Fhir.Model.FhirDateTime)value;
+          return this;
+        case "requester":
+          Requester = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "performerType":
+          PerformerType = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "performer":
+          Performer = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "location":
+          Location = (List<Hl7.Fhir.Model.CodeableReference>)value;
+          return this;
+        case "reason":
+          Reason = (List<Hl7.Fhir.Model.CodeableReference>)value;
+          return this;
+        case "insurance":
+          Insurance = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "supportingInfo":
+          SupportingInfo = (List<Hl7.Fhir.Model.CodeableReference>)value;
+          return this;
+        case "specimen":
+          Specimen = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "bodySite":
+          BodySite = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "bodyStructure":
+          BodyStructure = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "note":
+          Note = (List<Hl7.Fhir.Model.Annotation>)value;
+          return this;
+        case "patientInstruction":
+          PatientInstruction = (List<Hl7.Fhir.Model.ServiceRequest.PatientInstructionComponent>)value;
+          return this;
+        case "relevantHistory":
+          RelevantHistory = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/Slot.cs b/src/Hl7.Fhir.R5/Model/Generated/Slot.cs
index 7c1ca9f471..4c2a9f5a41 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/Slot.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/Slot.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model
   /// </summary>
   [Serializable]
   [DataContract]
-  [FhirType("Slot","http://hl7.org/fhir/StructureDefinition/Slot", IsResource=true)]
+  [FhirType("Slot","http://hl7.org/fhir/StructureDefinition/Slot")]
   public partial class Slot : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -503,6 +503,49 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "serviceCategory":
+          ServiceCategory = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "serviceType":
+          ServiceType = (List<Hl7.Fhir.Model.CodeableReference>)value;
+          return this;
+        case "specialty":
+          Specialty = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "appointmentType":
+          AppointmentType = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "schedule":
+          Schedule = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "status":
+          StatusElement = (Code<Hl7.Fhir.Model.Slot.SlotStatus>)value;
+          return this;
+        case "start":
+          StartElement = (Hl7.Fhir.Model.Instant)value;
+          return this;
+        case "end":
+          EndElement = (Hl7.Fhir.Model.Instant)value;
+          return this;
+        case "overbooked":
+          OverbookedElement = (Hl7.Fhir.Model.FhirBoolean)value;
+          return this;
+        case "comment":
+          CommentElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/Specimen.cs b/src/Hl7.Fhir.R5/Model/Generated/Specimen.cs
index 3c31f8f073..1e236d2b30 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/Specimen.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/Specimen.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Specimen","http://hl7.org/fhir/StructureDefinition/Specimen", IsResource=true)]
+  [FhirType("Specimen","http://hl7.org/fhir/StructureDefinition/Specimen")]
   public partial class Specimen : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -123,7 +123,7 @@ public enum SpecimenCombined
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Specimen#Feature", IsNestedType=true)]
+    [FhirType("Specimen#Feature")]
     [BackboneType("Specimen.feature")]
     public partial class FeatureComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -262,6 +262,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "type":
+            Type = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "description":
+            DescriptionElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -279,7 +295,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Specimen#Collection", IsNestedType=true)]
+    [FhirType("Specimen#Collection")]
     [BackboneType("Specimen.collection")]
     public partial class CollectionComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -556,6 +572,43 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "collector":
+            Collector = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          case "collected":
+            Collected = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          case "duration":
+            Duration = (Hl7.Fhir.Model.Duration)value;
+            return this;
+          case "quantity":
+            Quantity = (Hl7.Fhir.Model.Quantity)value;
+            return this;
+          case "method":
+            Method = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "device":
+            Device = (Hl7.Fhir.Model.CodeableReference)value;
+            return this;
+          case "procedure":
+            Procedure = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          case "bodySite":
+            BodySite = (Hl7.Fhir.Model.CodeableReference)value;
+            return this;
+          case "fastingStatus":
+            FastingStatus = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -580,7 +633,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Specimen#Processing", IsNestedType=true)]
+    [FhirType("Specimen#Processing")]
     [BackboneType("Specimen.processing")]
     public partial class ProcessingComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -764,6 +817,28 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "description":
+            DescriptionElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "method":
+            Method = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "additive":
+            Additive = (List<Hl7.Fhir.Model.ResourceReference>)value;
+            return this;
+          case "time":
+            Time = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -783,7 +858,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Specimen#Container", IsNestedType=true)]
+    [FhirType("Specimen#Container")]
     [BackboneType("Specimen.container")]
     public partial class ContainerComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -927,6 +1002,25 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "device":
+            Device = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          case "location":
+            Location = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          case "specimenQuantity":
+            SpecimenQuantity = (Hl7.Fhir.Model.Quantity)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1418,6 +1512,64 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "accessionIdentifier":
+          AccessionIdentifier = (Hl7.Fhir.Model.Identifier)value;
+          return this;
+        case "status":
+          StatusElement = (Code<Hl7.Fhir.Model.Specimen.SpecimenStatus>)value;
+          return this;
+        case "type":
+          Type = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "subject":
+          Subject = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "receivedTime":
+          ReceivedTimeElement = (Hl7.Fhir.Model.FhirDateTime)value;
+          return this;
+        case "parent":
+          Parent = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "request":
+          Request = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "combined":
+          CombinedElement = (Code<Hl7.Fhir.Model.Specimen.SpecimenCombined>)value;
+          return this;
+        case "role":
+          Role = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "feature":
+          Feature = (List<Hl7.Fhir.Model.Specimen.FeatureComponent>)value;
+          return this;
+        case "collection":
+          Collection = (Hl7.Fhir.Model.Specimen.CollectionComponent)value;
+          return this;
+        case "processing":
+          Processing = (List<Hl7.Fhir.Model.Specimen.ProcessingComponent>)value;
+          return this;
+        case "container":
+          Container = (List<Hl7.Fhir.Model.Specimen.ContainerComponent>)value;
+          return this;
+        case "condition":
+          Condition = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "note":
+          Note = (List<Hl7.Fhir.Model.Annotation>)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/SpecimenDefinition.cs b/src/Hl7.Fhir.R5/Model/Generated/SpecimenDefinition.cs
index e0f0722ca0..f52cdb7e9a 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/SpecimenDefinition.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/SpecimenDefinition.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("SpecimenDefinition","http://hl7.org/fhir/StructureDefinition/SpecimenDefinition", IsResource=true)]
+  [FhirType("SpecimenDefinition","http://hl7.org/fhir/StructureDefinition/SpecimenDefinition")]
   public partial class SpecimenDefinition : Hl7.Fhir.Model.DomainResource, IIdentifiable<Identifier>
   {
     /// <summary>
@@ -89,7 +89,7 @@ public enum SpecimenContainedPreference
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("SpecimenDefinition#TypeTested", IsNestedType=true)]
+    [FhirType("SpecimenDefinition#TypeTested")]
     [BackboneType("SpecimenDefinition.typeTested")]
     public partial class TypeTestedComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -456,6 +456,46 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "isDerived":
+            IsDerivedElement = (Hl7.Fhir.Model.FhirBoolean)value;
+            return this;
+          case "type":
+            Type = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "preference":
+            PreferenceElement = (Code<Hl7.Fhir.Model.SpecimenDefinition.SpecimenContainedPreference>)value;
+            return this;
+          case "container":
+            Container = (Hl7.Fhir.Model.SpecimenDefinition.ContainerComponent)value;
+            return this;
+          case "requirement":
+            RequirementElement = (Hl7.Fhir.Model.Markdown)value;
+            return this;
+          case "retentionTime":
+            RetentionTime = (Hl7.Fhir.Model.Duration)value;
+            return this;
+          case "singleUse":
+            SingleUseElement = (Hl7.Fhir.Model.FhirBoolean)value;
+            return this;
+          case "rejectionCriterion":
+            RejectionCriterion = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+            return this;
+          case "handling":
+            Handling = (List<Hl7.Fhir.Model.SpecimenDefinition.HandlingComponent>)value;
+            return this;
+          case "testingDestination":
+            TestingDestination = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -478,7 +518,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SpecimenDefinition#Container", IsNestedType=true)]
+    [FhirType("SpecimenDefinition#Container")]
     [BackboneType("SpecimenDefinition.typeTested.container")]
     public partial class ContainerComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -764,6 +804,40 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "material":
+            Material = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "type":
+            Type = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "cap":
+            Cap = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "description":
+            DescriptionElement = (Hl7.Fhir.Model.Markdown)value;
+            return this;
+          case "capacity":
+            Capacity = (Hl7.Fhir.Model.Quantity)value;
+            return this;
+          case "minimumVolume":
+            MinimumVolume = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          case "additive":
+            Additive = (List<Hl7.Fhir.Model.SpecimenDefinition.AdditiveComponent>)value;
+            return this;
+          case "preparation":
+            PreparationElement = (Hl7.Fhir.Model.Markdown)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -787,7 +861,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("SpecimenDefinition#Additive", IsNestedType=true)]
+    [FhirType("SpecimenDefinition#Additive")]
     [BackboneType("SpecimenDefinition.typeTested.container.additive")]
     public partial class AdditiveComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -889,6 +963,19 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "additive":
+            Additive = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -905,7 +992,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("SpecimenDefinition#Handling", IsNestedType=true)]
+    [FhirType("SpecimenDefinition#Handling")]
     [BackboneType("SpecimenDefinition.typeTested.handling")]
     public partial class HandlingComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1084,6 +1171,28 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "temperatureQualifier":
+            TemperatureQualifier = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "temperatureRange":
+            TemperatureRange = (Hl7.Fhir.Model.Range)value;
+            return this;
+          case "maxDuration":
+            MaxDuration = (Hl7.Fhir.Model.Duration)value;
+            return this;
+          case "instruction":
+            InstructionElement = (Hl7.Fhir.Model.Markdown)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -2078,6 +2187,100 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "url":
+          UrlElement = (Hl7.Fhir.Model.FhirUri)value;
+          return this;
+        case "identifier":
+          Identifier = (Hl7.Fhir.Model.Identifier)value;
+          return this;
+        case "version":
+          VersionElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "versionAlgorithm":
+          VersionAlgorithm = (Hl7.Fhir.Model.DataType)value;
+          return this;
+        case "name":
+          NameElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "title":
+          TitleElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "derivedFromCanonical":
+          DerivedFromCanonicalElement = (List<Hl7.Fhir.Model.Canonical>)value;
+          return this;
+        case "derivedFromUri":
+          DerivedFromUriElement = (List<Hl7.Fhir.Model.FhirUri>)value;
+          return this;
+        case "status":
+          StatusElement = (Code<Hl7.Fhir.Model.PublicationStatus>)value;
+          return this;
+        case "experimental":
+          ExperimentalElement = (Hl7.Fhir.Model.FhirBoolean)value;
+          return this;
+        case "subject":
+          Subject = (Hl7.Fhir.Model.DataType)value;
+          return this;
+        case "date":
+          DateElement = (Hl7.Fhir.Model.FhirDateTime)value;
+          return this;
+        case "publisher":
+          PublisherElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "contact":
+          Contact = (List<Hl7.Fhir.Model.ContactDetail>)value;
+          return this;
+        case "description":
+          DescriptionElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        case "useContext":
+          UseContext = (List<Hl7.Fhir.Model.UsageContext>)value;
+          return this;
+        case "jurisdiction":
+          Jurisdiction = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "purpose":
+          PurposeElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        case "copyright":
+          CopyrightElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        case "copyrightLabel":
+          CopyrightLabelElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "approvalDate":
+          ApprovalDateElement = (Hl7.Fhir.Model.Date)value;
+          return this;
+        case "lastReviewDate":
+          LastReviewDateElement = (Hl7.Fhir.Model.Date)value;
+          return this;
+        case "effectivePeriod":
+          EffectivePeriod = (Hl7.Fhir.Model.Period)value;
+          return this;
+        case "typeCollected":
+          TypeCollected = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "patientPreparation":
+          PatientPreparation = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "timeAspect":
+          TimeAspectElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "collection":
+          Collection = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "typeTested":
+          TypeTested = (List<Hl7.Fhir.Model.SpecimenDefinition.TypeTestedComponent>)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/StructureMap.cs b/src/Hl7.Fhir.R5/Model/Generated/StructureMap.cs
index 3802fd1a41..42f54c966b 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/StructureMap.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/StructureMap.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model
   /// </summary>
   [Serializable]
   [DataContract]
-  [FhirType("StructureMap","http://hl7.org/fhir/StructureDefinition/StructureMap", IsResource=true)]
+  [FhirType("StructureMap","http://hl7.org/fhir/StructureDefinition/StructureMap")]
   public partial class StructureMap : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -329,7 +329,7 @@ public enum StructureMapTransform
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("StructureMap#Structure", IsNestedType=true)]
+    [FhirType("StructureMap#Structure")]
     [BackboneType("StructureMap.structure")]
     public partial class StructureComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -565,6 +565,28 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "url":
+            UrlElement = (Hl7.Fhir.Model.Canonical)value;
+            return this;
+          case "mode":
+            ModeElement = (Code<Hl7.Fhir.Model.StructureMap.StructureMapModelMode>)value;
+            return this;
+          case "alias":
+            AliasElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "documentation":
+            DocumentationElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -584,7 +606,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("StructureMap#Const", IsNestedType=true)]
+    [FhirType("StructureMap#Const")]
     [BackboneType("StructureMap.const")]
     public partial class ConstComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -738,6 +760,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "name":
+            NameElement = (Hl7.Fhir.Model.Id)value;
+            return this;
+          case "value":
+            ValueElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -755,7 +793,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("StructureMap#Group", IsNestedType=true)]
+    [FhirType("StructureMap#Group")]
     [BackboneType("StructureMap.group")]
     public partial class GroupComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1034,6 +1072,34 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "name":
+            NameElement = (Hl7.Fhir.Model.Id)value;
+            return this;
+          case "extends":
+            ExtendsElement = (Hl7.Fhir.Model.Id)value;
+            return this;
+          case "typeMode":
+            TypeModeElement = (Code<Hl7.Fhir.Model.StructureMap.StructureMapGroupTypeMode>)value;
+            return this;
+          case "documentation":
+            DocumentationElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "input":
+            Input = (List<Hl7.Fhir.Model.StructureMap.InputComponent>)value;
+            return this;
+          case "rule":
+            Rule = (List<Hl7.Fhir.Model.StructureMap.RuleComponent>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1056,7 +1122,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("StructureMap#Input", IsNestedType=true)]
+    [FhirType("StructureMap#Input")]
     [BackboneType("StructureMap.group.input")]
     public partial class InputComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1292,6 +1358,28 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "name":
+            NameElement = (Hl7.Fhir.Model.Id)value;
+            return this;
+          case "type":
+            TypeElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "mode":
+            ModeElement = (Code<Hl7.Fhir.Model.StructureMap.StructureMapInputMode>)value;
+            return this;
+          case "documentation":
+            DocumentationElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1308,7 +1396,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("StructureMap#Rule", IsNestedType=true)]
+    [FhirType("StructureMap#Rule")]
     [BackboneType("StructureMap.group.rule")]
     public partial class RuleComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1550,6 +1638,34 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "name":
+            NameElement = (Hl7.Fhir.Model.Id)value;
+            return this;
+          case "source":
+            Source = (List<Hl7.Fhir.Model.StructureMap.SourceComponent>)value;
+            return this;
+          case "target":
+            Target = (List<Hl7.Fhir.Model.StructureMap.TargetComponent>)value;
+            return this;
+          case "rule":
+            Rule = (List<Hl7.Fhir.Model.StructureMap.RuleComponent>)value;
+            return this;
+          case "dependent":
+            Dependent = (List<Hl7.Fhir.Model.StructureMap.DependentComponent>)value;
+            return this;
+          case "documentation":
+            DocumentationElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1568,7 +1684,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("StructureMap#Source", IsNestedType=true)]
+    [FhirType("StructureMap#Source")]
     [BackboneType("StructureMap.group.rule.source")]
     public partial class SourceComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2076,6 +2192,49 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "context":
+            ContextElement = (Hl7.Fhir.Model.Id)value;
+            return this;
+          case "min":
+            MinElement = (Hl7.Fhir.Model.Integer)value;
+            return this;
+          case "max":
+            MaxElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "type":
+            TypeElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "defaultValue":
+            DefaultValueElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "element":
+            ElementElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "listMode":
+            ListModeElement = (Code<Hl7.Fhir.Model.StructureMap.StructureMapSourceListMode>)value;
+            return this;
+          case "variable":
+            VariableElement = (Hl7.Fhir.Model.Id)value;
+            return this;
+          case "condition":
+            ConditionElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "check":
+            CheckElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "logMessage":
+            LogMessageElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -2099,7 +2258,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("StructureMap#Target", IsNestedType=true)]
+    [FhirType("StructureMap#Target")]
     [BackboneType("StructureMap.group.rule.target")]
     public partial class TargetComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2436,6 +2595,37 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "context":
+            ContextElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "element":
+            ElementElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "variable":
+            VariableElement = (Hl7.Fhir.Model.Id)value;
+            return this;
+          case "listMode":
+            ListModeElement = (List<Code<Hl7.Fhir.Model.StructureMap.StructureMapTargetListMode>>)value;
+            return this;
+          case "listRuleId":
+            ListRuleIdElement = (Hl7.Fhir.Model.Id)value;
+            return this;
+          case "transform":
+            TransformElement = (Code<Hl7.Fhir.Model.StructureMap.StructureMapTransform>)value;
+            return this;
+          case "parameter":
+            Parameter = (List<Hl7.Fhir.Model.StructureMap.ParameterComponent>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -2455,7 +2645,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("StructureMap#Parameter", IsNestedType=true)]
+    [FhirType("StructureMap#Parameter")]
     [BackboneType("StructureMap.group.rule.target.parameter")]
     public partial class ParameterComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2555,6 +2745,19 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "value":
+            Value = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -2568,7 +2771,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("StructureMap#Dependent", IsNestedType=true)]
+    [FhirType("StructureMap#Dependent")]
     [BackboneType("StructureMap.group.rule.dependent")]
     public partial class DependentComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2706,6 +2909,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "name":
+            NameElement = (Hl7.Fhir.Model.Id)value;
+            return this;
+          case "parameter":
+            Parameter = (List<Hl7.Fhir.Model.StructureMap.ParameterComponent>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -3475,6 +3694,79 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "url":
+          UrlElement = (Hl7.Fhir.Model.FhirUri)value;
+          return this;
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "version":
+          VersionElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "versionAlgorithm":
+          VersionAlgorithm = (Hl7.Fhir.Model.DataType)value;
+          return this;
+        case "name":
+          NameElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "title":
+          TitleElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "status":
+          StatusElement = (Code<Hl7.Fhir.Model.PublicationStatus>)value;
+          return this;
+        case "experimental":
+          ExperimentalElement = (Hl7.Fhir.Model.FhirBoolean)value;
+          return this;
+        case "date":
+          DateElement = (Hl7.Fhir.Model.FhirDateTime)value;
+          return this;
+        case "publisher":
+          PublisherElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "contact":
+          Contact = (List<Hl7.Fhir.Model.ContactDetail>)value;
+          return this;
+        case "description":
+          DescriptionElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        case "useContext":
+          UseContext = (List<Hl7.Fhir.Model.UsageContext>)value;
+          return this;
+        case "jurisdiction":
+          Jurisdiction = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "purpose":
+          PurposeElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        case "copyright":
+          CopyrightElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        case "copyrightLabel":
+          CopyrightLabelElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "structure":
+          Structure = (List<Hl7.Fhir.Model.StructureMap.StructureComponent>)value;
+          return this;
+        case "import":
+          ImportElement = (List<Hl7.Fhir.Model.Canonical>)value;
+          return this;
+        case "const":
+          Const = (List<Hl7.Fhir.Model.StructureMap.ConstComponent>)value;
+          return this;
+        case "group":
+          Group = (List<Hl7.Fhir.Model.StructureMap.GroupComponent>)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/Subscription.cs b/src/Hl7.Fhir.R5/Model/Generated/Subscription.cs
index cc0843b5eb..52a765d2b5 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/Subscription.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/Subscription.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Subscription","http://hl7.org/fhir/StructureDefinition/Subscription", IsResource=true)]
+  [FhirType("Subscription","http://hl7.org/fhir/StructureDefinition/Subscription")]
   public partial class Subscription : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -95,7 +95,7 @@ public enum SubscriptionPayloadContent
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Subscription#FilterBy", IsNestedType=true)]
+    [FhirType("Subscription#FilterBy")]
     [BackboneType("Subscription.filterBy")]
     public partial class FilterByComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -373,6 +373,31 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "resourceType":
+            ResourceTypeElement = (Hl7.Fhir.Model.FhirUri)value;
+            return this;
+          case "filterParameter":
+            FilterParameterElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "comparator":
+            ComparatorElement = (Code<Hl7.Fhir.Model.SearchComparator>)value;
+            return this;
+          case "modifier":
+            ModifierElement = (Code<Hl7.Fhir.Model.SearchModifierCode>)value;
+            return this;
+          case "value":
+            ValueElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -394,7 +419,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Subscription#Parameter", IsNestedType=true)]
+    [FhirType("Subscription#Parameter")]
     [BackboneType("Subscription.parameter")]
     public partial class ParameterComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -550,6 +575,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "name":
+            NameElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "value":
+            ValueElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1198,6 +1239,67 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "name":
+          NameElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "status":
+          StatusElement = (Code<Hl7.Fhir.Model.SubscriptionStatusCodes>)value;
+          return this;
+        case "topic":
+          TopicElement = (Hl7.Fhir.Model.Canonical)value;
+          return this;
+        case "contact":
+          Contact = (List<Hl7.Fhir.Model.ContactPoint>)value;
+          return this;
+        case "end":
+          EndElement = (Hl7.Fhir.Model.Instant)value;
+          return this;
+        case "managingEntity":
+          ManagingEntity = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "reason":
+          ReasonElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "filterBy":
+          FilterBy = (List<Hl7.Fhir.Model.Subscription.FilterByComponent>)value;
+          return this;
+        case "channelType":
+          ChannelType = (Hl7.Fhir.Model.Coding)value;
+          return this;
+        case "endpoint":
+          EndpointElement = (Hl7.Fhir.Model.FhirUrl)value;
+          return this;
+        case "parameter":
+          Parameter = (List<Hl7.Fhir.Model.Subscription.ParameterComponent>)value;
+          return this;
+        case "heartbeatPeriod":
+          HeartbeatPeriodElement = (Hl7.Fhir.Model.UnsignedInt)value;
+          return this;
+        case "timeout":
+          TimeoutElement = (Hl7.Fhir.Model.UnsignedInt)value;
+          return this;
+        case "contentType":
+          ContentTypeElement = (Hl7.Fhir.Model.Code)value;
+          return this;
+        case "content":
+          ContentElement = (Code<Hl7.Fhir.Model.Subscription.SubscriptionPayloadContent>)value;
+          return this;
+        case "maxCount":
+          MaxCountElement = (Hl7.Fhir.Model.PositiveInt)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/SubscriptionStatus.cs b/src/Hl7.Fhir.R5/Model/Generated/SubscriptionStatus.cs
index 17d4ce3156..3c169ee622 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/SubscriptionStatus.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/SubscriptionStatus.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("SubscriptionStatus","http://hl7.org/fhir/StructureDefinition/SubscriptionStatus", IsResource=true)]
+  [FhirType("SubscriptionStatus","http://hl7.org/fhir/StructureDefinition/SubscriptionStatus")]
   public partial class SubscriptionStatus : Hl7.Fhir.Model.DomainResource
   {
     /// <summary>
@@ -107,7 +107,7 @@ public enum SubscriptionNotificationType
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("SubscriptionStatus#NotificationEvent", IsNestedType=true)]
+    [FhirType("SubscriptionStatus#NotificationEvent")]
     [BackboneType("SubscriptionStatus.notificationEvent")]
     public partial class NotificationEventComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -309,6 +309,28 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "eventNumber":
+            EventNumberElement = (Hl7.Fhir.Model.Integer64)value;
+            return this;
+          case "timestamp":
+            TimestampElement = (Hl7.Fhir.Model.Instant)value;
+            return this;
+          case "focus":
+            Focus = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          case "additionalContext":
+            AdditionalContext = (List<Hl7.Fhir.Model.ResourceReference>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -617,6 +639,37 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "status":
+          StatusElement = (Code<Hl7.Fhir.Model.SubscriptionStatusCodes>)value;
+          return this;
+        case "type":
+          TypeElement = (Code<Hl7.Fhir.Model.SubscriptionStatus.SubscriptionNotificationType>)value;
+          return this;
+        case "eventsSinceSubscriptionStart":
+          EventsSinceSubscriptionStartElement = (Hl7.Fhir.Model.Integer64)value;
+          return this;
+        case "notificationEvent":
+          NotificationEvent = (List<Hl7.Fhir.Model.SubscriptionStatus.NotificationEventComponent>)value;
+          return this;
+        case "subscription":
+          Subscription = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "topic":
+          TopicElement = (Hl7.Fhir.Model.Canonical)value;
+          return this;
+        case "error":
+          Error = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/SubscriptionTopic.cs b/src/Hl7.Fhir.R5/Model/Generated/SubscriptionTopic.cs
index e90869c470..79a498b655 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/SubscriptionTopic.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/SubscriptionTopic.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("SubscriptionTopic","http://hl7.org/fhir/StructureDefinition/SubscriptionTopic", IsResource=true)]
+  [FhirType("SubscriptionTopic","http://hl7.org/fhir/StructureDefinition/SubscriptionTopic")]
   public partial class SubscriptionTopic : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -117,7 +117,7 @@ public enum CriteriaNotExistsBehavior
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("SubscriptionTopic#ResourceTrigger", IsNestedType=true)]
+    [FhirType("SubscriptionTopic#ResourceTrigger")]
     [BackboneType("SubscriptionTopic.resourceTrigger")]
     public partial class ResourceTriggerComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -375,6 +375,31 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "description":
+            DescriptionElement = (Hl7.Fhir.Model.Markdown)value;
+            return this;
+          case "resource":
+            ResourceElement = (Hl7.Fhir.Model.FhirUri)value;
+            return this;
+          case "supportedInteraction":
+            SupportedInteractionElement = (List<Code<Hl7.Fhir.Model.SubscriptionTopic.InteractionTrigger>>)value;
+            return this;
+          case "queryCriteria":
+            QueryCriteria = (Hl7.Fhir.Model.SubscriptionTopic.QueryCriteriaComponent)value;
+            return this;
+          case "fhirPathCriteria":
+            FhirPathCriteriaElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -395,7 +420,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("SubscriptionTopic#QueryCriteria", IsNestedType=true)]
+    [FhirType("SubscriptionTopic#QueryCriteria")]
     [BackboneType("SubscriptionTopic.resourceTrigger.queryCriteria")]
     public partial class QueryCriteriaComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -670,6 +695,31 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "previous":
+            PreviousElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "resultForCreate":
+            ResultForCreateElement = (Code<Hl7.Fhir.Model.SubscriptionTopic.CriteriaNotExistsBehavior>)value;
+            return this;
+          case "current":
+            CurrentElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "resultForDelete":
+            ResultForDeleteElement = (Code<Hl7.Fhir.Model.SubscriptionTopic.CriteriaNotExistsBehavior>)value;
+            return this;
+          case "requireBoth":
+            RequireBothElement = (Hl7.Fhir.Model.FhirBoolean)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -690,7 +740,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("SubscriptionTopic#EventTrigger", IsNestedType=true)]
+    [FhirType("SubscriptionTopic#EventTrigger")]
     [BackboneType("SubscriptionTopic.eventTrigger")]
     public partial class EventTriggerComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -869,6 +919,25 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "description":
+            DescriptionElement = (Hl7.Fhir.Model.Markdown)value;
+            return this;
+          case "event":
+            Event = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "resource":
+            ResourceElement = (Hl7.Fhir.Model.FhirUri)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -887,7 +956,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("SubscriptionTopic#CanFilterBy", IsNestedType=true)]
+    [FhirType("SubscriptionTopic#CanFilterBy")]
     [BackboneType("SubscriptionTopic.canFilterBy")]
     public partial class CanFilterByComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1205,6 +1274,34 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "description":
+            DescriptionElement = (Hl7.Fhir.Model.Markdown)value;
+            return this;
+          case "resource":
+            ResourceElement = (Hl7.Fhir.Model.FhirUri)value;
+            return this;
+          case "filterParameter":
+            FilterParameterElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "filterDefinition":
+            FilterDefinitionElement = (Hl7.Fhir.Model.FhirUri)value;
+            return this;
+          case "comparator":
+            ComparatorElement = (List<Code<Hl7.Fhir.Model.SearchComparator>>)value;
+            return this;
+          case "modifier":
+            ModifierElement = (List<Code<Hl7.Fhir.Model.SearchModifierCode>>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1226,7 +1323,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("SubscriptionTopic#NotificationShape", IsNestedType=true)]
+    [FhirType("SubscriptionTopic#NotificationShape")]
     [BackboneType("SubscriptionTopic.notificationShape")]
     public partial class NotificationShapeComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1423,6 +1520,25 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "resource":
+            ResourceElement = (Hl7.Fhir.Model.FhirUri)value;
+            return this;
+          case "include":
+            IncludeElement = (List<Hl7.Fhir.Model.FhirString>)value;
+            return this;
+          case "revInclude":
+            RevIncludeElement = (List<Hl7.Fhir.Model.FhirString>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -2313,6 +2429,91 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "url":
+          UrlElement = (Hl7.Fhir.Model.FhirUri)value;
+          return this;
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "version":
+          VersionElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "versionAlgorithm":
+          VersionAlgorithm = (Hl7.Fhir.Model.DataType)value;
+          return this;
+        case "name":
+          NameElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "title":
+          TitleElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "derivedFrom":
+          DerivedFromElement = (List<Hl7.Fhir.Model.Canonical>)value;
+          return this;
+        case "status":
+          StatusElement = (Code<Hl7.Fhir.Model.PublicationStatus>)value;
+          return this;
+        case "experimental":
+          ExperimentalElement = (Hl7.Fhir.Model.FhirBoolean)value;
+          return this;
+        case "date":
+          DateElement = (Hl7.Fhir.Model.FhirDateTime)value;
+          return this;
+        case "publisher":
+          PublisherElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "contact":
+          Contact = (List<Hl7.Fhir.Model.ContactDetail>)value;
+          return this;
+        case "description":
+          DescriptionElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        case "useContext":
+          UseContext = (List<Hl7.Fhir.Model.UsageContext>)value;
+          return this;
+        case "jurisdiction":
+          Jurisdiction = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "purpose":
+          PurposeElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        case "copyright":
+          CopyrightElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        case "copyrightLabel":
+          CopyrightLabelElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "approvalDate":
+          ApprovalDateElement = (Hl7.Fhir.Model.Date)value;
+          return this;
+        case "lastReviewDate":
+          LastReviewDateElement = (Hl7.Fhir.Model.Date)value;
+          return this;
+        case "effectivePeriod":
+          EffectivePeriod = (Hl7.Fhir.Model.Period)value;
+          return this;
+        case "resourceTrigger":
+          ResourceTrigger = (List<Hl7.Fhir.Model.SubscriptionTopic.ResourceTriggerComponent>)value;
+          return this;
+        case "eventTrigger":
+          EventTrigger = (List<Hl7.Fhir.Model.SubscriptionTopic.EventTriggerComponent>)value;
+          return this;
+        case "canFilterBy":
+          CanFilterBy = (List<Hl7.Fhir.Model.SubscriptionTopic.CanFilterByComponent>)value;
+          return this;
+        case "notificationShape":
+          NotificationShape = (List<Hl7.Fhir.Model.SubscriptionTopic.NotificationShapeComponent>)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/Substance.cs b/src/Hl7.Fhir.R5/Model/Generated/Substance.cs
index f64259023a..a89f169367 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/Substance.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/Substance.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model
   /// </summary>
   [Serializable]
   [DataContract]
-  [FhirType("Substance","http://hl7.org/fhir/StructureDefinition/Substance", IsResource=true)]
+  [FhirType("Substance","http://hl7.org/fhir/StructureDefinition/Substance")]
   public partial class Substance : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -92,7 +92,7 @@ public enum FHIRSubstanceStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Substance#Ingredient", IsNestedType=true)]
+    [FhirType("Substance#Ingredient")]
     [BackboneType("Substance.ingredient")]
     public partial class IngredientComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -215,6 +215,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "quantity":
+            Quantity = (Hl7.Fhir.Model.Ratio)value;
+            return this;
+          case "substance":
+            Substance = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -563,6 +579,43 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "instance":
+          InstanceElement = (Hl7.Fhir.Model.FhirBoolean)value;
+          return this;
+        case "status":
+          StatusElement = (Code<Hl7.Fhir.Model.Substance.FHIRSubstanceStatus>)value;
+          return this;
+        case "category":
+          Category = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "code":
+          Code = (Hl7.Fhir.Model.CodeableReference)value;
+          return this;
+        case "description":
+          DescriptionElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        case "expiry":
+          ExpiryElement = (Hl7.Fhir.Model.FhirDateTime)value;
+          return this;
+        case "quantity":
+          Quantity = (Hl7.Fhir.Model.Quantity)value;
+          return this;
+        case "ingredient":
+          Ingredient = (List<Hl7.Fhir.Model.Substance.IngredientComponent>)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/SubstanceDefinition.cs b/src/Hl7.Fhir.R5/Model/Generated/SubstanceDefinition.cs
index 6e6effd751..e689cbd59b 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/SubstanceDefinition.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/SubstanceDefinition.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model
   /// </summary>
   [Serializable]
   [DataContract]
-  [FhirType("SubstanceDefinition","http://hl7.org/fhir/StructureDefinition/SubstanceDefinition", IsResource=true)]
+  [FhirType("SubstanceDefinition","http://hl7.org/fhir/StructureDefinition/SubstanceDefinition")]
   public partial class SubstanceDefinition : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -61,7 +61,7 @@ public partial class SubstanceDefinition : Hl7.Fhir.Model.DomainResource, IIdent
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SubstanceDefinition#Moiety", IsNestedType=true)]
+    [FhirType("SubstanceDefinition#Moiety")]
     [BackboneType("SubstanceDefinition.moiety")]
     public partial class MoietyComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -346,6 +346,40 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "role":
+            Role = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "identifier":
+            Identifier = (Hl7.Fhir.Model.Identifier)value;
+            return this;
+          case "name":
+            NameElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "stereochemistry":
+            Stereochemistry = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "opticalActivity":
+            OpticalActivity = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "molecularFormula":
+            MolecularFormulaElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "amount":
+            Amount = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          case "measurementType":
+            MeasurementType = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -366,7 +400,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SubstanceDefinition#Characterization", IsNestedType=true)]
+    [FhirType("SubstanceDefinition#Characterization")]
     [BackboneType("SubstanceDefinition.characterization")]
     public partial class CharacterizationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -547,6 +581,28 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "technique":
+            Technique = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "form":
+            Form = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "description":
+            DescriptionElement = (Hl7.Fhir.Model.Markdown)value;
+            return this;
+          case "file":
+            File = (List<Hl7.Fhir.Model.Attachment>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -563,7 +619,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SubstanceDefinition#Property", IsNestedType=true)]
+    [FhirType("SubstanceDefinition#Property")]
     [BackboneType("SubstanceDefinition.property")]
     public partial class PropertyComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -685,6 +741,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "type":
+            Type = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "value":
+            Value = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -702,7 +774,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("SubstanceDefinition#MolecularWeight", IsNestedType=true)]
+    [FhirType("SubstanceDefinition#MolecularWeight")]
     [BackboneType("SubstanceDefinition.molecularWeight")]
     public partial class MolecularWeightComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -844,6 +916,25 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "method":
+            Method = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "type":
+            Type = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "amount":
+            Amount = (Hl7.Fhir.Model.Quantity)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -859,7 +950,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SubstanceDefinition#Structure", IsNestedType=true)]
+    [FhirType("SubstanceDefinition#Structure")]
     [BackboneType("SubstanceDefinition.structure")]
     public partial class StructureComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1147,6 +1238,40 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "stereochemistry":
+            Stereochemistry = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "opticalActivity":
+            OpticalActivity = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "molecularFormula":
+            MolecularFormulaElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "molecularFormulaByMoiety":
+            MolecularFormulaByMoietyElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "molecularWeight":
+            MolecularWeight = (Hl7.Fhir.Model.SubstanceDefinition.MolecularWeightComponent)value;
+            return this;
+          case "technique":
+            Technique = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+            return this;
+          case "sourceDocument":
+            SourceDocument = (List<Hl7.Fhir.Model.ResourceReference>)value;
+            return this;
+          case "representation":
+            Representation = (List<Hl7.Fhir.Model.SubstanceDefinition.RepresentationComponent>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1167,7 +1292,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SubstanceDefinition#Representation", IsNestedType=true)]
+    [FhirType("SubstanceDefinition#Representation")]
     [BackboneType("SubstanceDefinition.structure.representation")]
     public partial class RepresentationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1349,6 +1474,28 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "type":
+            Type = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "representation":
+            RepresentationElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "format":
+            Format = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "document":
+            Document = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1365,7 +1512,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SubstanceDefinition#Code", IsNestedType=true)]
+    [FhirType("SubstanceDefinition#Code")]
     [BackboneType("SubstanceDefinition.code")]
     public partial class CodeComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1569,6 +1716,31 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "code":
+            Code = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "status":
+            Status = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "statusDate":
+            StatusDateElement = (Hl7.Fhir.Model.FhirDateTime)value;
+            return this;
+          case "note":
+            Note = (List<Hl7.Fhir.Model.Annotation>)value;
+            return this;
+          case "source":
+            Source = (List<Hl7.Fhir.Model.ResourceReference>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1586,7 +1758,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SubstanceDefinition#Name", IsNestedType=true)]
+    [FhirType("SubstanceDefinition#Name")]
     [BackboneType("SubstanceDefinition.name")]
     public partial class NameComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1944,6 +2116,49 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "name":
+            NameElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "type":
+            Type = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "status":
+            Status = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "preferred":
+            PreferredElement = (Hl7.Fhir.Model.FhirBoolean)value;
+            return this;
+          case "language":
+            Language = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+            return this;
+          case "domain":
+            Domain = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+            return this;
+          case "jurisdiction":
+            Jurisdiction = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+            return this;
+          case "synonym":
+            Synonym = (List<Hl7.Fhir.Model.SubstanceDefinition.NameComponent>)value;
+            return this;
+          case "translation":
+            Translation = (List<Hl7.Fhir.Model.SubstanceDefinition.NameComponent>)value;
+            return this;
+          case "official":
+            Official = (List<Hl7.Fhir.Model.SubstanceDefinition.OfficialComponent>)value;
+            return this;
+          case "source":
+            Source = (List<Hl7.Fhir.Model.ResourceReference>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1967,7 +2182,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SubstanceDefinition#Official", IsNestedType=true)]
+    [FhirType("SubstanceDefinition#Official")]
     [BackboneType("SubstanceDefinition.name.official")]
     public partial class OfficialComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2126,6 +2341,25 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "authority":
+            Authority = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "status":
+            Status = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "date":
+            DateElement = (Hl7.Fhir.Model.FhirDateTime)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -2144,7 +2378,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("SubstanceDefinition#Relationship", IsNestedType=true)]
+    [FhirType("SubstanceDefinition#Relationship")]
     [BackboneType("SubstanceDefinition.relationship")]
     public partial class RelationshipComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2396,6 +2630,37 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "substanceDefinition":
+            SubstanceDefinition = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          case "type":
+            Type = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "isDefining":
+            IsDefiningElement = (Hl7.Fhir.Model.FhirBoolean)value;
+            return this;
+          case "amount":
+            Amount = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          case "ratioHighLimitAmount":
+            RatioHighLimitAmount = (Hl7.Fhir.Model.Ratio)value;
+            return this;
+          case "comparator":
+            Comparator = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "source":
+            Source = (List<Hl7.Fhir.Model.ResourceReference>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -2418,7 +2683,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("SubstanceDefinition#SourceMaterial", IsNestedType=true)]
+    [FhirType("SubstanceDefinition#SourceMaterial")]
     [BackboneType("SubstanceDefinition.sourceMaterial")]
     public partial class SourceMaterialComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2605,6 +2870,31 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "type":
+            Type = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "genus":
+            Genus = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "species":
+            Species = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "part":
+            Part = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "countryOfOrigin":
+            CountryOfOrigin = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -3257,6 +3547,88 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "version":
+          VersionElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "status":
+          Status = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "classification":
+          Classification = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "domain":
+          Domain = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "grade":
+          Grade = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "description":
+          DescriptionElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        case "informationSource":
+          InformationSource = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "note":
+          Note = (List<Hl7.Fhir.Model.Annotation>)value;
+          return this;
+        case "manufacturer":
+          Manufacturer = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "supplier":
+          Supplier = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "moiety":
+          Moiety = (List<Hl7.Fhir.Model.SubstanceDefinition.MoietyComponent>)value;
+          return this;
+        case "characterization":
+          Characterization = (List<Hl7.Fhir.Model.SubstanceDefinition.CharacterizationComponent>)value;
+          return this;
+        case "property":
+          Property = (List<Hl7.Fhir.Model.SubstanceDefinition.PropertyComponent>)value;
+          return this;
+        case "referenceInformation":
+          ReferenceInformation = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "molecularWeight":
+          MolecularWeight = (List<Hl7.Fhir.Model.SubstanceDefinition.MolecularWeightComponent>)value;
+          return this;
+        case "structure":
+          Structure = (Hl7.Fhir.Model.SubstanceDefinition.StructureComponent)value;
+          return this;
+        case "code":
+          Code = (List<Hl7.Fhir.Model.SubstanceDefinition.CodeComponent>)value;
+          return this;
+        case "name":
+          Name = (List<Hl7.Fhir.Model.SubstanceDefinition.NameComponent>)value;
+          return this;
+        case "relationship":
+          Relationship = (List<Hl7.Fhir.Model.SubstanceDefinition.RelationshipComponent>)value;
+          return this;
+        case "nucleicAcid":
+          NucleicAcid = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "polymer":
+          Polymer = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "protein":
+          Protein = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "sourceMaterial":
+          SourceMaterial = (Hl7.Fhir.Model.SubstanceDefinition.SourceMaterialComponent)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/SubstanceNucleicAcid.cs b/src/Hl7.Fhir.R5/Model/Generated/SubstanceNucleicAcid.cs
index 9ca538af52..4729713d23 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/SubstanceNucleicAcid.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/SubstanceNucleicAcid.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model
   /// </summary>
   [Serializable]
   [DataContract]
-  [FhirType("SubstanceNucleicAcid","http://hl7.org/fhir/StructureDefinition/SubstanceNucleicAcid", IsResource=true)]
+  [FhirType("SubstanceNucleicAcid","http://hl7.org/fhir/StructureDefinition/SubstanceNucleicAcid")]
   public partial class SubstanceNucleicAcid : Hl7.Fhir.Model.DomainResource
   {
     /// <summary>
@@ -61,7 +61,7 @@ public partial class SubstanceNucleicAcid : Hl7.Fhir.Model.DomainResource
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SubstanceNucleicAcid#Subunit", IsNestedType=true)]
+    [FhirType("SubstanceNucleicAcid#Subunit")]
     [BackboneType("SubstanceNucleicAcid.subunit")]
     public partial class SubunitComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -361,6 +361,40 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "subunit":
+            SubunitElement = (Hl7.Fhir.Model.Integer)value;
+            return this;
+          case "sequence":
+            SequenceElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "length":
+            LengthElement = (Hl7.Fhir.Model.Integer)value;
+            return this;
+          case "sequenceAttachment":
+            SequenceAttachment = (Hl7.Fhir.Model.Attachment)value;
+            return this;
+          case "fivePrime":
+            FivePrime = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "threePrime":
+            ThreePrime = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "linkage":
+            Linkage = (List<Hl7.Fhir.Model.SubstanceNucleicAcid.LinkageComponent>)value;
+            return this;
+          case "sugar":
+            Sugar = (List<Hl7.Fhir.Model.SubstanceNucleicAcid.SugarComponent>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -381,7 +415,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SubstanceNucleicAcid#Linkage", IsNestedType=true)]
+    [FhirType("SubstanceNucleicAcid#Linkage")]
     [BackboneType("SubstanceNucleicAcid.subunit.linkage")]
     public partial class LinkageComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -595,6 +629,28 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "connectivity":
+            ConnectivityElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "identifier":
+            Identifier = (Hl7.Fhir.Model.Identifier)value;
+            return this;
+          case "name":
+            NameElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "residueSite":
+            ResidueSiteElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -611,7 +667,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SubstanceNucleicAcid#Sugar", IsNestedType=true)]
+    [FhirType("SubstanceNucleicAcid#Sugar")]
     [BackboneType("SubstanceNucleicAcid.subunit.sugar")]
     public partial class SugarComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -786,6 +842,25 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "identifier":
+            Identifier = (Hl7.Fhir.Model.Identifier)value;
+            return this;
+          case "name":
+            NameElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "residueSite":
+            ResidueSiteElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1005,6 +1080,31 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "sequenceType":
+          SequenceType = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "numberOfSubunits":
+          NumberOfSubunitsElement = (Hl7.Fhir.Model.Integer)value;
+          return this;
+        case "areaOfHybridisation":
+          AreaOfHybridisationElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "oligoNucleotideType":
+          OligoNucleotideType = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "subunit":
+          Subunit = (List<Hl7.Fhir.Model.SubstanceNucleicAcid.SubunitComponent>)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/SubstancePolymer.cs b/src/Hl7.Fhir.R5/Model/Generated/SubstancePolymer.cs
index 1dd813a416..1399d90b21 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/SubstancePolymer.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/SubstancePolymer.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model
   /// </summary>
   [Serializable]
   [DataContract]
-  [FhirType("SubstancePolymer","http://hl7.org/fhir/StructureDefinition/SubstancePolymer", IsResource=true)]
+  [FhirType("SubstancePolymer","http://hl7.org/fhir/StructureDefinition/SubstancePolymer")]
   public partial class SubstancePolymer : Hl7.Fhir.Model.DomainResource, IIdentifiable<Identifier>
   {
     /// <summary>
@@ -61,7 +61,7 @@ public partial class SubstancePolymer : Hl7.Fhir.Model.DomainResource, IIdentifi
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SubstancePolymer#MonomerSet", IsNestedType=true)]
+    [FhirType("SubstancePolymer#MonomerSet")]
     [BackboneType("SubstancePolymer.monomerSet")]
     public partial class MonomerSetComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -180,6 +180,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "ratioType":
+            RatioType = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "startingMaterial":
+            StartingMaterial = (List<Hl7.Fhir.Model.SubstancePolymer.StartingMaterialComponent>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -194,7 +210,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SubstancePolymer#StartingMaterial", IsNestedType=true)]
+    [FhirType("SubstancePolymer#StartingMaterial")]
     [BackboneType("SubstancePolymer.monomerSet.startingMaterial")]
     public partial class StartingMaterialComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -372,6 +388,28 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "code":
+            Code = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "category":
+            Category = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "isDefining":
+            IsDefiningElement = (Hl7.Fhir.Model.FhirBoolean)value;
+            return this;
+          case "amount":
+            Amount = (Hl7.Fhir.Model.Quantity)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -388,7 +426,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SubstancePolymer#Repeat", IsNestedType=true)]
+    [FhirType("SubstancePolymer#Repeat")]
     [BackboneType("SubstancePolymer.repeat")]
     public partial class RepeatComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -546,6 +584,25 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "averageMolecularFormula":
+            AverageMolecularFormulaElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "repeatUnitAmountType":
+            RepeatUnitAmountType = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "repeatUnit":
+            RepeatUnit = (List<Hl7.Fhir.Model.SubstancePolymer.RepeatUnitComponent>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -561,7 +618,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SubstancePolymer#RepeatUnit", IsNestedType=true)]
+    [FhirType("SubstancePolymer#RepeatUnit")]
     [BackboneType("SubstancePolymer.repeat.repeatUnit")]
     public partial class RepeatUnitComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -780,6 +837,31 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "unit":
+            UnitElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "orientation":
+            Orientation = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "amount":
+            AmountElement = (Hl7.Fhir.Model.Integer)value;
+            return this;
+          case "degreeOfPolymerisation":
+            DegreeOfPolymerisation = (List<Hl7.Fhir.Model.SubstancePolymer.DegreeOfPolymerisationComponent>)value;
+            return this;
+          case "structuralRepresentation":
+            StructuralRepresentation = (List<Hl7.Fhir.Model.SubstancePolymer.StructuralRepresentationComponent>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -797,7 +879,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SubstancePolymer#DegreeOfPolymerisation", IsNestedType=true)]
+    [FhirType("SubstancePolymer#DegreeOfPolymerisation")]
     [BackboneType("SubstancePolymer.repeat.repeatUnit.degreeOfPolymerisation")]
     public partial class DegreeOfPolymerisationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1011,6 +1093,28 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "type":
+            Type = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "average":
+            AverageElement = (Hl7.Fhir.Model.Integer)value;
+            return this;
+          case "low":
+            LowElement = (Hl7.Fhir.Model.Integer)value;
+            return this;
+          case "high":
+            HighElement = (Hl7.Fhir.Model.Integer)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1027,7 +1131,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SubstancePolymer#StructuralRepresentation", IsNestedType=true)]
+    [FhirType("SubstancePolymer#StructuralRepresentation")]
     [BackboneType("SubstancePolymer.repeat.repeatUnit.structuralRepresentation")]
     public partial class StructuralRepresentationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1205,6 +1309,28 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "type":
+            Type = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "representation":
+            RepresentationElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "format":
+            Format = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "attachment":
+            Attachment = (Hl7.Fhir.Model.Attachment)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1453,6 +1579,37 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "identifier":
+          Identifier = (Hl7.Fhir.Model.Identifier)value;
+          return this;
+        case "class":
+          Class = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "geometry":
+          Geometry = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "copolymerConnectivity":
+          CopolymerConnectivity = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "modification":
+          ModificationElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "monomerSet":
+          MonomerSet = (List<Hl7.Fhir.Model.SubstancePolymer.MonomerSetComponent>)value;
+          return this;
+        case "repeat":
+          Repeat = (List<Hl7.Fhir.Model.SubstancePolymer.RepeatComponent>)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/SubstanceProtein.cs b/src/Hl7.Fhir.R5/Model/Generated/SubstanceProtein.cs
index 7ad66207a9..0028b20e93 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/SubstanceProtein.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/SubstanceProtein.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model
   /// </summary>
   [Serializable]
   [DataContract]
-  [FhirType("SubstanceProtein","http://hl7.org/fhir/StructureDefinition/SubstanceProtein", IsResource=true)]
+  [FhirType("SubstanceProtein","http://hl7.org/fhir/StructureDefinition/SubstanceProtein")]
   public partial class SubstanceProtein : Hl7.Fhir.Model.DomainResource
   {
     /// <summary>
@@ -61,7 +61,7 @@ public partial class SubstanceProtein : Hl7.Fhir.Model.DomainResource
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SubstanceProtein#Subunit", IsNestedType=true)]
+    [FhirType("SubstanceProtein#Subunit")]
     [BackboneType("SubstanceProtein.subunit")]
     public partial class SubunitComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -395,6 +395,40 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "subunit":
+            SubunitElement = (Hl7.Fhir.Model.Integer)value;
+            return this;
+          case "sequence":
+            SequenceElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "length":
+            LengthElement = (Hl7.Fhir.Model.Integer)value;
+            return this;
+          case "sequenceAttachment":
+            SequenceAttachment = (Hl7.Fhir.Model.Attachment)value;
+            return this;
+          case "nTerminalModificationId":
+            NTerminalModificationId = (Hl7.Fhir.Model.Identifier)value;
+            return this;
+          case "nTerminalModification":
+            NTerminalModificationElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "cTerminalModificationId":
+            CTerminalModificationId = (Hl7.Fhir.Model.Identifier)value;
+            return this;
+          case "cTerminalModification":
+            CTerminalModificationElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -599,6 +633,28 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "sequenceType":
+          SequenceType = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "numberOfSubunits":
+          NumberOfSubunitsElement = (Hl7.Fhir.Model.Integer)value;
+          return this;
+        case "disulfideLinkage":
+          DisulfideLinkageElement = (List<Hl7.Fhir.Model.FhirString>)value;
+          return this;
+        case "subunit":
+          Subunit = (List<Hl7.Fhir.Model.SubstanceProtein.SubunitComponent>)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/SubstanceReferenceInformation.cs b/src/Hl7.Fhir.R5/Model/Generated/SubstanceReferenceInformation.cs
index 5f35448771..1886332c66 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/SubstanceReferenceInformation.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/SubstanceReferenceInformation.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model
   /// </summary>
   [Serializable]
   [DataContract]
-  [FhirType("SubstanceReferenceInformation","http://hl7.org/fhir/StructureDefinition/SubstanceReferenceInformation", IsResource=true)]
+  [FhirType("SubstanceReferenceInformation","http://hl7.org/fhir/StructureDefinition/SubstanceReferenceInformation")]
   public partial class SubstanceReferenceInformation : Hl7.Fhir.Model.DomainResource
   {
     /// <summary>
@@ -61,7 +61,7 @@ public partial class SubstanceReferenceInformation : Hl7.Fhir.Model.DomainResour
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SubstanceReferenceInformation#Gene", IsNestedType=true)]
+    [FhirType("SubstanceReferenceInformation#Gene")]
     [BackboneType("SubstanceReferenceInformation.gene")]
     public partial class GeneComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -203,6 +203,25 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "geneSequenceOrigin":
+            GeneSequenceOrigin = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "gene":
+            Gene = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "source":
+            Source = (List<Hl7.Fhir.Model.ResourceReference>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -218,7 +237,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SubstanceReferenceInformation#GeneElement", IsNestedType=true)]
+    [FhirType("SubstanceReferenceInformation#GeneElement")]
     [BackboneType("SubstanceReferenceInformation.geneElement")]
     public partial class GeneElementComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -360,6 +379,25 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "type":
+            Type = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "element":
+            Element = (Hl7.Fhir.Model.Identifier)value;
+            return this;
+          case "source":
+            Source = (List<Hl7.Fhir.Model.ResourceReference>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -375,7 +413,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SubstanceReferenceInformation#Target", IsNestedType=true)]
+    [FhirType("SubstanceReferenceInformation#Target")]
     [BackboneType("SubstanceReferenceInformation.target")]
     public partial class TargetComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -624,6 +662,40 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "target":
+            Target = (Hl7.Fhir.Model.Identifier)value;
+            return this;
+          case "type":
+            Type = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "interaction":
+            Interaction = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "organism":
+            Organism = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "organismType":
+            OrganismType = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "amount":
+            Amount = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          case "amountType":
+            AmountType = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "source":
+            Source = (List<Hl7.Fhir.Model.ResourceReference>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -811,6 +883,28 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "comment":
+          CommentElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "gene":
+          Gene = (List<Hl7.Fhir.Model.SubstanceReferenceInformation.GeneComponent>)value;
+          return this;
+        case "geneElement":
+          GeneElement = (List<Hl7.Fhir.Model.SubstanceReferenceInformation.GeneElementComponent>)value;
+          return this;
+        case "target":
+          Target = (List<Hl7.Fhir.Model.SubstanceReferenceInformation.TargetComponent>)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/SubstanceSourceMaterial.cs b/src/Hl7.Fhir.R5/Model/Generated/SubstanceSourceMaterial.cs
index d82ff9d933..be74ae1be5 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/SubstanceSourceMaterial.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/SubstanceSourceMaterial.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model
   /// </summary>
   [Serializable]
   [DataContract]
-  [FhirType("SubstanceSourceMaterial","http://hl7.org/fhir/StructureDefinition/SubstanceSourceMaterial", IsResource=true)]
+  [FhirType("SubstanceSourceMaterial","http://hl7.org/fhir/StructureDefinition/SubstanceSourceMaterial")]
   public partial class SubstanceSourceMaterial : Hl7.Fhir.Model.DomainResource
   {
     /// <summary>
@@ -61,7 +61,7 @@ public partial class SubstanceSourceMaterial : Hl7.Fhir.Model.DomainResource
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SubstanceSourceMaterial#FractionDescription", IsNestedType=true)]
+    [FhirType("SubstanceSourceMaterial#FractionDescription")]
     [BackboneType("SubstanceSourceMaterial.fractionDescription")]
     public partial class FractionDescriptionComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -197,6 +197,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "fraction":
+            FractionElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "materialType":
+            MaterialType = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -211,7 +227,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SubstanceSourceMaterial#Organism", IsNestedType=true)]
+    [FhirType("SubstanceSourceMaterial#Organism")]
     [BackboneType("SubstanceSourceMaterial.organism")]
     public partial class OrganismComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -474,6 +490,40 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "family":
+            Family = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "genus":
+            Genus = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "species":
+            Species = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "intraspecificType":
+            IntraspecificType = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "intraspecificDescription":
+            IntraspecificDescriptionElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "author":
+            Author = (List<Hl7.Fhir.Model.SubstanceSourceMaterial.AuthorComponent>)value;
+            return this;
+          case "hybrid":
+            Hybrid = (Hl7.Fhir.Model.SubstanceSourceMaterial.HybridComponent)value;
+            return this;
+          case "organismGeneral":
+            OrganismGeneral = (Hl7.Fhir.Model.SubstanceSourceMaterial.OrganismGeneralComponent)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -494,7 +544,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SubstanceSourceMaterial#Author", IsNestedType=true)]
+    [FhirType("SubstanceSourceMaterial#Author")]
     [BackboneType("SubstanceSourceMaterial.organism.author")]
     public partial class AuthorComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -630,6 +680,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "authorType":
+            AuthorType = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "authorDescription":
+            AuthorDescriptionElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -644,7 +710,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SubstanceSourceMaterial#Hybrid", IsNestedType=true)]
+    [FhirType("SubstanceSourceMaterial#Hybrid")]
     [BackboneType("SubstanceSourceMaterial.organism.hybrid")]
     public partial class HybridComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -897,6 +963,31 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "maternalOrganismId":
+            MaternalOrganismIdElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "maternalOrganismName":
+            MaternalOrganismNameElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "paternalOrganismId":
+            PaternalOrganismIdElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "paternalOrganismName":
+            PaternalOrganismNameElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "hybridType":
+            HybridType = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -914,7 +1005,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SubstanceSourceMaterial#OrganismGeneral", IsNestedType=true)]
+    [FhirType("SubstanceSourceMaterial#OrganismGeneral")]
     [BackboneType("SubstanceSourceMaterial.organism.organismGeneral")]
     public partial class OrganismGeneralComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1074,6 +1165,28 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "kingdom":
+            Kingdom = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "phylum":
+            Phylum = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "class":
+            Class = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "order":
+            Order = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1090,7 +1203,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SubstanceSourceMaterial#PartDescription", IsNestedType=true)]
+    [FhirType("SubstanceSourceMaterial#PartDescription")]
     [BackboneType("SubstanceSourceMaterial.partDescription")]
     public partial class PartDescriptionComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1208,6 +1321,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "part":
+            Part = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "partLocation":
+            PartLocation = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1617,6 +1746,55 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "sourceMaterialClass":
+          SourceMaterialClass = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "sourceMaterialType":
+          SourceMaterialType = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "sourceMaterialState":
+          SourceMaterialState = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "organismId":
+          OrganismId = (Hl7.Fhir.Model.Identifier)value;
+          return this;
+        case "organismName":
+          OrganismNameElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "parentSubstanceId":
+          ParentSubstanceId = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "parentSubstanceName":
+          ParentSubstanceNameElement = (List<Hl7.Fhir.Model.FhirString>)value;
+          return this;
+        case "countryOfOrigin":
+          CountryOfOrigin = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "geographicalLocation":
+          GeographicalLocationElement = (List<Hl7.Fhir.Model.FhirString>)value;
+          return this;
+        case "developmentStage":
+          DevelopmentStage = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "fractionDescription":
+          FractionDescription = (List<Hl7.Fhir.Model.SubstanceSourceMaterial.FractionDescriptionComponent>)value;
+          return this;
+        case "organism":
+          Organism = (Hl7.Fhir.Model.SubstanceSourceMaterial.OrganismComponent)value;
+          return this;
+        case "partDescription":
+          PartDescription = (List<Hl7.Fhir.Model.SubstanceSourceMaterial.PartDescriptionComponent>)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/SupplyDelivery.cs b/src/Hl7.Fhir.R5/Model/Generated/SupplyDelivery.cs
index 92f2cd8574..0a54d5f35e 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/SupplyDelivery.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/SupplyDelivery.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("SupplyDelivery","http://hl7.org/fhir/StructureDefinition/SupplyDelivery", IsResource=true)]
+  [FhirType("SupplyDelivery","http://hl7.org/fhir/StructureDefinition/SupplyDelivery")]
   public partial class SupplyDelivery : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -129,7 +129,7 @@ public enum SupplyDeliverySupplyItemType
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("SupplyDelivery#SuppliedItem", IsNestedType=true)]
+    [FhirType("SupplyDelivery#SuppliedItem")]
     [BackboneType("SupplyDelivery.suppliedItem")]
     public partial class SuppliedItemComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -251,6 +251,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "quantity":
+            Quantity = (Hl7.Fhir.Model.Quantity)value;
+            return this;
+          case "item":
+            Item = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -600,6 +616,49 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "basedOn":
+          BasedOn = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "partOf":
+          PartOf = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "status":
+          StatusElement = (Code<Hl7.Fhir.Model.SupplyDelivery.SupplyDeliveryStatus>)value;
+          return this;
+        case "patient":
+          Patient = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "type":
+          Type = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "suppliedItem":
+          SuppliedItem = (List<Hl7.Fhir.Model.SupplyDelivery.SuppliedItemComponent>)value;
+          return this;
+        case "occurrence":
+          Occurrence = (Hl7.Fhir.Model.DataType)value;
+          return this;
+        case "supplier":
+          Supplier = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "destination":
+          Destination = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "receiver":
+          Receiver = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/SupplyRequest.cs b/src/Hl7.Fhir.R5/Model/Generated/SupplyRequest.cs
index 9ac707dc07..040628efb2 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/SupplyRequest.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/SupplyRequest.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("SupplyRequest","http://hl7.org/fhir/StructureDefinition/SupplyRequest", IsResource=true)]
+  [FhirType("SupplyRequest","http://hl7.org/fhir/StructureDefinition/SupplyRequest")]
   public partial class SupplyRequest : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -119,7 +119,7 @@ public enum SupplyRequestStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("SupplyRequest#Parameter", IsNestedType=true)]
+    [FhirType("SupplyRequest#Parameter")]
     [BackboneType("SupplyRequest.parameter")]
     public partial class ParameterComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -240,6 +240,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "code":
+            Code = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "value":
+            Value = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -736,6 +752,64 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "status":
+          StatusElement = (Code<Hl7.Fhir.Model.SupplyRequest.SupplyRequestStatus>)value;
+          return this;
+        case "basedOn":
+          BasedOn = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "category":
+          Category = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "priority":
+          PriorityElement = (Code<Hl7.Fhir.Model.RequestPriority>)value;
+          return this;
+        case "deliverFor":
+          DeliverFor = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "item":
+          Item = (Hl7.Fhir.Model.CodeableReference)value;
+          return this;
+        case "quantity":
+          Quantity = (Hl7.Fhir.Model.Quantity)value;
+          return this;
+        case "parameter":
+          Parameter = (List<Hl7.Fhir.Model.SupplyRequest.ParameterComponent>)value;
+          return this;
+        case "occurrence":
+          Occurrence = (Hl7.Fhir.Model.DataType)value;
+          return this;
+        case "authoredOn":
+          AuthoredOnElement = (Hl7.Fhir.Model.FhirDateTime)value;
+          return this;
+        case "requester":
+          Requester = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "supplier":
+          Supplier = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "reason":
+          Reason = (List<Hl7.Fhir.Model.CodeableReference>)value;
+          return this;
+        case "deliverFrom":
+          DeliverFrom = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "deliverTo":
+          DeliverTo = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/Task.cs b/src/Hl7.Fhir.R5/Model/Generated/Task.cs
index d759c681a6..f9fe53f9fd 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/Task.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/Task.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model
   /// </summary>
   [Serializable]
   [DataContract]
-  [FhirType("Task","http://hl7.org/fhir/StructureDefinition/Task", IsResource=true)]
+  [FhirType("Task","http://hl7.org/fhir/StructureDefinition/Task")]
   public partial class Task : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -210,7 +210,7 @@ public enum TaskIntent
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Task#Performer", IsNestedType=true)]
+    [FhirType("Task#Performer")]
     [BackboneType("Task.performer")]
     public partial class PerformerComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -332,6 +332,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "function":
+            Function = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "actor":
+            Actor = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -350,7 +366,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Task#Restriction", IsNestedType=true)]
+    [FhirType("Task#Restriction")]
     [BackboneType("Task.restriction")]
     public partial class RestrictionComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -510,6 +526,25 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "repetitions":
+            RepetitionsElement = (Hl7.Fhir.Model.PositiveInt)value;
+            return this;
+          case "period":
+            Period = (Hl7.Fhir.Model.Period)value;
+            return this;
+          case "recipient":
+            Recipient = (List<Hl7.Fhir.Model.ResourceReference>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -528,7 +563,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Task#Input", IsNestedType=true)]
+    [FhirType("Task#Input")]
     [BackboneType("Task.input")]
     public partial class InputComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -651,6 +686,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "type":
+            Type = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "value":
+            Value = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -668,7 +719,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Task#Output", IsNestedType=true)]
+    [FhirType("Task#Output")]
     [BackboneType("Task.output")]
     public partial class OutputComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -791,6 +842,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "type":
+            Type = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "value":
+            Value = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1768,6 +1835,115 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "instantiatesCanonical":
+          InstantiatesCanonicalElement = (Hl7.Fhir.Model.Canonical)value;
+          return this;
+        case "instantiatesUri":
+          InstantiatesUriElement = (Hl7.Fhir.Model.FhirUri)value;
+          return this;
+        case "basedOn":
+          BasedOn = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "groupIdentifier":
+          GroupIdentifier = (Hl7.Fhir.Model.Identifier)value;
+          return this;
+        case "partOf":
+          PartOf = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "status":
+          StatusElement = (Code<Hl7.Fhir.Model.Task.TaskStatus>)value;
+          return this;
+        case "statusReason":
+          StatusReason = (Hl7.Fhir.Model.CodeableReference)value;
+          return this;
+        case "businessStatus":
+          BusinessStatus = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "intent":
+          IntentElement = (Code<Hl7.Fhir.Model.Task.TaskIntent>)value;
+          return this;
+        case "priority":
+          PriorityElement = (Code<Hl7.Fhir.Model.RequestPriority>)value;
+          return this;
+        case "doNotPerform":
+          DoNotPerformElement = (Hl7.Fhir.Model.FhirBoolean)value;
+          return this;
+        case "code":
+          Code = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "description":
+          DescriptionElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "focus":
+          Focus = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "for":
+          For = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "encounter":
+          Encounter = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "requestedPeriod":
+          RequestedPeriod = (Hl7.Fhir.Model.Period)value;
+          return this;
+        case "executionPeriod":
+          ExecutionPeriod = (Hl7.Fhir.Model.Period)value;
+          return this;
+        case "authoredOn":
+          AuthoredOnElement = (Hl7.Fhir.Model.FhirDateTime)value;
+          return this;
+        case "lastModified":
+          LastModifiedElement = (Hl7.Fhir.Model.FhirDateTime)value;
+          return this;
+        case "requester":
+          Requester = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "requestedPerformer":
+          RequestedPerformer = (List<Hl7.Fhir.Model.CodeableReference>)value;
+          return this;
+        case "owner":
+          Owner = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "performer":
+          Performer = (List<Hl7.Fhir.Model.Task.PerformerComponent>)value;
+          return this;
+        case "location":
+          Location = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "reason":
+          Reason = (List<Hl7.Fhir.Model.CodeableReference>)value;
+          return this;
+        case "insurance":
+          Insurance = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "note":
+          Note = (List<Hl7.Fhir.Model.Annotation>)value;
+          return this;
+        case "relevantHistory":
+          RelevantHistory = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "restriction":
+          Restriction = (Hl7.Fhir.Model.Task.RestrictionComponent)value;
+          return this;
+        case "input":
+          Input = (List<Hl7.Fhir.Model.Task.InputComponent>)value;
+          return this;
+        case "output":
+          Output = (List<Hl7.Fhir.Model.Task.OutputComponent>)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/Template-Bindings.cs b/src/Hl7.Fhir.R5/Model/Generated/Template-Bindings.cs
index b9ea06b3bd..8c47fd21d5 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/Template-Bindings.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/Template-Bindings.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using Hl7.Fhir.Utility;
 
diff --git a/src/Hl7.Fhir.R5/Model/Generated/Template-ModelInfo.cs b/src/Hl7.Fhir.R5/Model/Generated/Template-ModelInfo.cs
index 51c5b76b73..7ac0a9ad94 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/Template-ModelInfo.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/Template-ModelInfo.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/TerminologyCapabilities.cs b/src/Hl7.Fhir.R5/Model/Generated/TerminologyCapabilities.cs
index e26962e1c8..617ce5d840 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/TerminologyCapabilities.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/TerminologyCapabilities.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("TerminologyCapabilities","http://hl7.org/fhir/StructureDefinition/TerminologyCapabilities", IsResource=true)]
+  [FhirType("TerminologyCapabilities","http://hl7.org/fhir/StructureDefinition/TerminologyCapabilities")]
   public partial class TerminologyCapabilities : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -95,7 +95,7 @@ public enum CodeSearchSupport
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TerminologyCapabilities#Software", IsNestedType=true)]
+    [FhirType("TerminologyCapabilities#Software")]
     [BackboneType("TerminologyCapabilities.software")]
     public partial class SoftwareComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -250,6 +250,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "name":
+            NameElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "version":
+            VersionElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -267,7 +283,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TerminologyCapabilities#Implementation", IsNestedType=true)]
+    [FhirType("TerminologyCapabilities#Implementation")]
     [BackboneType("TerminologyCapabilities.implementation")]
     public partial class ImplementationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -422,6 +438,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "description":
+            DescriptionElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "url":
+            UrlElement = (Hl7.Fhir.Model.FhirUrl)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -440,7 +472,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TerminologyCapabilities#CodeSystem", IsNestedType=true)]
+    [FhirType("TerminologyCapabilities#CodeSystem")]
     [BackboneType("TerminologyCapabilities.codeSystem")]
     public partial class CodeSystemComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -658,6 +690,28 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "uri":
+            UriElement = (Hl7.Fhir.Model.Canonical)value;
+            return this;
+          case "version":
+            Version = (List<Hl7.Fhir.Model.TerminologyCapabilities.VersionComponent>)value;
+            return this;
+          case "content":
+            ContentElement = (Code<Hl7.Fhir.Model.CodeSystemContentMode>)value;
+            return this;
+          case "subsumption":
+            SubsumptionElement = (Hl7.Fhir.Model.FhirBoolean)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -678,7 +732,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TerminologyCapabilities#Version", IsNestedType=true)]
+    [FhirType("TerminologyCapabilities#Version")]
     [BackboneType("TerminologyCapabilities.codeSystem.version")]
     public partial class VersionComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -975,6 +1029,34 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "code":
+            CodeElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "isDefault":
+            IsDefaultElement = (Hl7.Fhir.Model.FhirBoolean)value;
+            return this;
+          case "compositional":
+            CompositionalElement = (Hl7.Fhir.Model.FhirBoolean)value;
+            return this;
+          case "language":
+            LanguageElement = (List<Code<Hl7.Fhir.Model.CommonLanguages>>)value;
+            return this;
+          case "filter":
+            Filter = (List<Hl7.Fhir.Model.TerminologyCapabilities.FilterComponent>)value;
+            return this;
+          case "property":
+            PropertyElement = (List<Hl7.Fhir.Model.Code>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -993,7 +1075,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("TerminologyCapabilities#Filter", IsNestedType=true)]
+    [FhirType("TerminologyCapabilities#Filter")]
     [BackboneType("TerminologyCapabilities.codeSystem.version.filter")]
     public partial class FilterComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1149,6 +1231,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "code":
+            CodeElement = (Hl7.Fhir.Model.Code)value;
+            return this;
+          case "op":
+            OpElement = (List<Hl7.Fhir.Model.Code>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1163,7 +1261,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("TerminologyCapabilities#Expansion", IsNestedType=true)]
+    [FhirType("TerminologyCapabilities#Expansion")]
     [BackboneType("TerminologyCapabilities.expansion")]
     public partial class ExpansionComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1417,6 +1515,31 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "hierarchical":
+            HierarchicalElement = (Hl7.Fhir.Model.FhirBoolean)value;
+            return this;
+          case "paging":
+            PagingElement = (Hl7.Fhir.Model.FhirBoolean)value;
+            return this;
+          case "incomplete":
+            IncompleteElement = (Hl7.Fhir.Model.FhirBoolean)value;
+            return this;
+          case "parameter":
+            Parameter = (List<Hl7.Fhir.Model.TerminologyCapabilities.ParameterComponent>)value;
+            return this;
+          case "textFilter":
+            TextFilterElement = (Hl7.Fhir.Model.Markdown)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1434,7 +1557,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("TerminologyCapabilities#Parameter", IsNestedType=true)]
+    [FhirType("TerminologyCapabilities#Parameter")]
     [BackboneType("TerminologyCapabilities.expansion.parameter")]
     public partial class ParameterComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1589,6 +1712,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "name":
+            NameElement = (Hl7.Fhir.Model.Code)value;
+            return this;
+          case "documentation":
+            DocumentationElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1603,7 +1742,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("TerminologyCapabilities#ValidateCode", IsNestedType=true)]
+    [FhirType("TerminologyCapabilities#ValidateCode")]
     [BackboneType("TerminologyCapabilities.validateCode")]
     public partial class ValidateCodeComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1719,6 +1858,19 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "translations":
+            TranslationsElement = (Hl7.Fhir.Model.FhirBoolean)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1732,7 +1884,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("TerminologyCapabilities#Translation", IsNestedType=true)]
+    [FhirType("TerminologyCapabilities#Translation")]
     [BackboneType("TerminologyCapabilities.translation")]
     public partial class TranslationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1848,6 +2000,19 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "needsMap":
+            NeedsMapElement = (Hl7.Fhir.Model.FhirBoolean)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1864,7 +2029,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TerminologyCapabilities#Closure", IsNestedType=true)]
+    [FhirType("TerminologyCapabilities#Closure")]
     [BackboneType("TerminologyCapabilities.closure")]
     public partial class ClosureComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1979,6 +2144,19 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "translation":
+            TranslationElement = (Hl7.Fhir.Model.FhirBoolean)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -2910,6 +3088,97 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "url":
+          UrlElement = (Hl7.Fhir.Model.FhirUri)value;
+          return this;
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "version":
+          VersionElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "versionAlgorithm":
+          VersionAlgorithm = (Hl7.Fhir.Model.DataType)value;
+          return this;
+        case "name":
+          NameElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "title":
+          TitleElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "status":
+          StatusElement = (Code<Hl7.Fhir.Model.PublicationStatus>)value;
+          return this;
+        case "experimental":
+          ExperimentalElement = (Hl7.Fhir.Model.FhirBoolean)value;
+          return this;
+        case "date":
+          DateElement = (Hl7.Fhir.Model.FhirDateTime)value;
+          return this;
+        case "publisher":
+          PublisherElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "contact":
+          Contact = (List<Hl7.Fhir.Model.ContactDetail>)value;
+          return this;
+        case "description":
+          DescriptionElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        case "useContext":
+          UseContext = (List<Hl7.Fhir.Model.UsageContext>)value;
+          return this;
+        case "jurisdiction":
+          Jurisdiction = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "purpose":
+          PurposeElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        case "copyright":
+          CopyrightElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        case "copyrightLabel":
+          CopyrightLabelElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "kind":
+          KindElement = (Code<Hl7.Fhir.Model.CapabilityStatementKind>)value;
+          return this;
+        case "software":
+          Software = (Hl7.Fhir.Model.TerminologyCapabilities.SoftwareComponent)value;
+          return this;
+        case "implementation":
+          Implementation = (Hl7.Fhir.Model.TerminologyCapabilities.ImplementationComponent)value;
+          return this;
+        case "lockedDate":
+          LockedDateElement = (Hl7.Fhir.Model.FhirBoolean)value;
+          return this;
+        case "codeSystem":
+          CodeSystem = (List<Hl7.Fhir.Model.TerminologyCapabilities.CodeSystemComponent>)value;
+          return this;
+        case "expansion":
+          Expansion = (Hl7.Fhir.Model.TerminologyCapabilities.ExpansionComponent)value;
+          return this;
+        case "codeSearch":
+          CodeSearchElement = (Code<Hl7.Fhir.Model.TerminologyCapabilities.CodeSearchSupport>)value;
+          return this;
+        case "validateCode":
+          ValidateCode = (Hl7.Fhir.Model.TerminologyCapabilities.ValidateCodeComponent)value;
+          return this;
+        case "translation":
+          Translation = (Hl7.Fhir.Model.TerminologyCapabilities.TranslationComponent)value;
+          return this;
+        case "closure":
+          Closure = (Hl7.Fhir.Model.TerminologyCapabilities.ClosureComponent)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/TestPlan.cs b/src/Hl7.Fhir.R5/Model/Generated/TestPlan.cs
index 7d3398fa8e..41532290f5 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/TestPlan.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/TestPlan.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("TestPlan","http://hl7.org/fhir/StructureDefinition/TestPlan", IsResource=true)]
+  [FhirType("TestPlan","http://hl7.org/fhir/StructureDefinition/TestPlan")]
   public partial class TestPlan : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -67,7 +67,7 @@ public partial class TestPlan : Hl7.Fhir.Model.DomainResource, IIdentifiable<Lis
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestPlan#Dependency", IsNestedType=true)]
+    [FhirType("TestPlan#Dependency")]
     [BackboneType("TestPlan.dependency")]
     public partial class DependencyComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -203,6 +203,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "description":
+            DescriptionElement = (Hl7.Fhir.Model.Markdown)value;
+            return this;
+          case "predecessor":
+            Predecessor = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -220,7 +236,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestPlan#TestCase", IsNestedType=true)]
+    [FhirType("TestPlan#TestCase")]
     [BackboneType("TestPlan.testCase")]
     public partial class TestCaseComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -445,6 +461,34 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "sequence":
+            SequenceElement = (Hl7.Fhir.Model.Integer)value;
+            return this;
+          case "scope":
+            Scope = (List<Hl7.Fhir.Model.ResourceReference>)value;
+            return this;
+          case "dependency":
+            Dependency = (List<Hl7.Fhir.Model.TestPlan.TestCaseDependencyComponent>)value;
+            return this;
+          case "testRun":
+            TestRun = (List<Hl7.Fhir.Model.TestPlan.TestRunComponent>)value;
+            return this;
+          case "testData":
+            TestData = (List<Hl7.Fhir.Model.TestPlan.TestDataComponent>)value;
+            return this;
+          case "assertion":
+            Assertion = (List<Hl7.Fhir.Model.TestPlan.AssertionComponent>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -466,7 +510,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestPlan#TestCaseDependency", IsNestedType=true)]
+    [FhirType("TestPlan#TestCaseDependency")]
     [BackboneType("TestPlan.testCase.dependency")]
     public partial class TestCaseDependencyComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -602,6 +646,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "description":
+            DescriptionElement = (Hl7.Fhir.Model.Markdown)value;
+            return this;
+          case "predecessor":
+            Predecessor = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -616,7 +676,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("TestPlan#TestRun", IsNestedType=true)]
+    [FhirType("TestPlan#TestRun")]
     [BackboneType("TestPlan.testCase.testRun")]
     public partial class TestRunComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -752,6 +812,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "narrative":
+            NarrativeElement = (Hl7.Fhir.Model.Markdown)value;
+            return this;
+          case "script":
+            Script = (Hl7.Fhir.Model.TestPlan.ScriptComponent)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -766,7 +842,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("TestPlan#Script", IsNestedType=true)]
+    [FhirType("TestPlan#Script")]
     [BackboneType("TestPlan.testCase.testRun.script")]
     public partial class ScriptComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -886,6 +962,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "language":
+            Language = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "source":
+            Source = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -900,7 +992,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("TestPlan#TestData", IsNestedType=true)]
+    [FhirType("TestPlan#TestData")]
     [BackboneType("TestPlan.testCase.testData")]
     public partial class TestDataComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1042,6 +1134,25 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "type":
+            Type = (Hl7.Fhir.Model.Coding)value;
+            return this;
+          case "content":
+            Content = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          case "source":
+            Source = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1060,7 +1171,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestPlan#Assertion", IsNestedType=true)]
+    [FhirType("TestPlan#Assertion")]
     [BackboneType("TestPlan.testCase.assertion")]
     public partial class AssertionComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1202,6 +1313,25 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "type":
+            Type = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+            return this;
+          case "object":
+            Object = (List<Hl7.Fhir.Model.CodeableReference>)value;
+            return this;
+          case "result":
+            Result = (List<Hl7.Fhir.Model.CodeableReference>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -2031,6 +2161,85 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "url":
+          UrlElement = (Hl7.Fhir.Model.FhirUri)value;
+          return this;
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "version":
+          VersionElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "versionAlgorithm":
+          VersionAlgorithm = (Hl7.Fhir.Model.DataType)value;
+          return this;
+        case "name":
+          NameElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "title":
+          TitleElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "status":
+          StatusElement = (Code<Hl7.Fhir.Model.PublicationStatus>)value;
+          return this;
+        case "experimental":
+          ExperimentalElement = (Hl7.Fhir.Model.FhirBoolean)value;
+          return this;
+        case "date":
+          DateElement = (Hl7.Fhir.Model.FhirDateTime)value;
+          return this;
+        case "publisher":
+          PublisherElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "contact":
+          Contact = (List<Hl7.Fhir.Model.ContactDetail>)value;
+          return this;
+        case "description":
+          DescriptionElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        case "useContext":
+          UseContext = (List<Hl7.Fhir.Model.UsageContext>)value;
+          return this;
+        case "jurisdiction":
+          Jurisdiction = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "purpose":
+          PurposeElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        case "copyright":
+          CopyrightElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        case "copyrightLabel":
+          CopyrightLabelElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "category":
+          Category = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "scope":
+          Scope = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "testTools":
+          TestToolsElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        case "dependency":
+          Dependency = (List<Hl7.Fhir.Model.TestPlan.DependencyComponent>)value;
+          return this;
+        case "exitCriteria":
+          ExitCriteriaElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        case "testCase":
+          TestCase = (List<Hl7.Fhir.Model.TestPlan.TestCaseComponent>)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/TestReport.cs b/src/Hl7.Fhir.R5/Model/Generated/TestReport.cs
index 022d6a4ea0..bb9f2f6c1c 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/TestReport.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/TestReport.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("TestReport","http://hl7.org/fhir/StructureDefinition/TestReport", IsResource=true)]
+  [FhirType("TestReport","http://hl7.org/fhir/StructureDefinition/TestReport")]
   public partial class TestReport : Hl7.Fhir.Model.DomainResource, IIdentifiable<Identifier>
   {
     /// <summary>
@@ -200,7 +200,7 @@ public enum TestReportActionResult
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("TestReport#Participant", IsNestedType=true)]
+    [FhirType("TestReport#Participant")]
     [BackboneType("TestReport.participant")]
     public partial class ParticipantComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -397,6 +397,25 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "type":
+            TypeElement = (Code<Hl7.Fhir.Model.TestReport.TestReportParticipantType>)value;
+            return this;
+          case "uri":
+            UriElement = (Hl7.Fhir.Model.FhirUri)value;
+            return this;
+          case "display":
+            DisplayElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -412,7 +431,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("TestReport#Setup", IsNestedType=true)]
+    [FhirType("TestReport#Setup")]
     [BackboneType("TestReport.setup")]
     public partial class SetupComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -510,6 +529,19 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "action":
+            Action = (List<Hl7.Fhir.Model.TestReport.SetupActionComponent>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -527,7 +559,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestReport#SetupAction", IsNestedType=true)]
+    [FhirType("TestReport#SetupAction")]
     [BackboneType("TestReport.setup.action")]
     public partial class SetupActionComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -645,6 +677,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "operation":
+            Operation = (Hl7.Fhir.Model.TestReport.OperationComponent)value;
+            return this;
+          case "assert":
+            Assert = (Hl7.Fhir.Model.TestReport.AssertComponent)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -662,7 +710,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestReport#Operation", IsNestedType=true)]
+    [FhirType("TestReport#Operation")]
     [BackboneType("TestReport.setup.action.operation")]
     public partial class OperationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -858,6 +906,25 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "result":
+            ResultElement = (Code<Hl7.Fhir.Model.TestReport.TestReportActionResult>)value;
+            return this;
+          case "message":
+            MessageElement = (Hl7.Fhir.Model.Markdown)value;
+            return this;
+          case "detail":
+            DetailElement = (Hl7.Fhir.Model.FhirUri)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -876,7 +943,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestReport#Assert", IsNestedType=true)]
+    [FhirType("TestReport#Assert")]
     [BackboneType("TestReport.setup.action.assert")]
     public partial class AssertComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1094,6 +1161,28 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "result":
+            ResultElement = (Code<Hl7.Fhir.Model.TestReport.TestReportActionResult>)value;
+            return this;
+          case "message":
+            MessageElement = (Hl7.Fhir.Model.Markdown)value;
+            return this;
+          case "detail":
+            DetailElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "requirement":
+            Requirement = (List<Hl7.Fhir.Model.TestReport.RequirementComponent>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1114,7 +1203,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestReport#Requirement", IsNestedType=true)]
+    [FhirType("TestReport#Requirement")]
     [BackboneType("TestReport.setup.action.assert.requirement")]
     public partial class RequirementComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1213,6 +1302,19 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "link":
+            Link = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1226,7 +1328,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("TestReport#Test", IsNestedType=true)]
+    [FhirType("TestReport#Test")]
     [BackboneType("TestReport.test")]
     public partial class TestComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1402,6 +1504,25 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "name":
+            NameElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "description":
+            DescriptionElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "action":
+            Action = (List<Hl7.Fhir.Model.TestReport.TestActionComponent>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1421,7 +1542,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestReport#TestAction", IsNestedType=true)]
+    [FhirType("TestReport#TestAction")]
     [BackboneType("TestReport.test.action")]
     public partial class TestActionComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1539,6 +1660,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "operation":
+            Operation = (Hl7.Fhir.Model.TestReport.OperationComponent)value;
+            return this;
+          case "assert":
+            Assert = (Hl7.Fhir.Model.TestReport.AssertComponent)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1556,7 +1693,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestReport#Teardown", IsNestedType=true)]
+    [FhirType("TestReport#Teardown")]
     [BackboneType("TestReport.teardown")]
     public partial class TeardownComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1654,6 +1791,19 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "action":
+            Action = (List<Hl7.Fhir.Model.TestReport.TeardownActionComponent>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1671,7 +1821,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestReport#TeardownAction", IsNestedType=true)]
+    [FhirType("TestReport#TeardownAction")]
     [BackboneType("TestReport.teardown.action")]
     public partial class TeardownActionComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1769,6 +1919,19 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "operation":
+            Operation = (Hl7.Fhir.Model.TestReport.OperationComponent)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -2233,6 +2396,52 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "identifier":
+          Identifier = (Hl7.Fhir.Model.Identifier)value;
+          return this;
+        case "name":
+          NameElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "status":
+          StatusElement = (Code<Hl7.Fhir.Model.TestReport.TestReportStatus>)value;
+          return this;
+        case "testScript":
+          TestScriptElement = (Hl7.Fhir.Model.Canonical)value;
+          return this;
+        case "result":
+          ResultElement = (Code<Hl7.Fhir.Model.TestReport.TestReportResult>)value;
+          return this;
+        case "score":
+          ScoreElement = (Hl7.Fhir.Model.FhirDecimal)value;
+          return this;
+        case "tester":
+          TesterElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "issued":
+          IssuedElement = (Hl7.Fhir.Model.FhirDateTime)value;
+          return this;
+        case "participant":
+          Participant = (List<Hl7.Fhir.Model.TestReport.ParticipantComponent>)value;
+          return this;
+        case "setup":
+          Setup = (Hl7.Fhir.Model.TestReport.SetupComponent)value;
+          return this;
+        case "test":
+          Test = (List<Hl7.Fhir.Model.TestReport.TestComponent>)value;
+          return this;
+        case "teardown":
+          Teardown = (Hl7.Fhir.Model.TestReport.TeardownComponent)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/TestScript.cs b/src/Hl7.Fhir.R5/Model/Generated/TestScript.cs
index 57eb3ac89c..ffd79f215d 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/TestScript.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/TestScript.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("TestScript","http://hl7.org/fhir/StructureDefinition/TestScript", IsResource=true)]
+  [FhirType("TestScript","http://hl7.org/fhir/StructureDefinition/TestScript")]
   public partial class TestScript : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -532,7 +532,7 @@ public enum AssertionResponseTypes
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#Origin", IsNestedType=true)]
+    [FhirType("TestScript#Origin")]
     [BackboneType("TestScript.origin")]
     public partial class OriginComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -710,6 +710,25 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "index":
+            IndexElement = (Hl7.Fhir.Model.Integer)value;
+            return this;
+          case "profile":
+            Profile = (Hl7.Fhir.Model.Coding)value;
+            return this;
+          case "url":
+            UrlElement = (Hl7.Fhir.Model.FhirUrl)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -729,7 +748,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#Destination", IsNestedType=true)]
+    [FhirType("TestScript#Destination")]
     [BackboneType("TestScript.destination")]
     public partial class DestinationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -907,6 +926,25 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "index":
+            IndexElement = (Hl7.Fhir.Model.Integer)value;
+            return this;
+          case "profile":
+            Profile = (Hl7.Fhir.Model.Coding)value;
+            return this;
+          case "url":
+            UrlElement = (Hl7.Fhir.Model.FhirUrl)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -925,7 +963,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#Metadata", IsNestedType=true)]
+    [FhirType("TestScript#Metadata")]
     [BackboneType("TestScript.metadata")]
     public partial class MetadataComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1045,6 +1083,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "link":
+            Link = (List<Hl7.Fhir.Model.TestScript.LinkComponent>)value;
+            return this;
+          case "capability":
+            Capability = (List<Hl7.Fhir.Model.TestScript.CapabilityComponent>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1062,7 +1116,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#Link", IsNestedType=true)]
+    [FhirType("TestScript#Link")]
     [BackboneType("TestScript.metadata.link")]
     public partial class LinkComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1217,6 +1271,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "url":
+            UrlElement = (Hl7.Fhir.Model.FhirUri)value;
+            return this;
+          case "description":
+            DescriptionElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1235,7 +1305,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#Capability", IsNestedType=true)]
+    [FhirType("TestScript#Capability")]
     [BackboneType("TestScript.metadata.capability")]
     public partial class CapabilityComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1589,6 +1659,37 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "required":
+            RequiredElement = (Hl7.Fhir.Model.FhirBoolean)value;
+            return this;
+          case "validated":
+            ValidatedElement = (Hl7.Fhir.Model.FhirBoolean)value;
+            return this;
+          case "description":
+            DescriptionElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "origin":
+            OriginElement = (List<Hl7.Fhir.Model.Integer>)value;
+            return this;
+          case "destination":
+            DestinationElement = (Hl7.Fhir.Model.Integer)value;
+            return this;
+          case "link":
+            LinkElement = (List<Hl7.Fhir.Model.FhirUri>)value;
+            return this;
+          case "capabilities":
+            CapabilitiesElement = (Hl7.Fhir.Model.Canonical)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1611,7 +1712,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#Scope", IsNestedType=true)]
+    [FhirType("TestScript#Scope")]
     [BackboneType("TestScript.scope")]
     public partial class ScopeComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1771,6 +1872,25 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "artifact":
+            ArtifactElement = (Hl7.Fhir.Model.Canonical)value;
+            return this;
+          case "conformance":
+            Conformance = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "phase":
+            Phase = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1789,7 +1909,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#Fixture", IsNestedType=true)]
+    [FhirType("TestScript#Fixture")]
     [BackboneType("TestScript.fixture")]
     public partial class FixtureComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1968,6 +2088,25 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "autocreate":
+            AutocreateElement = (Hl7.Fhir.Model.FhirBoolean)value;
+            return this;
+          case "autodelete":
+            AutodeleteElement = (Hl7.Fhir.Model.FhirBoolean)value;
+            return this;
+          case "resource":
+            Resource = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1987,7 +2126,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#Variable", IsNestedType=true)]
+    [FhirType("TestScript#Variable")]
     [BackboneType("TestScript.variable")]
     public partial class VariableComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2376,6 +2515,40 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "name":
+            NameElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "defaultValue":
+            DefaultValueElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "description":
+            DescriptionElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "expression":
+            ExpressionElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "headerField":
+            HeaderFieldElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "hint":
+            HintElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "path":
+            PathElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "sourceId":
+            SourceIdElement = (Hl7.Fhir.Model.Id)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -2396,7 +2569,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#Setup", IsNestedType=true)]
+    [FhirType("TestScript#Setup")]
     [BackboneType("TestScript.setup")]
     public partial class SetupComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2494,6 +2667,19 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "action":
+            Action = (List<Hl7.Fhir.Model.TestScript.SetupActionComponent>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -2511,7 +2697,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#SetupAction", IsNestedType=true)]
+    [FhirType("TestScript#SetupAction")]
     [BackboneType("TestScript.setup.action")]
     public partial class SetupActionComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2629,6 +2815,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "operation":
+            Operation = (Hl7.Fhir.Model.TestScript.OperationComponent)value;
+            return this;
+          case "assert":
+            Assert = (Hl7.Fhir.Model.TestScript.AssertComponent)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -2646,7 +2848,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#Operation", IsNestedType=true)]
+    [FhirType("TestScript#Operation")]
     [BackboneType("TestScript.setup.action.operation")]
     public partial class OperationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -3357,6 +3559,67 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "type":
+            Type = (Hl7.Fhir.Model.Coding)value;
+            return this;
+          case "resource":
+            ResourceElement = (Hl7.Fhir.Model.FhirUri)value;
+            return this;
+          case "label":
+            LabelElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "description":
+            DescriptionElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "accept":
+            AcceptElement = (Hl7.Fhir.Model.Code)value;
+            return this;
+          case "contentType":
+            ContentTypeElement = (Hl7.Fhir.Model.Code)value;
+            return this;
+          case "destination":
+            DestinationElement = (Hl7.Fhir.Model.Integer)value;
+            return this;
+          case "encodeRequestUrl":
+            EncodeRequestUrlElement = (Hl7.Fhir.Model.FhirBoolean)value;
+            return this;
+          case "method":
+            MethodElement = (Code<Hl7.Fhir.Model.TestScript.TestScriptRequestMethodCode>)value;
+            return this;
+          case "origin":
+            OriginElement = (Hl7.Fhir.Model.Integer)value;
+            return this;
+          case "params":
+            ParamsElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "requestHeader":
+            RequestHeader = (List<Hl7.Fhir.Model.TestScript.RequestHeaderComponent>)value;
+            return this;
+          case "requestId":
+            RequestIdElement = (Hl7.Fhir.Model.Id)value;
+            return this;
+          case "responseId":
+            ResponseIdElement = (Hl7.Fhir.Model.Id)value;
+            return this;
+          case "sourceId":
+            SourceIdElement = (Hl7.Fhir.Model.Id)value;
+            return this;
+          case "targetId":
+            TargetIdElement = (Hl7.Fhir.Model.Id)value;
+            return this;
+          case "url":
+            UrlElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -3390,7 +3653,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#RequestHeader", IsNestedType=true)]
+    [FhirType("TestScript#RequestHeader")]
     [BackboneType("TestScript.setup.action.operation.requestHeader")]
     public partial class RequestHeaderComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -3546,6 +3809,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "field":
+            FieldElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "value":
+            ValueElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -3564,7 +3843,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#Assert", IsNestedType=true)]
+    [FhirType("TestScript#Assert")]
     [BackboneType("TestScript.setup.action.assert")]
     public partial class AssertComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -4612,6 +4891,91 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "label":
+            LabelElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "description":
+            DescriptionElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "direction":
+            DirectionElement = (Code<Hl7.Fhir.Model.TestScript.AssertionDirectionType>)value;
+            return this;
+          case "compareToSourceId":
+            CompareToSourceIdElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "compareToSourceExpression":
+            CompareToSourceExpressionElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "compareToSourcePath":
+            CompareToSourcePathElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "contentType":
+            ContentTypeElement = (Hl7.Fhir.Model.Code)value;
+            return this;
+          case "defaultManualCompletion":
+            DefaultManualCompletionElement = (Code<Hl7.Fhir.Model.TestScript.AssertionManualCompletionType>)value;
+            return this;
+          case "expression":
+            ExpressionElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "headerField":
+            HeaderFieldElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "minimumId":
+            MinimumIdElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "navigationLinks":
+            NavigationLinksElement = (Hl7.Fhir.Model.FhirBoolean)value;
+            return this;
+          case "operator":
+            OperatorElement = (Code<Hl7.Fhir.Model.TestScript.AssertionOperatorType>)value;
+            return this;
+          case "path":
+            PathElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "requestMethod":
+            RequestMethodElement = (Code<Hl7.Fhir.Model.TestScript.TestScriptRequestMethodCode>)value;
+            return this;
+          case "requestURL":
+            RequestURLElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "resource":
+            ResourceElement = (Hl7.Fhir.Model.FhirUri)value;
+            return this;
+          case "response":
+            ResponseElement = (Code<Hl7.Fhir.Model.TestScript.AssertionResponseTypes>)value;
+            return this;
+          case "responseCode":
+            ResponseCodeElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "sourceId":
+            SourceIdElement = (Hl7.Fhir.Model.Id)value;
+            return this;
+          case "stopTestOnFail":
+            StopTestOnFailElement = (Hl7.Fhir.Model.FhirBoolean)value;
+            return this;
+          case "validateProfileId":
+            ValidateProfileIdElement = (Hl7.Fhir.Model.Id)value;
+            return this;
+          case "value":
+            ValueElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "warningOnly":
+            WarningOnlyElement = (Hl7.Fhir.Model.FhirBoolean)value;
+            return this;
+          case "requirement":
+            Requirement = (List<Hl7.Fhir.Model.TestScript.RequirementComponent>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -4653,7 +5017,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#Requirement", IsNestedType=true)]
+    [FhirType("TestScript#Requirement")]
     [BackboneType("TestScript.setup.action.assert.requirement")]
     public partial class RequirementComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -4752,6 +5116,19 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "link":
+            Link = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -4765,7 +5142,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#Test", IsNestedType=true)]
+    [FhirType("TestScript#Test")]
     [BackboneType("TestScript.test")]
     public partial class TestComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -4941,6 +5318,25 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "name":
+            NameElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "description":
+            DescriptionElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "action":
+            Action = (List<Hl7.Fhir.Model.TestScript.TestActionComponent>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -4960,7 +5356,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#TestAction", IsNestedType=true)]
+    [FhirType("TestScript#TestAction")]
     [BackboneType("TestScript.test.action")]
     public partial class TestActionComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -5078,6 +5474,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "operation":
+            Operation = (Hl7.Fhir.Model.TestScript.OperationComponent)value;
+            return this;
+          case "assert":
+            Assert = (Hl7.Fhir.Model.TestScript.AssertComponent)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -5095,7 +5507,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#Teardown", IsNestedType=true)]
+    [FhirType("TestScript#Teardown")]
     [BackboneType("TestScript.teardown")]
     public partial class TeardownComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -5193,6 +5605,19 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "action":
+            Action = (List<Hl7.Fhir.Model.TestScript.TeardownActionComponent>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -5210,7 +5635,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#TeardownAction", IsNestedType=true)]
+    [FhirType("TestScript#TeardownAction")]
     [BackboneType("TestScript.teardown.action")]
     public partial class TeardownActionComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -5308,6 +5733,19 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "operation":
+            Operation = (Hl7.Fhir.Model.TestScript.OperationComponent)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -6204,6 +6642,97 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "url":
+          UrlElement = (Hl7.Fhir.Model.FhirUri)value;
+          return this;
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "version":
+          VersionElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "versionAlgorithm":
+          VersionAlgorithm = (Hl7.Fhir.Model.DataType)value;
+          return this;
+        case "name":
+          NameElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "title":
+          TitleElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "status":
+          StatusElement = (Code<Hl7.Fhir.Model.PublicationStatus>)value;
+          return this;
+        case "experimental":
+          ExperimentalElement = (Hl7.Fhir.Model.FhirBoolean)value;
+          return this;
+        case "date":
+          DateElement = (Hl7.Fhir.Model.FhirDateTime)value;
+          return this;
+        case "publisher":
+          PublisherElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "contact":
+          Contact = (List<Hl7.Fhir.Model.ContactDetail>)value;
+          return this;
+        case "description":
+          DescriptionElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        case "useContext":
+          UseContext = (List<Hl7.Fhir.Model.UsageContext>)value;
+          return this;
+        case "jurisdiction":
+          Jurisdiction = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "purpose":
+          PurposeElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        case "copyright":
+          CopyrightElement = (Hl7.Fhir.Model.Markdown)value;
+          return this;
+        case "copyrightLabel":
+          CopyrightLabelElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "origin":
+          Origin = (List<Hl7.Fhir.Model.TestScript.OriginComponent>)value;
+          return this;
+        case "destination":
+          Destination = (List<Hl7.Fhir.Model.TestScript.DestinationComponent>)value;
+          return this;
+        case "metadata":
+          Metadata = (Hl7.Fhir.Model.TestScript.MetadataComponent)value;
+          return this;
+        case "scope":
+          Scope = (List<Hl7.Fhir.Model.TestScript.ScopeComponent>)value;
+          return this;
+        case "fixture":
+          Fixture = (List<Hl7.Fhir.Model.TestScript.FixtureComponent>)value;
+          return this;
+        case "profile":
+          ProfileElement = (List<Hl7.Fhir.Model.Canonical>)value;
+          return this;
+        case "variable":
+          Variable = (List<Hl7.Fhir.Model.TestScript.VariableComponent>)value;
+          return this;
+        case "setup":
+          Setup = (Hl7.Fhir.Model.TestScript.SetupComponent)value;
+          return this;
+        case "test":
+          Test = (List<Hl7.Fhir.Model.TestScript.TestComponent>)value;
+          return this;
+        case "teardown":
+          Teardown = (Hl7.Fhir.Model.TestScript.TeardownComponent)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/Timing.cs b/src/Hl7.Fhir.R5/Model/Generated/Timing.cs
index 4f38ca0682..5502d7a6d2 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/Timing.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/Timing.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -293,7 +293,7 @@ public enum EventTiming
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Timing#Repeat", IsNestedType=true)]
+    [FhirType("Timing#Repeat")]
     [BackboneType("Timing.repeat")]
     public partial class RepeatComponent : Hl7.Fhir.Model.Element
     {
@@ -949,6 +949,61 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "bounds":
+            Bounds = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          case "count":
+            CountElement = (Hl7.Fhir.Model.PositiveInt)value;
+            return this;
+          case "countMax":
+            CountMaxElement = (Hl7.Fhir.Model.PositiveInt)value;
+            return this;
+          case "duration":
+            DurationElement = (Hl7.Fhir.Model.FhirDecimal)value;
+            return this;
+          case "durationMax":
+            DurationMaxElement = (Hl7.Fhir.Model.FhirDecimal)value;
+            return this;
+          case "durationUnit":
+            DurationUnitElement = (Code<Hl7.Fhir.Model.Timing.UnitsOfTime>)value;
+            return this;
+          case "frequency":
+            FrequencyElement = (Hl7.Fhir.Model.PositiveInt)value;
+            return this;
+          case "frequencyMax":
+            FrequencyMaxElement = (Hl7.Fhir.Model.PositiveInt)value;
+            return this;
+          case "period":
+            PeriodElement = (Hl7.Fhir.Model.FhirDecimal)value;
+            return this;
+          case "periodMax":
+            PeriodMaxElement = (Hl7.Fhir.Model.FhirDecimal)value;
+            return this;
+          case "periodUnit":
+            PeriodUnitElement = (Code<Hl7.Fhir.Model.Timing.UnitsOfTime>)value;
+            return this;
+          case "dayOfWeek":
+            DayOfWeekElement = (List<Code<Hl7.Fhir.Model.DaysOfWeek>>)value;
+            return this;
+          case "timeOfDay":
+            TimeOfDayElement = (List<Hl7.Fhir.Model.Time>)value;
+            return this;
+          case "when":
+            WhenElement = (List<Code<Hl7.Fhir.Model.Timing.EventTiming>>)value;
+            return this;
+          case "offset":
+            OffsetElement = (Hl7.Fhir.Model.UnsignedInt)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1121,6 +1176,25 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "event":
+          EventElement = (List<Hl7.Fhir.Model.FhirDateTime>)value;
+          return this;
+        case "repeat":
+          Repeat = (Hl7.Fhir.Model.Timing.RepeatComponent)value;
+          return this;
+        case "code":
+          Code = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/Transport.cs b/src/Hl7.Fhir.R5/Model/Generated/Transport.cs
index f59f4ad788..f4aef6aa8e 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/Transport.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/Transport.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Transport","http://hl7.org/fhir/StructureDefinition/Transport", IsResource=true)]
+  [FhirType("Transport","http://hl7.org/fhir/StructureDefinition/Transport")]
   public partial class Transport : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -177,7 +177,7 @@ public enum TransportIntent
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Transport#Restriction", IsNestedType=true)]
+    [FhirType("Transport#Restriction")]
     [BackboneType("Transport.restriction")]
     public partial class RestrictionComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -337,6 +337,25 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "repetitions":
+            RepetitionsElement = (Hl7.Fhir.Model.PositiveInt)value;
+            return this;
+          case "period":
+            Period = (Hl7.Fhir.Model.Period)value;
+            return this;
+          case "recipient":
+            Recipient = (List<Hl7.Fhir.Model.ResourceReference>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -355,7 +374,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Transport#Parameter", IsNestedType=true)]
+    [FhirType("Transport#Parameter")]
     [BackboneType("Transport.input")]
     public partial class ParameterComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -478,6 +497,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "type":
+            Type = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "value":
+            Value = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -495,7 +530,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Transport#Output", IsNestedType=true)]
+    [FhirType("Transport#Output")]
     [BackboneType("Transport.output")]
     public partial class OutputComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -618,6 +653,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "type":
+            Type = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "value":
+            Value = (Hl7.Fhir.Model.DataType)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1578,6 +1629,112 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "instantiatesCanonical":
+          InstantiatesCanonicalElement = (Hl7.Fhir.Model.Canonical)value;
+          return this;
+        case "instantiatesUri":
+          InstantiatesUriElement = (Hl7.Fhir.Model.FhirUri)value;
+          return this;
+        case "basedOn":
+          BasedOn = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "groupIdentifier":
+          GroupIdentifier = (Hl7.Fhir.Model.Identifier)value;
+          return this;
+        case "partOf":
+          PartOf = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "status":
+          StatusElement = (Code<Hl7.Fhir.Model.Transport.TransportStatus>)value;
+          return this;
+        case "statusReason":
+          StatusReason = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "intent":
+          IntentElement = (Code<Hl7.Fhir.Model.Transport.TransportIntent>)value;
+          return this;
+        case "priority":
+          PriorityElement = (Code<Hl7.Fhir.Model.RequestPriority>)value;
+          return this;
+        case "code":
+          Code = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "description":
+          DescriptionElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "focus":
+          Focus = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "for":
+          For = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "encounter":
+          Encounter = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "completionTime":
+          CompletionTimeElement = (Hl7.Fhir.Model.FhirDateTime)value;
+          return this;
+        case "authoredOn":
+          AuthoredOnElement = (Hl7.Fhir.Model.FhirDateTime)value;
+          return this;
+        case "lastModified":
+          LastModifiedElement = (Hl7.Fhir.Model.FhirDateTime)value;
+          return this;
+        case "requester":
+          Requester = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "performerType":
+          PerformerType = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "owner":
+          Owner = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "location":
+          Location = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "insurance":
+          Insurance = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "note":
+          Note = (List<Hl7.Fhir.Model.Annotation>)value;
+          return this;
+        case "relevantHistory":
+          RelevantHistory = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "restriction":
+          Restriction = (Hl7.Fhir.Model.Transport.RestrictionComponent)value;
+          return this;
+        case "input":
+          Input = (List<Hl7.Fhir.Model.Transport.ParameterComponent>)value;
+          return this;
+        case "output":
+          Output = (List<Hl7.Fhir.Model.Transport.OutputComponent>)value;
+          return this;
+        case "requestedLocation":
+          RequestedLocation = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "currentLocation":
+          CurrentLocation = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "reason":
+          Reason = (Hl7.Fhir.Model.CodeableReference)value;
+          return this;
+        case "history":
+          History = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/TriggerDefinition.cs b/src/Hl7.Fhir.R5/Model/Generated/TriggerDefinition.cs
index 862fab8ce2..cf2b696f2e 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/TriggerDefinition.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/TriggerDefinition.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -393,6 +393,37 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "type":
+          TypeElement = (Code<Hl7.Fhir.Model.TriggerDefinition.TriggerType>)value;
+          return this;
+        case "name":
+          NameElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        case "code":
+          Code = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "subscriptionTopic":
+          SubscriptionTopicElement = (Hl7.Fhir.Model.Canonical)value;
+          return this;
+        case "timing":
+          Timing = (Hl7.Fhir.Model.DataType)value;
+          return this;
+        case "data":
+          Data = (List<Hl7.Fhir.Model.DataRequirement>)value;
+          return this;
+        case "condition":
+          Condition = (Hl7.Fhir.Model.Expression)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/VerificationResult.cs b/src/Hl7.Fhir.R5/Model/Generated/VerificationResult.cs
index aebb4d5d72..f9f0dff305 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/VerificationResult.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/VerificationResult.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model
   /// </summary>
   [Serializable]
   [DataContract]
-  [FhirType("VerificationResult","http://hl7.org/fhir/StructureDefinition/VerificationResult", IsResource=true)]
+  [FhirType("VerificationResult","http://hl7.org/fhir/StructureDefinition/VerificationResult")]
   public partial class VerificationResult : Hl7.Fhir.Model.DomainResource
   {
     /// <summary>
@@ -113,7 +113,7 @@ public enum StatusCode
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("VerificationResult#PrimarySource", IsNestedType=true)]
+    [FhirType("VerificationResult#PrimarySource")]
     [BackboneType("VerificationResult.primarySource")]
     public partial class PrimarySourceComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -364,6 +364,37 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "who":
+            Who = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          case "type":
+            Type = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+            return this;
+          case "communicationMethod":
+            CommunicationMethod = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+            return this;
+          case "validationStatus":
+            ValidationStatus = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "validationDate":
+            ValidationDateElement = (Hl7.Fhir.Model.FhirDateTime)value;
+            return this;
+          case "canPushUpdates":
+            CanPushUpdates = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "pushTypeAvailable":
+            PushTypeAvailable = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -383,7 +414,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("VerificationResult#Attestation", IsNestedType=true)]
+    [FhirType("VerificationResult#Attestation")]
     [BackboneType("VerificationResult.attestation")]
     public partial class AttestationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -686,6 +717,40 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "who":
+            Who = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          case "onBehalfOf":
+            OnBehalfOf = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          case "communicationMethod":
+            CommunicationMethod = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "date":
+            DateElement = (Hl7.Fhir.Model.Date)value;
+            return this;
+          case "sourceIdentityCertificate":
+            SourceIdentityCertificateElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "proxyIdentityCertificate":
+            ProxyIdentityCertificateElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "proxySignature":
+            ProxySignature = (Hl7.Fhir.Model.Signature)value;
+            return this;
+          case "sourceSignature":
+            SourceSignature = (Hl7.Fhir.Model.Signature)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -706,7 +771,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("VerificationResult#Validator", IsNestedType=true)]
+    [FhirType("VerificationResult#Validator")]
     [BackboneType("VerificationResult.validator")]
     public partial class ValidatorComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -866,6 +931,25 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "organization":
+            Organization = (Hl7.Fhir.Model.ResourceReference)value;
+            return this;
+          case "identityCertificate":
+            IdentityCertificateElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "attestationSignature":
+            AttestationSignature = (Hl7.Fhir.Model.Signature)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1341,6 +1425,58 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "target":
+          Target = (List<Hl7.Fhir.Model.ResourceReference>)value;
+          return this;
+        case "targetLocation":
+          TargetLocationElement = (List<Hl7.Fhir.Model.FhirString>)value;
+          return this;
+        case "need":
+          Need = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "status":
+          StatusElement = (Code<Hl7.Fhir.Model.VerificationResult.StatusCode>)value;
+          return this;
+        case "statusDate":
+          StatusDateElement = (Hl7.Fhir.Model.FhirDateTime)value;
+          return this;
+        case "validationType":
+          ValidationType = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "validationProcess":
+          ValidationProcess = (List<Hl7.Fhir.Model.CodeableConcept>)value;
+          return this;
+        case "frequency":
+          Frequency = (Hl7.Fhir.Model.Timing)value;
+          return this;
+        case "lastPerformed":
+          LastPerformedElement = (Hl7.Fhir.Model.FhirDateTime)value;
+          return this;
+        case "nextScheduled":
+          NextScheduledElement = (Hl7.Fhir.Model.Date)value;
+          return this;
+        case "failureAction":
+          FailureAction = (Hl7.Fhir.Model.CodeableConcept)value;
+          return this;
+        case "primarySource":
+          PrimarySource = (List<Hl7.Fhir.Model.VerificationResult.PrimarySourceComponent>)value;
+          return this;
+        case "attestation":
+          Attestation = (Hl7.Fhir.Model.VerificationResult.AttestationComponent)value;
+          return this;
+        case "validator":
+          Validator = (List<Hl7.Fhir.Model.VerificationResult.ValidatorComponent>)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/VirtualServiceDetail.cs b/src/Hl7.Fhir.R5/Model/Generated/VirtualServiceDetail.cs
index 341f9f79a6..5debd6acc2 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/VirtualServiceDetail.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/VirtualServiceDetail.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -286,6 +286,31 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "channelType":
+          ChannelType = (Hl7.Fhir.Model.Coding)value;
+          return this;
+        case "address":
+          Address = (Hl7.Fhir.Model.DataType)value;
+          return this;
+        case "additionalInfo":
+          AdditionalInfoElement = (List<Hl7.Fhir.Model.FhirUrl>)value;
+          return this;
+        case "maxParticipants":
+          MaxParticipantsElement = (Hl7.Fhir.Model.PositiveInt)value;
+          return this;
+        case "sessionKey":
+          SessionKeyElement = (Hl7.Fhir.Model.FhirString)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/VisionPrescription.cs b/src/Hl7.Fhir.R5/Model/Generated/VisionPrescription.cs
index f8aa7de79c..317b6339fe 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/VisionPrescription.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/VisionPrescription.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 using System;
 using System.Collections.Generic;
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("VisionPrescription","http://hl7.org/fhir/StructureDefinition/VisionPrescription", IsResource=true)]
+  [FhirType("VisionPrescription","http://hl7.org/fhir/StructureDefinition/VisionPrescription")]
   public partial class VisionPrescription : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -123,7 +123,7 @@ public enum VisionBase
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("VisionPrescription#LensSpecification", IsNestedType=true)]
+    [FhirType("VisionPrescription#LensSpecification")]
     [BackboneType("VisionPrescription.lensSpecification")]
     public partial class LensSpecificationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -680,6 +680,58 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "product":
+            Product = (Hl7.Fhir.Model.CodeableConcept)value;
+            return this;
+          case "eye":
+            EyeElement = (Code<Hl7.Fhir.Model.VisionPrescription.VisionEyes>)value;
+            return this;
+          case "sphere":
+            SphereElement = (Hl7.Fhir.Model.FhirDecimal)value;
+            return this;
+          case "cylinder":
+            CylinderElement = (Hl7.Fhir.Model.FhirDecimal)value;
+            return this;
+          case "axis":
+            AxisElement = (Hl7.Fhir.Model.Integer)value;
+            return this;
+          case "prism":
+            Prism = (List<Hl7.Fhir.Model.VisionPrescription.PrismComponent>)value;
+            return this;
+          case "add":
+            AddElement = (Hl7.Fhir.Model.FhirDecimal)value;
+            return this;
+          case "power":
+            PowerElement = (Hl7.Fhir.Model.FhirDecimal)value;
+            return this;
+          case "backCurve":
+            BackCurveElement = (Hl7.Fhir.Model.FhirDecimal)value;
+            return this;
+          case "diameter":
+            DiameterElement = (Hl7.Fhir.Model.FhirDecimal)value;
+            return this;
+          case "duration":
+            Duration = (Hl7.Fhir.Model.Quantity)value;
+            return this;
+          case "color":
+            ColorElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "brand":
+            BrandElement = (Hl7.Fhir.Model.FhirString)value;
+            return this;
+          case "note":
+            Note = (List<Hl7.Fhir.Model.Annotation>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -709,7 +761,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("VisionPrescription#Prism", IsNestedType=true)]
+    [FhirType("VisionPrescription#Prism")]
     [BackboneType("VisionPrescription.lensSpecification.prism")]
     public partial class PrismComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -867,6 +919,22 @@ protected override bool TryGetValue(string key, out object value)
 
       }
 
+      protected override Base SetValue(string key, object value)
+      {
+        switch (key)
+        {
+          case "amount":
+            AmountElement = (Hl7.Fhir.Model.FhirDecimal)value;
+            return this;
+          case "base":
+            BaseElement = (Code<Hl7.Fhir.Model.VisionPrescription.VisionBase>)value;
+            return this;
+          default:
+            return base.SetValue(key, value);
+        }
+
+      }
+
       protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
       {
         foreach (var kvp in base.GetElementPairs()) yield return kvp;
@@ -1182,6 +1250,40 @@ protected override bool TryGetValue(string key, out object value)
 
     }
 
+    protected override Base SetValue(string key, object value)
+    {
+      switch (key)
+      {
+        case "identifier":
+          Identifier = (List<Hl7.Fhir.Model.Identifier>)value;
+          return this;
+        case "status":
+          StatusElement = (Code<Hl7.Fhir.Model.FinancialResourceStatusCodes>)value;
+          return this;
+        case "created":
+          CreatedElement = (Hl7.Fhir.Model.FhirDateTime)value;
+          return this;
+        case "patient":
+          Patient = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "encounter":
+          Encounter = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "dateWritten":
+          DateWrittenElement = (Hl7.Fhir.Model.FhirDateTime)value;
+          return this;
+        case "prescriber":
+          Prescriber = (Hl7.Fhir.Model.ResourceReference)value;
+          return this;
+        case "lensSpecification":
+          LensSpecification = (List<Hl7.Fhir.Model.VisionPrescription.LensSpecificationComponent>)value;
+          return this;
+        default:
+          return base.SetValue(key, value);
+      }
+
+    }
+
     protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     {
       foreach (var kvp in base.GetElementPairs()) yield return kvp;
diff --git a/src/Hl7.Fhir.R5/Model/Generated/_GeneratorLog.cs b/src/Hl7.Fhir.R5/Model/Generated/_GeneratorLog.cs
index 2db4829611..d9e52ff9b0 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/_GeneratorLog.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/_GeneratorLog.cs
@@ -1,5 +1,5 @@
 // <auto-generated/>
-// Contents of: hl7.fhir.r5.expansions#5.0.0, hl7.fhir.r5.core#5.0.0
+// Contents of: hl7.fhir.r5.expansions@5.0.0, hl7.fhir.r5.core@5.0.0
 
 // Generated Shared Enumeration: ActionCardinalityBehavior (http://hl7.org/fhir/ValueSet/action-cardinality-behavior)
   // Used in model class (resource): PlanDefinition.action.cardinalityBehavior
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Account.cs b/src/Hl7.Fhir.STU3/Model/Generated/Account.cs
index 6db3e1a1d4..5a6d93a53e 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/Account.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/Account.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Account","http://hl7.org/fhir/StructureDefinition/Account", IsResource=true)]
+  [FhirType("Account","http://hl7.org/fhir/StructureDefinition/Account")]
   public partial class Account : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -97,7 +97,7 @@ public enum AccountStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Account#Coverage", IsNestedType=true)]
+    [FhirType("Account#Coverage")]
     [BackboneType("Account.coverage")]
     public partial class CoverageComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -269,7 +269,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Account#Guarantor", IsNestedType=true)]
+    [FhirType("Account#Guarantor")]
     [BackboneType("Account.guarantor")]
     public partial class GuarantorComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/ActivityDefinition.cs b/src/Hl7.Fhir.STU3/Model/Generated/ActivityDefinition.cs
index ecd573e58b..8f04f50563 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/ActivityDefinition.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/ActivityDefinition.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("ActivityDefinition","http://hl7.org/fhir/StructureDefinition/ActivityDefinition", IsResource=true)]
+  [FhirType("ActivityDefinition","http://hl7.org/fhir/StructureDefinition/ActivityDefinition")]
   public partial class ActivityDefinition : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -67,7 +67,7 @@ public partial class ActivityDefinition : Hl7.Fhir.Model.DomainResource, IIdenti
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ActivityDefinition#Participant", IsNestedType=true)]
+    [FhirType("ActivityDefinition#Participant")]
     [BackboneType("ActivityDefinition.participant")]
     public partial class ParticipantComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -240,7 +240,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ActivityDefinition#DynamicValue", IsNestedType=true)]
+    [FhirType("ActivityDefinition#DynamicValue")]
     [BackboneType("ActivityDefinition.dynamicValue")]
     public partial class DynamicValueComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/AdverseEvent.cs b/src/Hl7.Fhir.STU3/Model/Generated/AdverseEvent.cs
index eb8506c65f..bfade3e6e7 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/AdverseEvent.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/AdverseEvent.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("AdverseEvent","http://hl7.org/fhir/StructureDefinition/AdverseEvent", IsResource=true)]
+  [FhirType("AdverseEvent","http://hl7.org/fhir/StructureDefinition/AdverseEvent")]
   public partial class AdverseEvent : Hl7.Fhir.Model.DomainResource, IIdentifiable<Identifier>
   {
     /// <summary>
@@ -157,7 +157,7 @@ public enum AdverseEventCausality
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("AdverseEvent#SuspectEntity", IsNestedType=true)]
+    [FhirType("AdverseEvent#SuspectEntity")]
     [BackboneType("AdverseEvent.suspectEntity")]
     public partial class SuspectEntityComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/AllergyIntolerance.cs b/src/Hl7.Fhir.STU3/Model/Generated/AllergyIntolerance.cs
index ef33cd5725..38ac7e8081 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/AllergyIntolerance.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/AllergyIntolerance.cs
@@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("AllergyIntolerance","http://hl7.org/fhir/StructureDefinition/AllergyIntolerance", IsResource=true)]
+  [FhirType("AllergyIntolerance","http://hl7.org/fhir/StructureDefinition/AllergyIntolerance")]
   public partial class AllergyIntolerance : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -242,7 +242,7 @@ public enum AllergyIntoleranceSeverity
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("AllergyIntolerance#Reaction", IsNestedType=true)]
+    [FhirType("AllergyIntolerance#Reaction")]
     [BackboneType("AllergyIntolerance.reaction")]
     public partial class ReactionComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Appointment.cs b/src/Hl7.Fhir.STU3/Model/Generated/Appointment.cs
index 690d1daed2..c40a7c0425 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/Appointment.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/Appointment.cs
@@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model
   /// </summary>
   [Serializable]
   [DataContract]
-  [FhirType("Appointment","http://hl7.org/fhir/StructureDefinition/Appointment", IsResource=true)]
+  [FhirType("Appointment","http://hl7.org/fhir/StructureDefinition/Appointment")]
   public partial class Appointment : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -150,7 +150,7 @@ public enum ParticipantRequired
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Appointment#Participant", IsNestedType=true)]
+    [FhirType("Appointment#Participant")]
     [BackboneType("Appointment.participant")]
     public partial class ParticipantComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/AppointmentResponse.cs b/src/Hl7.Fhir.STU3/Model/Generated/AppointmentResponse.cs
index 64e4977b0d..e3b2043074 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/AppointmentResponse.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/AppointmentResponse.cs
@@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model
   /// </summary>
   [Serializable]
   [DataContract]
-  [FhirType("AppointmentResponse","http://hl7.org/fhir/StructureDefinition/AppointmentResponse", IsResource=true)]
+  [FhirType("AppointmentResponse","http://hl7.org/fhir/StructureDefinition/AppointmentResponse")]
   public partial class AppointmentResponse : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/AuditEvent.cs b/src/Hl7.Fhir.STU3/Model/Generated/AuditEvent.cs
index dca68dc889..f7693aa891 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/AuditEvent.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/AuditEvent.cs
@@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("AuditEvent","http://hl7.org/fhir/StructureDefinition/AuditEvent", IsResource=true)]
+  [FhirType("AuditEvent","http://hl7.org/fhir/StructureDefinition/AuditEvent")]
   public partial class AuditEvent : Hl7.Fhir.Model.DomainResource
   {
     /// <summary>
@@ -184,7 +184,7 @@ public enum AuditEventAgentNetworkType
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("AuditEvent#Agent", IsNestedType=true)]
+    [FhirType("AuditEvent#Agent")]
     [BackboneType("AuditEvent.agent")]
     public partial class AgentComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -643,7 +643,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("AuditEvent#Network", IsNestedType=true)]
+    [FhirType("AuditEvent#Network")]
     [BackboneType("AuditEvent.agent.network")]
     public partial class NetworkComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -833,7 +833,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("AuditEvent#Source", IsNestedType=true)]
+    [FhirType("AuditEvent#Source")]
     [BackboneType("AuditEvent.source")]
     public partial class SourceComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1031,7 +1031,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("AuditEvent#Entity", IsNestedType=true)]
+    [FhirType("AuditEvent#Entity")]
     [BackboneType("AuditEvent.entity")]
     public partial class EntityComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1444,7 +1444,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("AuditEvent#Detail", IsNestedType=true)]
+    [FhirType("AuditEvent#Detail")]
     [BackboneType("AuditEvent.entity.detail")]
     public partial class DetailComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Basic.cs b/src/Hl7.Fhir.STU3/Model/Generated/Basic.cs
index 285957a1e4..5db6a2a893 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/Basic.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/Basic.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Basic","http://hl7.org/fhir/StructureDefinition/Basic", IsResource=true)]
+  [FhirType("Basic","http://hl7.org/fhir/StructureDefinition/Basic")]
   public partial class Basic : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/BodySite.cs b/src/Hl7.Fhir.STU3/Model/Generated/BodySite.cs
index 2d71d938e4..2ed5c5c683 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/BodySite.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/BodySite.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("BodySite","http://hl7.org/fhir/StructureDefinition/BodySite", IsResource=true)]
+  [FhirType("BodySite","http://hl7.org/fhir/StructureDefinition/BodySite")]
   public partial class BodySite : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/CapabilityStatement.cs b/src/Hl7.Fhir.STU3/Model/Generated/CapabilityStatement.cs
index 3210f0c30e..19d4df229b 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/CapabilityStatement.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/CapabilityStatement.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("CapabilityStatement","http://hl7.org/fhir/StructureDefinition/CapabilityStatement", IsResource=true)]
+  [FhirType("CapabilityStatement","http://hl7.org/fhir/StructureDefinition/CapabilityStatement")]
   public partial class CapabilityStatement : Hl7.Fhir.Model.DomainResource
   {
     /// <summary>
@@ -423,7 +423,7 @@ public enum DocumentMode
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CapabilityStatement#Software", IsNestedType=true)]
+    [FhirType("CapabilityStatement#Software")]
     [BackboneType("CapabilityStatement.software")]
     public partial class SoftwareComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -654,7 +654,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CapabilityStatement#Implementation", IsNestedType=true)]
+    [FhirType("CapabilityStatement#Implementation")]
     [BackboneType("CapabilityStatement.implementation")]
     public partial class ImplementationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -845,7 +845,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CapabilityStatement#Rest", IsNestedType=true)]
+    [FhirType("CapabilityStatement#Rest")]
     [BackboneType("CapabilityStatement.rest")]
     public partial class RestComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1208,7 +1208,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CapabilityStatement#Security", IsNestedType=true)]
+    [FhirType("CapabilityStatement#Security")]
     [BackboneType("CapabilityStatement.rest.security")]
     public partial class SecurityComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1445,7 +1445,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("CapabilityStatement#Certificate", IsNestedType=true)]
+    [FhirType("CapabilityStatement#Certificate")]
     [BackboneType("CapabilityStatement.rest.security.certificate")]
     public partial class CertificateComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1634,7 +1634,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CapabilityStatement#Resource", IsNestedType=true)]
+    [FhirType("CapabilityStatement#Resource")]
     [BackboneType("CapabilityStatement.rest.resource")]
     public partial class ResourceComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2344,7 +2344,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CapabilityStatement#ResourceInteraction", IsNestedType=true)]
+    [FhirType("CapabilityStatement#ResourceInteraction")]
     [BackboneType("CapabilityStatement.rest.resource.interaction")]
     public partial class ResourceInteractionComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2534,7 +2534,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CapabilityStatement#SearchParam", IsNestedType=true)]
+    [FhirType("CapabilityStatement#SearchParam")]
     [BackboneType("CapabilityStatement.rest.resource.searchParam")]
     public partial class SearchParamComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2811,7 +2811,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CapabilityStatement#SystemInteraction", IsNestedType=true)]
+    [FhirType("CapabilityStatement#SystemInteraction")]
     [BackboneType("CapabilityStatement.rest.interaction")]
     public partial class SystemInteractionComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -3001,7 +3001,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CapabilityStatement#Operation", IsNestedType=true)]
+    [FhirType("CapabilityStatement#Operation")]
     [BackboneType("CapabilityStatement.rest.operation")]
     public partial class OperationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -3175,7 +3175,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CapabilityStatement#Messaging", IsNestedType=true)]
+    [FhirType("CapabilityStatement#Messaging")]
     [BackboneType("CapabilityStatement.messaging")]
     public partial class MessagingComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -3440,7 +3440,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CapabilityStatement#Endpoint", IsNestedType=true)]
+    [FhirType("CapabilityStatement#Endpoint")]
     [BackboneType("CapabilityStatement.messaging.endpoint")]
     public partial class EndpointComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -3613,7 +3613,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CapabilityStatement#SupportedMessage", IsNestedType=true)]
+    [FhirType("CapabilityStatement#SupportedMessage")]
     [BackboneType("CapabilityStatement.messaging.supportedMessage")]
     public partial class SupportedMessageComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -3789,7 +3789,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CapabilityStatement#Event", IsNestedType=true)]
+    [FhirType("CapabilityStatement#Event")]
     [BackboneType("CapabilityStatement.messaging.event")]
     public partial class EventComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -4153,7 +4153,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CapabilityStatement#Document", IsNestedType=true)]
+    [FhirType("CapabilityStatement#Document")]
     [BackboneType("CapabilityStatement.document")]
     public partial class DocumentComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/CarePlan.cs b/src/Hl7.Fhir.STU3/Model/Generated/CarePlan.cs
index 11fcf14ab5..dcee8bbb35 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/CarePlan.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/CarePlan.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("CarePlan","http://hl7.org/fhir/StructureDefinition/CarePlan", IsResource=true)]
+  [FhirType("CarePlan","http://hl7.org/fhir/StructureDefinition/CarePlan")]
   public partial class CarePlan : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -205,7 +205,7 @@ public enum CarePlanActivityStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CarePlan#Activity", IsNestedType=true)]
+    [FhirType("CarePlan#Activity")]
     [BackboneType("CarePlan.activity")]
     public partial class ActivityComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -439,7 +439,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CarePlan#Detail", IsNestedType=true)]
+    [FhirType("CarePlan#Detail")]
     [BackboneType("CarePlan.activity.detail")]
     public partial class DetailComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/CareTeam.cs b/src/Hl7.Fhir.STU3/Model/Generated/CareTeam.cs
index a645511e6c..b479cbaa2f 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/CareTeam.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/CareTeam.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("CareTeam","http://hl7.org/fhir/StructureDefinition/CareTeam", IsResource=true)]
+  [FhirType("CareTeam","http://hl7.org/fhir/StructureDefinition/CareTeam")]
   public partial class CareTeam : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -107,7 +107,7 @@ public enum CareTeamStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CareTeam#Participant", IsNestedType=true)]
+    [FhirType("CareTeam#Participant")]
     [BackboneType("CareTeam.participant")]
     public partial class ParticipantComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/ChargeItem.cs b/src/Hl7.Fhir.STU3/Model/Generated/ChargeItem.cs
index efa2fcea69..3a471c47a0 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/ChargeItem.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/ChargeItem.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("ChargeItem","http://hl7.org/fhir/StructureDefinition/ChargeItem", IsResource=true)]
+  [FhirType("ChargeItem","http://hl7.org/fhir/StructureDefinition/ChargeItem")]
   public partial class ChargeItem : Hl7.Fhir.Model.DomainResource, IIdentifiable<Identifier>
   {
     /// <summary>
@@ -119,7 +119,7 @@ public enum ChargeItemStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ChargeItem#Participant", IsNestedType=true)]
+    [FhirType("ChargeItem#Participant")]
     [BackboneType("ChargeItem.participant")]
     public partial class ParticipantComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Claim.cs b/src/Hl7.Fhir.STU3/Model/Generated/Claim.cs
index 846d6d49a5..0446e4dbe9 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/Claim.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/Claim.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Claim","http://hl7.org/fhir/StructureDefinition/Claim", IsResource=true)]
+  [FhirType("Claim","http://hl7.org/fhir/StructureDefinition/Claim")]
   public partial class Claim : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -101,7 +101,7 @@ public enum ClaimUseCode
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Claim#RelatedClaim", IsNestedType=true)]
+    [FhirType("Claim#RelatedClaim")]
     [BackboneType("Claim.related")]
     public partial class RelatedClaimComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -280,7 +280,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Claim#Payee", IsNestedType=true)]
+    [FhirType("Claim#Payee")]
     [BackboneType("Claim.payee")]
     public partial class PayeeComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -461,7 +461,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Claim#CareTeam", IsNestedType=true)]
+    [FhirType("Claim#CareTeam")]
     [BackboneType("Claim.careTeam")]
     public partial class CareTeamComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -729,7 +729,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Claim#SpecialCondition", IsNestedType=true)]
+    [FhirType("Claim#SpecialCondition")]
     [BackboneType("Claim.information")]
     public partial class SpecialConditionComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1008,7 +1008,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Claim#Diagnosis", IsNestedType=true)]
+    [FhirType("Claim#Diagnosis")]
     [BackboneType("Claim.diagnosis")]
     public partial class DiagnosisComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1236,7 +1236,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Claim#Procedure", IsNestedType=true)]
+    [FhirType("Claim#Procedure")]
     [BackboneType("Claim.procedure")]
     public partial class ProcedureComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1454,7 +1454,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Claim#Insurance", IsNestedType=true)]
+    [FhirType("Claim#Insurance")]
     [BackboneType("Claim.insurance")]
     public partial class InsuranceComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1785,7 +1785,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Claim#Accident", IsNestedType=true)]
+    [FhirType("Claim#Accident")]
     [BackboneType("Claim.accident")]
     public partial class AccidentComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1988,7 +1988,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Claim#Item", IsNestedType=true)]
+    [FhirType("Claim#Item")]
     [BackboneType("Claim.item")]
     public partial class ItemComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2750,7 +2750,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Claim#Detail", IsNestedType=true)]
+    [FhirType("Claim#Detail")]
     [BackboneType("Claim.item.detail")]
     public partial class DetailComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -3199,7 +3199,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Claim#SubDetail", IsNestedType=true)]
+    [FhirType("Claim#SubDetail")]
     [BackboneType("Claim.item.detail.subDetail")]
     public partial class SubDetailComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/ClaimResponse.cs b/src/Hl7.Fhir.STU3/Model/Generated/ClaimResponse.cs
index 3b8ea44e29..803a7cd149 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/ClaimResponse.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/ClaimResponse.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("ClaimResponse","http://hl7.org/fhir/StructureDefinition/ClaimResponse", IsResource=true)]
+  [FhirType("ClaimResponse","http://hl7.org/fhir/StructureDefinition/ClaimResponse")]
   public partial class ClaimResponse : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -67,7 +67,7 @@ public partial class ClaimResponse : Hl7.Fhir.Model.DomainResource, IIdentifiabl
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ClaimResponse#Item", IsNestedType=true)]
+    [FhirType("ClaimResponse#Item")]
     [BackboneType("ClaimResponse.item")]
     public partial class ItemComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -308,7 +308,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ClaimResponse#Adjudication", IsNestedType=true)]
+    [FhirType("ClaimResponse#Adjudication")]
     [BackboneType("ClaimResponse.item.adjudication")]
     public partial class AdjudicationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -530,7 +530,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ClaimResponse#ItemDetail", IsNestedType=true)]
+    [FhirType("ClaimResponse#ItemDetail")]
     [BackboneType("ClaimResponse.item.detail")]
     public partial class ItemDetailComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -771,7 +771,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ClaimResponse#SubDetail", IsNestedType=true)]
+    [FhirType("ClaimResponse#SubDetail")]
     [BackboneType("ClaimResponse.item.detail.subDetail")]
     public partial class SubDetailComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -986,7 +986,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ClaimResponse#AddedItem", IsNestedType=true)]
+    [FhirType("ClaimResponse#AddedItem")]
     [BackboneType("ClaimResponse.addItem")]
     public partial class AddedItemComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1357,7 +1357,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ClaimResponse#AddedItemsDetail", IsNestedType=true)]
+    [FhirType("ClaimResponse#AddedItemsDetail")]
     [BackboneType("ClaimResponse.addItem.detail")]
     public partial class AddedItemsDetailComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1658,7 +1658,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ClaimResponse#Error", IsNestedType=true)]
+    [FhirType("ClaimResponse#Error")]
     [BackboneType("ClaimResponse.error")]
     public partial class ErrorComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1915,7 +1915,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ClaimResponse#Payment", IsNestedType=true)]
+    [FhirType("ClaimResponse#Payment")]
     [BackboneType("ClaimResponse.payment")]
     public partial class PaymentComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2186,7 +2186,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ClaimResponse#Note", IsNestedType=true)]
+    [FhirType("ClaimResponse#Note")]
     [BackboneType("ClaimResponse.processNote")]
     public partial class NoteComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2425,7 +2425,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ClaimResponse#Insurance", IsNestedType=true)]
+    [FhirType("ClaimResponse#Insurance")]
     [BackboneType("ClaimResponse.insurance")]
     public partial class InsuranceComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/ClinicalImpression.cs b/src/Hl7.Fhir.STU3/Model/Generated/ClinicalImpression.cs
index af7b0d2c96..8a650ff6f9 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/ClinicalImpression.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/ClinicalImpression.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("ClinicalImpression","http://hl7.org/fhir/StructureDefinition/ClinicalImpression", IsResource=true)]
+  [FhirType("ClinicalImpression","http://hl7.org/fhir/StructureDefinition/ClinicalImpression")]
   public partial class ClinicalImpression : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -95,7 +95,7 @@ public enum ClinicalImpressionStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ClinicalImpression#Investigation", IsNestedType=true)]
+    [FhirType("ClinicalImpression#Investigation")]
     [BackboneType("ClinicalImpression.investigation")]
     public partial class InvestigationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -251,7 +251,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ClinicalImpression#Finding", IsNestedType=true)]
+    [FhirType("ClinicalImpression#Finding")]
     [BackboneType("ClinicalImpression.finding")]
     public partial class FindingComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/CodeSystem.cs b/src/Hl7.Fhir.STU3/Model/Generated/CodeSystem.cs
index 45a05b4daf..c9aadd057f 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/CodeSystem.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/CodeSystem.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("CodeSystem","http://hl7.org/fhir/StructureDefinition/CodeSystem", IsResource=true)]
+  [FhirType("CodeSystem","http://hl7.org/fhir/StructureDefinition/CodeSystem")]
   public partial class CodeSystem : Hl7.Fhir.Model.DomainResource, IIdentifiable<Identifier>
   {
     /// <summary>
@@ -181,7 +181,7 @@ public enum PropertyType
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CodeSystem#Filter", IsNestedType=true)]
+    [FhirType("CodeSystem#Filter")]
     [BackboneType("CodeSystem.filter")]
     public partial class FilterComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -459,7 +459,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CodeSystem#Property", IsNestedType=true)]
+    [FhirType("CodeSystem#Property")]
     [BackboneType("CodeSystem.property")]
     public partial class PropertyComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -737,7 +737,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CodeSystem#ConceptDefinition", IsNestedType=true)]
+    [FhirType("CodeSystem#ConceptDefinition")]
     [BackboneType("CodeSystem.concept")]
     public partial class ConceptDefinitionComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1046,7 +1046,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CodeSystem#Designation", IsNestedType=true)]
+    [FhirType("CodeSystem#Designation")]
     [BackboneType("CodeSystem.concept.designation")]
     public partial class DesignationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1261,7 +1261,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CodeSystem#ConceptProperty", IsNestedType=true)]
+    [FhirType("CodeSystem#ConceptProperty")]
     [BackboneType("CodeSystem.concept.property")]
     public partial class ConceptPropertyComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Communication.cs b/src/Hl7.Fhir.STU3/Model/Generated/Communication.cs
index 76d6a853c4..0bd83e4f86 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/Communication.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/Communication.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Communication","http://hl7.org/fhir/StructureDefinition/Communication", IsResource=true)]
+  [FhirType("Communication","http://hl7.org/fhir/StructureDefinition/Communication")]
   public partial class Communication : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -67,7 +67,7 @@ public partial class Communication : Hl7.Fhir.Model.DomainResource, IIdentifiabl
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Communication#Payload", IsNestedType=true)]
+    [FhirType("Communication#Payload")]
     [BackboneType("Communication.payload")]
     public partial class PayloadComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/CommunicationRequest.cs b/src/Hl7.Fhir.STU3/Model/Generated/CommunicationRequest.cs
index dc40102f84..737f8ca6ef 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/CommunicationRequest.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/CommunicationRequest.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("CommunicationRequest","http://hl7.org/fhir/StructureDefinition/CommunicationRequest", IsResource=true)]
+  [FhirType("CommunicationRequest","http://hl7.org/fhir/StructureDefinition/CommunicationRequest")]
   public partial class CommunicationRequest : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -67,7 +67,7 @@ public partial class CommunicationRequest : Hl7.Fhir.Model.DomainResource, IIden
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CommunicationRequest#Payload", IsNestedType=true)]
+    [FhirType("CommunicationRequest#Payload")]
     [BackboneType("CommunicationRequest.payload")]
     public partial class PayloadComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -197,7 +197,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CommunicationRequest#Requester", IsNestedType=true)]
+    [FhirType("CommunicationRequest#Requester")]
     [BackboneType("CommunicationRequest.requester")]
     public partial class RequesterComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/CompartmentDefinition.cs b/src/Hl7.Fhir.STU3/Model/Generated/CompartmentDefinition.cs
index 9fa5a7f565..9ac6048d1b 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/CompartmentDefinition.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/CompartmentDefinition.cs
@@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("CompartmentDefinition","http://hl7.org/fhir/StructureDefinition/CompartmentDefinition", IsResource=true)]
+  [FhirType("CompartmentDefinition","http://hl7.org/fhir/StructureDefinition/CompartmentDefinition")]
   public partial class CompartmentDefinition : Hl7.Fhir.Model.DomainResource
   {
     /// <summary>
@@ -68,7 +68,7 @@ public partial class CompartmentDefinition : Hl7.Fhir.Model.DomainResource
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CompartmentDefinition#Resource", IsNestedType=true)]
+    [FhirType("CompartmentDefinition#Resource")]
     [BackboneType("CompartmentDefinition.resource")]
     public partial class ResourceComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Composition.cs b/src/Hl7.Fhir.STU3/Model/Generated/Composition.cs
index 130f5de9cf..6d9f8b1188 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/Composition.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/Composition.cs
@@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Composition","http://hl7.org/fhir/StructureDefinition/Composition", IsResource=true)]
+  [FhirType("Composition","http://hl7.org/fhir/StructureDefinition/Composition")]
   public partial class Composition : Hl7.Fhir.Model.DomainResource, IIdentifiable<Identifier>
   {
     /// <summary>
@@ -166,7 +166,7 @@ public enum CompositionAttestationMode
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Composition#Attester", IsNestedType=true)]
+    [FhirType("Composition#Attester")]
     [BackboneType("Composition.attester")]
     public partial class AttesterComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -384,7 +384,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Composition#RelatesTo", IsNestedType=true)]
+    [FhirType("Composition#RelatesTo")]
     [BackboneType("Composition.relatesTo")]
     public partial class RelatesToComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -561,7 +561,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Composition#Event", IsNestedType=true)]
+    [FhirType("Composition#Event")]
     [BackboneType("Composition.event")]
     public partial class EventComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -742,7 +742,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Composition#Section", IsNestedType=true)]
+    [FhirType("Composition#Section")]
     [BackboneType("Composition.section")]
     public partial class SectionComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/ConceptMap.cs b/src/Hl7.Fhir.STU3/Model/Generated/ConceptMap.cs
index 55df6de544..63ce29d58e 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/ConceptMap.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/ConceptMap.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("ConceptMap","http://hl7.org/fhir/StructureDefinition/ConceptMap", IsResource=true)]
+  [FhirType("ConceptMap","http://hl7.org/fhir/StructureDefinition/ConceptMap")]
   public partial class ConceptMap : Hl7.Fhir.Model.DomainResource, IIdentifiable<Identifier>
   {
     /// <summary>
@@ -165,7 +165,7 @@ public enum ConceptMapGroupUnmappedMode
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ConceptMap#Group", IsNestedType=true)]
+    [FhirType("ConceptMap#Group")]
     [BackboneType("ConceptMap.group")]
     public partial class GroupComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -490,7 +490,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ConceptMap#SourceElement", IsNestedType=true)]
+    [FhirType("ConceptMap#SourceElement")]
     [BackboneType("ConceptMap.group.element")]
     public partial class SourceElementComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -704,7 +704,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ConceptMap#TargetElement", IsNestedType=true)]
+    [FhirType("ConceptMap#TargetElement")]
     [BackboneType("ConceptMap.group.element.target")]
     public partial class TargetElementComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1031,7 +1031,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ConceptMap#OtherElement", IsNestedType=true)]
+    [FhirType("ConceptMap#OtherElement")]
     [BackboneType("ConceptMap.group.element.target.dependsOn")]
     public partial class OtherElementComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1307,7 +1307,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ConceptMap#Unmapped", IsNestedType=true)]
+    [FhirType("ConceptMap#Unmapped")]
     [BackboneType("ConceptMap.group.unmapped")]
     public partial class UnmappedComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Condition.cs b/src/Hl7.Fhir.STU3/Model/Generated/Condition.cs
index 9868742ed1..7d01e4a3cd 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/Condition.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/Condition.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Condition","http://hl7.org/fhir/StructureDefinition/Condition", IsResource=true)]
+  [FhirType("Condition","http://hl7.org/fhir/StructureDefinition/Condition")]
   public partial class Condition : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -153,7 +153,7 @@ public enum ConditionVerificationStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Condition#Stage", IsNestedType=true)]
+    [FhirType("Condition#Stage")]
     [BackboneType("Condition.stage")]
     public partial class StageComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -309,7 +309,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Condition#Evidence", IsNestedType=true)]
+    [FhirType("Condition#Evidence")]
     [BackboneType("Condition.evidence")]
     public partial class EvidenceComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Consent.cs b/src/Hl7.Fhir.STU3/Model/Generated/Consent.cs
index 08da0b2304..e7040d2cc6 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/Consent.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/Consent.cs
@@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Consent","http://hl7.org/fhir/StructureDefinition/Consent", IsResource=true)]
+  [FhirType("Consent","http://hl7.org/fhir/StructureDefinition/Consent")]
   public partial class Consent : Hl7.Fhir.Model.DomainResource, IIdentifiable<Identifier>
   {
     /// <summary>
@@ -170,7 +170,7 @@ public enum ConsentExceptType
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Consent#Actor", IsNestedType=true)]
+    [FhirType("Consent#Actor")]
     [BackboneType("Consent.actor")]
     public partial class ActorComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -326,7 +326,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Consent#Policy", IsNestedType=true)]
+    [FhirType("Consent#Policy")]
     [BackboneType("Consent.policy")]
     public partial class PolicyComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -513,7 +513,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Consent#Data", IsNestedType=true)]
+    [FhirType("Consent#Data")]
     [BackboneType("Consent.data")]
     public partial class DataComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -688,7 +688,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Consent#Except", IsNestedType=true)]
+    [FhirType("Consent#Except")]
     [BackboneType("Consent.except")]
     public partial class ExceptComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1072,7 +1072,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Consent#ExceptActor", IsNestedType=true)]
+    [FhirType("Consent#ExceptActor")]
     [BackboneType("Consent.except.actor")]
     public partial class ExceptActorComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1228,7 +1228,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Consent#ExceptData", IsNestedType=true)]
+    [FhirType("Consent#ExceptData")]
     [BackboneType("Consent.except.data")]
     public partial class ExceptDataComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Contract.cs b/src/Hl7.Fhir.STU3/Model/Generated/Contract.cs
index ba06730bf8..4dd258f046 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/Contract.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/Contract.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Contract","http://hl7.org/fhir/StructureDefinition/Contract", IsResource=true)]
+  [FhirType("Contract","http://hl7.org/fhir/StructureDefinition/Contract")]
   public partial class Contract : Hl7.Fhir.Model.DomainResource, IIdentifiable<Identifier>
   {
     /// <summary>
@@ -169,7 +169,7 @@ public enum ContractResourceStatusCodes
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Contract#Agent", IsNestedType=true)]
+    [FhirType("Contract#Agent")]
     [BackboneType("Contract.agent")]
     public partial class AgentComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -327,7 +327,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Contract#Signatory", IsNestedType=true)]
+    [FhirType("Contract#Signatory")]
     [BackboneType("Contract.signer")]
     public partial class SignatoryComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -506,7 +506,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Contract#ValuedItem", IsNestedType=true)]
+    [FhirType("Contract#ValuedItem")]
     [BackboneType("Contract.valuedItem")]
     public partial class ValuedItemComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -864,7 +864,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Contract#Term", IsNestedType=true)]
+    [FhirType("Contract#Term")]
     [BackboneType("Contract.term")]
     public partial class TermComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1342,7 +1342,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Contract#TermAgent", IsNestedType=true)]
+    [FhirType("Contract#TermAgent")]
     [BackboneType("Contract.term.agent")]
     public partial class TermAgentComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1498,7 +1498,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Contract#TermValuedItem", IsNestedType=true)]
+    [FhirType("Contract#TermValuedItem")]
     [BackboneType("Contract.term.valuedItem")]
     public partial class TermValuedItemComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1856,7 +1856,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Contract#FriendlyLanguage", IsNestedType=true)]
+    [FhirType("Contract#FriendlyLanguage")]
     [BackboneType("Contract.friendly")]
     public partial class FriendlyLanguageComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1986,7 +1986,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Contract#LegalLanguage", IsNestedType=true)]
+    [FhirType("Contract#LegalLanguage")]
     [BackboneType("Contract.legal")]
     public partial class LegalLanguageComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2116,7 +2116,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Contract#ComputableLanguage", IsNestedType=true)]
+    [FhirType("Contract#ComputableLanguage")]
     [BackboneType("Contract.rule")]
     public partial class ComputableLanguageComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Coverage.cs b/src/Hl7.Fhir.STU3/Model/Generated/Coverage.cs
index 77d3ca22dc..c63a153332 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/Coverage.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/Coverage.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Coverage","http://hl7.org/fhir/StructureDefinition/Coverage", IsResource=true)]
+  [FhirType("Coverage","http://hl7.org/fhir/StructureDefinition/Coverage")]
   public partial class Coverage : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -67,7 +67,7 @@ public partial class Coverage : Hl7.Fhir.Model.DomainResource, IIdentifiable<Lis
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Coverage#Group", IsNestedType=true)]
+    [FhirType("Coverage#Group")]
     [BackboneType("Coverage.grouping")]
     public partial class GroupComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/DataElement.cs b/src/Hl7.Fhir.STU3/Model/Generated/DataElement.cs
index f3d8c177eb..143e1d31ad 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/DataElement.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/DataElement.cs
@@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("DataElement","http://hl7.org/fhir/StructureDefinition/DataElement", IsResource=true)]
+  [FhirType("DataElement","http://hl7.org/fhir/StructureDefinition/DataElement")]
   public partial class DataElement : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -114,7 +114,7 @@ public enum DataElementStringency
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("DataElement#Mapping", IsNestedType=true)]
+    [FhirType("DataElement#Mapping")]
     [BackboneType("DataElement.mapping")]
     public partial class MappingComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/DataRequirement.cs b/src/Hl7.Fhir.STU3/Model/Generated/DataRequirement.cs
index c943cc5bd7..bfcdad2dc9 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/DataRequirement.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/DataRequirement.cs
@@ -67,7 +67,7 @@ public partial class DataRequirement : Hl7.Fhir.Model.DataType
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("DataRequirement#CodeFilter", IsNestedType=true)]
+    [FhirType("DataRequirement#CodeFilter")]
     [BackboneType("DataRequirement.codeFilter")]
     public partial class CodeFilterComponent : Hl7.Fhir.Model.Element
     {
@@ -336,7 +336,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("DataRequirement#DateFilter", IsNestedType=true)]
+    [FhirType("DataRequirement#DateFilter")]
     [BackboneType("DataRequirement.dateFilter")]
     public partial class DateFilterComponent : Hl7.Fhir.Model.Element
     {
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/DetectedIssue.cs b/src/Hl7.Fhir.STU3/Model/Generated/DetectedIssue.cs
index d00c45524b..369967f798 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/DetectedIssue.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/DetectedIssue.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("DetectedIssue","http://hl7.org/fhir/StructureDefinition/DetectedIssue", IsResource=true)]
+  [FhirType("DetectedIssue","http://hl7.org/fhir/StructureDefinition/DetectedIssue")]
   public partial class DetectedIssue : Hl7.Fhir.Model.DomainResource, IIdentifiable<Identifier>
   {
     /// <summary>
@@ -95,7 +95,7 @@ public enum DetectedIssueSeverity
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("DetectedIssue#Mitigation", IsNestedType=true)]
+    [FhirType("DetectedIssue#Mitigation")]
     [BackboneType("DetectedIssue.mitigation")]
     public partial class MitigationComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Device.cs b/src/Hl7.Fhir.STU3/Model/Generated/Device.cs
index 6d87622278..a2edf3b2d5 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/Device.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/Device.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Device","http://hl7.org/fhir/StructureDefinition/Device", IsResource=true)]
+  [FhirType("Device","http://hl7.org/fhir/StructureDefinition/Device")]
   public partial class Device : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -148,7 +148,7 @@ public enum UDIEntryType
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Device#Udi", IsNestedType=true)]
+    [FhirType("Device#Udi")]
     [BackboneType("Device.udi")]
     public partial class UdiComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/DeviceComponent.cs b/src/Hl7.Fhir.STU3/Model/Generated/DeviceComponent.cs
index 3765cdce83..63da91edda 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/DeviceComponent.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/DeviceComponent.cs
@@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("DeviceComponent","http://hl7.org/fhir/StructureDefinition/DeviceComponent", IsResource=true)]
+  [FhirType("DeviceComponent","http://hl7.org/fhir/StructureDefinition/DeviceComponent")]
   public partial class DeviceComponent : Hl7.Fhir.Model.DomainResource, IIdentifiable<Identifier>
   {
     /// <summary>
@@ -144,7 +144,7 @@ public enum MeasmntPrinciple
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("DeviceComponent#ProductionSpecification", IsNestedType=true)]
+    [FhirType("DeviceComponent#ProductionSpecification")]
     [BackboneType("DeviceComponent.productionSpecification")]
     public partial class ProductionSpecificationComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/DeviceMetric.cs b/src/Hl7.Fhir.STU3/Model/Generated/DeviceMetric.cs
index a92c939785..649c297f51 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/DeviceMetric.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/DeviceMetric.cs
@@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("DeviceMetric","http://hl7.org/fhir/StructureDefinition/DeviceMetric", IsResource=true)]
+  [FhirType("DeviceMetric","http://hl7.org/fhir/StructureDefinition/DeviceMetric")]
   public partial class DeviceMetric : Hl7.Fhir.Model.DomainResource, IIdentifiable<Identifier>
   {
     /// <summary>
@@ -259,7 +259,7 @@ public enum DeviceMetricCalibrationState
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("DeviceMetric#Calibration", IsNestedType=true)]
+    [FhirType("DeviceMetric#Calibration")]
     [BackboneType("DeviceMetric.calibration")]
     public partial class CalibrationComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/DeviceRequest.cs b/src/Hl7.Fhir.STU3/Model/Generated/DeviceRequest.cs
index 0dc60f05e1..342fcb3dc8 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/DeviceRequest.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/DeviceRequest.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("DeviceRequest","http://hl7.org/fhir/StructureDefinition/DeviceRequest", IsResource=true)]
+  [FhirType("DeviceRequest","http://hl7.org/fhir/StructureDefinition/DeviceRequest")]
   public partial class DeviceRequest : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -67,7 +67,7 @@ public partial class DeviceRequest : Hl7.Fhir.Model.DomainResource, IIdentifiabl
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("DeviceRequest#Requester", IsNestedType=true)]
+    [FhirType("DeviceRequest#Requester")]
     [BackboneType("DeviceRequest.requester")]
     public partial class RequesterComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/DeviceUseStatement.cs b/src/Hl7.Fhir.STU3/Model/Generated/DeviceUseStatement.cs
index 8113928fb9..43e0773168 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/DeviceUseStatement.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/DeviceUseStatement.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("DeviceUseStatement","http://hl7.org/fhir/StructureDefinition/DeviceUseStatement", IsResource=true)]
+  [FhirType("DeviceUseStatement","http://hl7.org/fhir/StructureDefinition/DeviceUseStatement")]
   public partial class DeviceUseStatement : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/DiagnosticReport.cs b/src/Hl7.Fhir.STU3/Model/Generated/DiagnosticReport.cs
index 3d1f341a45..f4d85fd823 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/DiagnosticReport.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/DiagnosticReport.cs
@@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("DiagnosticReport","http://hl7.org/fhir/StructureDefinition/DiagnosticReport", IsResource=true)]
+  [FhirType("DiagnosticReport","http://hl7.org/fhir/StructureDefinition/DiagnosticReport")]
   public partial class DiagnosticReport : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -138,7 +138,7 @@ public enum DiagnosticReportStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("DiagnosticReport#Performer", IsNestedType=true)]
+    [FhirType("DiagnosticReport#Performer")]
     [BackboneType("DiagnosticReport.performer")]
     public partial class PerformerComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -293,7 +293,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("DiagnosticReport#Image", IsNestedType=true)]
+    [FhirType("DiagnosticReport#Image")]
     [BackboneType("DiagnosticReport.image")]
     public partial class ImageComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/DocumentManifest.cs b/src/Hl7.Fhir.STU3/Model/Generated/DocumentManifest.cs
index c59a64d940..1cbe314184 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/DocumentManifest.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/DocumentManifest.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("DocumentManifest","http://hl7.org/fhir/StructureDefinition/DocumentManifest", IsResource=true)]
+  [FhirType("DocumentManifest","http://hl7.org/fhir/StructureDefinition/DocumentManifest")]
   public partial class DocumentManifest : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -67,7 +67,7 @@ public partial class DocumentManifest : Hl7.Fhir.Model.DomainResource, IIdentifi
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("DocumentManifest#Content", IsNestedType=true)]
+    [FhirType("DocumentManifest#Content")]
     [BackboneType("DocumentManifest.content")]
     public partial class ContentComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -198,7 +198,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("DocumentManifest#Related", IsNestedType=true)]
+    [FhirType("DocumentManifest#Related")]
     [BackboneType("DocumentManifest.related")]
     public partial class RelatedComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/DocumentReference.cs b/src/Hl7.Fhir.STU3/Model/Generated/DocumentReference.cs
index 810bdce2f2..53354cac1b 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/DocumentReference.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/DocumentReference.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("DocumentReference","http://hl7.org/fhir/StructureDefinition/DocumentReference", IsResource=true)]
+  [FhirType("DocumentReference","http://hl7.org/fhir/StructureDefinition/DocumentReference")]
   public partial class DocumentReference : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -68,7 +68,7 @@ public partial class DocumentReference : Hl7.Fhir.Model.DomainResource, IIdentif
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("DocumentReference#RelatesTo", IsNestedType=true)]
+    [FhirType("DocumentReference#RelatesTo")]
     [BackboneType("DocumentReference.relatesTo")]
     public partial class RelatesToComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -243,7 +243,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("DocumentReference#Content", IsNestedType=true)]
+    [FhirType("DocumentReference#Content")]
     [BackboneType("DocumentReference.content")]
     public partial class ContentComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -397,7 +397,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("DocumentReference#Context", IsNestedType=true)]
+    [FhirType("DocumentReference#Context")]
     [BackboneType("DocumentReference.context")]
     public partial class ContextComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -683,7 +683,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("DocumentReference#Related", IsNestedType=true)]
+    [FhirType("DocumentReference#Related")]
     [BackboneType("DocumentReference.context.related")]
     public partial class RelatedComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/ElementDefinition.cs b/src/Hl7.Fhir.STU3/Model/Generated/ElementDefinition.cs
index 900f858215..39ba192698 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/ElementDefinition.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/ElementDefinition.cs
@@ -254,7 +254,7 @@ public enum ConstraintSeverity
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ElementDefinition#Slicing", IsNestedType=true)]
+    [FhirType("ElementDefinition#Slicing")]
     [BackboneType("ElementDefinition.slicing")]
     public partial class SlicingComponent : Hl7.Fhir.Model.Element
     {
@@ -514,7 +514,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ElementDefinition#Discriminator", IsNestedType=true)]
+    [FhirType("ElementDefinition#Discriminator")]
     [BackboneType("ElementDefinition.slicing.discriminator")]
     public partial class DiscriminatorComponent : Hl7.Fhir.Model.Element
     {
@@ -706,7 +706,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ElementDefinition#Base", IsNestedType=true)]
+    [FhirType("ElementDefinition#Base")]
     [BackboneType("ElementDefinition.base")]
     public partial class BaseComponent : Hl7.Fhir.Model.Element
     {
@@ -940,7 +940,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ElementDefinition#TypeRef", IsNestedType=true)]
+    [FhirType("ElementDefinition#TypeRef")]
     [BackboneType("ElementDefinition.type")]
     public partial class TypeRefComponent : Hl7.Fhir.Model.Element
     {
@@ -1264,7 +1264,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ElementDefinition#Example", IsNestedType=true)]
+    [FhirType("ElementDefinition#Example")]
     [BackboneType("ElementDefinition.example")]
     public partial class ExampleComponent : Hl7.Fhir.Model.Element
     {
@@ -1438,7 +1438,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ElementDefinition#Constraint", IsNestedType=true)]
+    [FhirType("ElementDefinition#Constraint")]
     [BackboneType("ElementDefinition.constraint")]
     public partial class ConstraintComponent : Hl7.Fhir.Model.Element
     {
@@ -1850,7 +1850,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ElementDefinition#ElementDefinitionBinding", IsNestedType=true)]
+    [FhirType("ElementDefinition#ElementDefinitionBinding")]
     [BackboneType("ElementDefinition.binding")]
     public partial class ElementDefinitionBindingComponent : Hl7.Fhir.Model.Element
     {
@@ -2071,7 +2071,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ElementDefinition#Mapping", IsNestedType=true)]
+    [FhirType("ElementDefinition#Mapping")]
     [BackboneType("ElementDefinition.mapping")]
     public partial class MappingComponent : Hl7.Fhir.Model.Element
     {
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/EligibilityRequest.cs b/src/Hl7.Fhir.STU3/Model/Generated/EligibilityRequest.cs
index fe35abec7a..307fb0c02a 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/EligibilityRequest.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/EligibilityRequest.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("EligibilityRequest","http://hl7.org/fhir/StructureDefinition/EligibilityRequest", IsResource=true)]
+  [FhirType("EligibilityRequest","http://hl7.org/fhir/StructureDefinition/EligibilityRequest")]
   public partial class EligibilityRequest : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/EligibilityResponse.cs b/src/Hl7.Fhir.STU3/Model/Generated/EligibilityResponse.cs
index c12d5d9c3a..399f855261 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/EligibilityResponse.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/EligibilityResponse.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("EligibilityResponse","http://hl7.org/fhir/StructureDefinition/EligibilityResponse", IsResource=true)]
+  [FhirType("EligibilityResponse","http://hl7.org/fhir/StructureDefinition/EligibilityResponse")]
   public partial class EligibilityResponse : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -67,7 +67,7 @@ public partial class EligibilityResponse : Hl7.Fhir.Model.DomainResource, IIdent
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("EligibilityResponse#Insurance", IsNestedType=true)]
+    [FhirType("EligibilityResponse#Insurance")]
     [BackboneType("EligibilityResponse.insurance")]
     public partial class InsuranceComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -248,7 +248,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("EligibilityResponse#Benefits", IsNestedType=true)]
+    [FhirType("EligibilityResponse#Benefits")]
     [BackboneType("EligibilityResponse.insurance.benefitBalance")]
     public partial class BenefitsComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -635,7 +635,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("EligibilityResponse#Benefit", IsNestedType=true)]
+    [FhirType("EligibilityResponse#Benefit")]
     [BackboneType("EligibilityResponse.insurance.benefitBalance.financial")]
     public partial class BenefitComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -817,7 +817,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("EligibilityResponse#Errors", IsNestedType=true)]
+    [FhirType("EligibilityResponse#Errors")]
     [BackboneType("EligibilityResponse.error")]
     public partial class ErrorsComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Encounter.cs b/src/Hl7.Fhir.STU3/Model/Generated/Encounter.cs
index 39c1927ecd..8dd86826e6 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/Encounter.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/Encounter.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Encounter","http://hl7.org/fhir/StructureDefinition/Encounter", IsResource=true)]
+  [FhirType("Encounter","http://hl7.org/fhir/StructureDefinition/Encounter")]
   public partial class Encounter : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -168,7 +168,7 @@ public enum EncounterLocationStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Encounter#StatusHistory", IsNestedType=true)]
+    [FhirType("Encounter#StatusHistory")]
     [BackboneType("Encounter.statusHistory")]
     public partial class StatusHistoryComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -342,7 +342,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Encounter#ClassHistory", IsNestedType=true)]
+    [FhirType("Encounter#ClassHistory")]
     [BackboneType("Encounter.classHistory")]
     public partial class ClassHistoryComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -496,7 +496,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Encounter#Participant", IsNestedType=true)]
+    [FhirType("Encounter#Participant")]
     [BackboneType("Encounter.participant")]
     public partial class ParticipantComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -673,7 +673,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Encounter#Diagnosis", IsNestedType=true)]
+    [FhirType("Encounter#Diagnosis")]
     [BackboneType("Encounter.diagnosis")]
     public partial class DiagnosisComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -872,7 +872,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Encounter#Hospitalization", IsNestedType=true)]
+    [FhirType("Encounter#Hospitalization")]
     [BackboneType("Encounter.hospitalization")]
     public partial class HospitalizationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1212,7 +1212,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Encounter#Location", IsNestedType=true)]
+    [FhirType("Encounter#Location")]
     [BackboneType("Encounter.location")]
     public partial class LocationComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Endpoint.cs b/src/Hl7.Fhir.STU3/Model/Generated/Endpoint.cs
index a615b1e70c..50813b9012 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/Endpoint.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/Endpoint.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Endpoint","http://hl7.org/fhir/StructureDefinition/Endpoint", IsResource=true)]
+  [FhirType("Endpoint","http://hl7.org/fhir/StructureDefinition/Endpoint")]
   public partial class Endpoint : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/EnrollmentRequest.cs b/src/Hl7.Fhir.STU3/Model/Generated/EnrollmentRequest.cs
index f008b1fecd..9adb299b3c 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/EnrollmentRequest.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/EnrollmentRequest.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("EnrollmentRequest","http://hl7.org/fhir/StructureDefinition/EnrollmentRequest", IsResource=true)]
+  [FhirType("EnrollmentRequest","http://hl7.org/fhir/StructureDefinition/EnrollmentRequest")]
   public partial class EnrollmentRequest : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/EnrollmentResponse.cs b/src/Hl7.Fhir.STU3/Model/Generated/EnrollmentResponse.cs
index 2b8b3eb35e..a32569060f 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/EnrollmentResponse.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/EnrollmentResponse.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("EnrollmentResponse","http://hl7.org/fhir/StructureDefinition/EnrollmentResponse", IsResource=true)]
+  [FhirType("EnrollmentResponse","http://hl7.org/fhir/StructureDefinition/EnrollmentResponse")]
   public partial class EnrollmentResponse : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/EpisodeOfCare.cs b/src/Hl7.Fhir.STU3/Model/Generated/EpisodeOfCare.cs
index 0e00f90009..4efa012e47 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/EpisodeOfCare.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/EpisodeOfCare.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("EpisodeOfCare","http://hl7.org/fhir/StructureDefinition/EpisodeOfCare", IsResource=true)]
+  [FhirType("EpisodeOfCare","http://hl7.org/fhir/StructureDefinition/EpisodeOfCare")]
   public partial class EpisodeOfCare : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -119,7 +119,7 @@ public enum EpisodeOfCareStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("EpisodeOfCare#StatusHistory", IsNestedType=true)]
+    [FhirType("EpisodeOfCare#StatusHistory")]
     [BackboneType("EpisodeOfCare.statusHistory")]
     public partial class StatusHistoryComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -289,7 +289,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("EpisodeOfCare#Diagnosis", IsNestedType=true)]
+    [FhirType("EpisodeOfCare#Diagnosis")]
     [BackboneType("EpisodeOfCare.diagnosis")]
     public partial class DiagnosisComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/ExpansionProfile.cs b/src/Hl7.Fhir.STU3/Model/Generated/ExpansionProfile.cs
index 4d91b9a23e..d63a7b3bae 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/ExpansionProfile.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/ExpansionProfile.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("ExpansionProfile","http://hl7.org/fhir/StructureDefinition/ExpansionProfile", IsResource=true)]
+  [FhirType("ExpansionProfile","http://hl7.org/fhir/StructureDefinition/ExpansionProfile")]
   public partial class ExpansionProfile : Hl7.Fhir.Model.DomainResource, IIdentifiable<Identifier>
   {
     /// <summary>
@@ -95,7 +95,7 @@ public enum SystemVersionProcessingMode
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExpansionProfile#FixedVersion", IsNestedType=true)]
+    [FhirType("ExpansionProfile#FixedVersion")]
     [BackboneType("ExpansionProfile.fixedVersion")]
     public partial class FixedVersionComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -331,7 +331,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExpansionProfile#ExcludedSystem", IsNestedType=true)]
+    [FhirType("ExpansionProfile#ExcludedSystem")]
     [BackboneType("ExpansionProfile.excludedSystem")]
     public partial class ExcludedSystemComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -519,7 +519,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExpansionProfile#Designation", IsNestedType=true)]
+    [FhirType("ExpansionProfile#Designation")]
     [BackboneType("ExpansionProfile.designation")]
     public partial class DesignationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -667,7 +667,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("ExpansionProfile#DesignationInclude", IsNestedType=true)]
+    [FhirType("ExpansionProfile#DesignationInclude")]
     [BackboneType("ExpansionProfile.designation.include")]
     public partial class DesignationIncludeComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -795,7 +795,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExpansionProfile#DesignationIncludeDesignation", IsNestedType=true)]
+    [FhirType("ExpansionProfile#DesignationIncludeDesignation")]
     [BackboneType("ExpansionProfile.designation.include.designation")]
     public partial class DesignationIncludeDesignationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -963,7 +963,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("ExpansionProfile#DesignationExclude", IsNestedType=true)]
+    [FhirType("ExpansionProfile#DesignationExclude")]
     [BackboneType("ExpansionProfile.designation.exclude")]
     public partial class DesignationExcludeComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1091,7 +1091,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExpansionProfile#DesignationExcludeDesignation", IsNestedType=true)]
+    [FhirType("ExpansionProfile#DesignationExcludeDesignation")]
     [BackboneType("ExpansionProfile.designation.exclude.designation")]
     public partial class DesignationExcludeDesignationComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/ExplanationOfBenefit.cs b/src/Hl7.Fhir.STU3/Model/Generated/ExplanationOfBenefit.cs
index de2863473d..160d3d05f7 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/ExplanationOfBenefit.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/ExplanationOfBenefit.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("ExplanationOfBenefit","http://hl7.org/fhir/StructureDefinition/ExplanationOfBenefit", IsResource=true)]
+  [FhirType("ExplanationOfBenefit","http://hl7.org/fhir/StructureDefinition/ExplanationOfBenefit")]
   public partial class ExplanationOfBenefit : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -258,7 +258,7 @@ public enum ActInvoiceGroupCode
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#RelatedClaim", IsNestedType=true)]
+    [FhirType("ExplanationOfBenefit#RelatedClaim")]
     [BackboneType("ExplanationOfBenefit.related")]
     public partial class RelatedClaimComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -437,7 +437,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#Payee", IsNestedType=true)]
+    [FhirType("ExplanationOfBenefit#Payee")]
     [BackboneType("ExplanationOfBenefit.payee")]
     public partial class PayeeComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -617,7 +617,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#SupportingInformation", IsNestedType=true)]
+    [FhirType("ExplanationOfBenefit#SupportingInformation")]
     [BackboneType("ExplanationOfBenefit.information")]
     public partial class SupportingInformationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -896,7 +896,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#CareTeam", IsNestedType=true)]
+    [FhirType("ExplanationOfBenefit#CareTeam")]
     [BackboneType("ExplanationOfBenefit.careTeam")]
     public partial class CareTeamComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1164,7 +1164,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#Diagnosis", IsNestedType=true)]
+    [FhirType("ExplanationOfBenefit#Diagnosis")]
     [BackboneType("ExplanationOfBenefit.diagnosis")]
     public partial class DiagnosisComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1392,7 +1392,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#Procedure", IsNestedType=true)]
+    [FhirType("ExplanationOfBenefit#Procedure")]
     [BackboneType("ExplanationOfBenefit.procedure")]
     public partial class ProcedureComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1610,7 +1610,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#Insurance", IsNestedType=true)]
+    [FhirType("ExplanationOfBenefit#Insurance")]
     [BackboneType("ExplanationOfBenefit.insurance")]
     public partial class InsuranceComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1782,7 +1782,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#Accident", IsNestedType=true)]
+    [FhirType("ExplanationOfBenefit#Accident")]
     [BackboneType("ExplanationOfBenefit.accident")]
     public partial class AccidentComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1980,7 +1980,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#Item", IsNestedType=true)]
+    [FhirType("ExplanationOfBenefit#Item")]
     [BackboneType("ExplanationOfBenefit.item")]
     public partial class ItemComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2812,7 +2812,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#Adjudication", IsNestedType=true)]
+    [FhirType("ExplanationOfBenefit#Adjudication")]
     [BackboneType("ExplanationOfBenefit.item.adjudication")]
     public partial class AdjudicationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -3034,7 +3034,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#Detail", IsNestedType=true)]
+    [FhirType("ExplanationOfBenefit#Detail")]
     [BackboneType("ExplanationOfBenefit.item.detail")]
     public partial class DetailComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -3580,7 +3580,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#SubDetail", IsNestedType=true)]
+    [FhirType("ExplanationOfBenefit#SubDetail")]
     [BackboneType("ExplanationOfBenefit.item.detail.subDetail")]
     public partial class SubDetailComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -4100,7 +4100,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#AddedItem", IsNestedType=true)]
+    [FhirType("ExplanationOfBenefit#AddedItem")]
     [BackboneType("ExplanationOfBenefit.addItem")]
     public partial class AddedItemComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -4471,7 +4471,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#AddedItemsDetail", IsNestedType=true)]
+    [FhirType("ExplanationOfBenefit#AddedItemsDetail")]
     [BackboneType("ExplanationOfBenefit.addItem.detail")]
     public partial class AddedItemsDetailComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -4772,7 +4772,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#Payment", IsNestedType=true)]
+    [FhirType("ExplanationOfBenefit#Payment")]
     [BackboneType("ExplanationOfBenefit.payment")]
     public partial class PaymentComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -5043,7 +5043,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#Note", IsNestedType=true)]
+    [FhirType("ExplanationOfBenefit#Note")]
     [BackboneType("ExplanationOfBenefit.processNote")]
     public partial class NoteComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -5279,7 +5279,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#BenefitBalance", IsNestedType=true)]
+    [FhirType("ExplanationOfBenefit#BenefitBalance")]
     [BackboneType("ExplanationOfBenefit.benefitBalance")]
     public partial class BenefitBalanceComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -5666,7 +5666,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#Benefit", IsNestedType=true)]
+    [FhirType("ExplanationOfBenefit#Benefit")]
     [BackboneType("ExplanationOfBenefit.benefitBalance.financial")]
     public partial class BenefitComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/FamilyMemberHistory.cs b/src/Hl7.Fhir.STU3/Model/Generated/FamilyMemberHistory.cs
index c62738ac35..9e65011b16 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/FamilyMemberHistory.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/FamilyMemberHistory.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("FamilyMemberHistory","http://hl7.org/fhir/StructureDefinition/FamilyMemberHistory", IsResource=true)]
+  [FhirType("FamilyMemberHistory","http://hl7.org/fhir/StructureDefinition/FamilyMemberHistory")]
   public partial class FamilyMemberHistory : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -102,7 +102,7 @@ public enum FamilyHistoryStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("FamilyMemberHistory#Condition", IsNestedType=true)]
+    [FhirType("FamilyMemberHistory#Condition")]
     [BackboneType("FamilyMemberHistory.condition")]
     public partial class ConditionComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Flag.cs b/src/Hl7.Fhir.STU3/Model/Generated/Flag.cs
index 8027e2a970..fb775872be 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/Flag.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/Flag.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Flag","http://hl7.org/fhir/StructureDefinition/Flag", IsResource=true)]
+  [FhirType("Flag","http://hl7.org/fhir/StructureDefinition/Flag")]
   public partial class Flag : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Goal.cs b/src/Hl7.Fhir.STU3/Model/Generated/Goal.cs
index 34cfaf74e9..34ab6a149a 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/Goal.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/Goal.cs
@@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Goal","http://hl7.org/fhir/StructureDefinition/Goal", IsResource=true)]
+  [FhirType("Goal","http://hl7.org/fhir/StructureDefinition/Goal")]
   public partial class Goal : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -156,7 +156,7 @@ public enum GoalStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Goal#Target", IsNestedType=true)]
+    [FhirType("Goal#Target")]
     [BackboneType("Goal.target")]
     public partial class TargetComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/GraphDefinition.cs b/src/Hl7.Fhir.STU3/Model/Generated/GraphDefinition.cs
index 0ff21c86e8..490aabe25b 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/GraphDefinition.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/GraphDefinition.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("GraphDefinition","http://hl7.org/fhir/StructureDefinition/GraphDefinition", IsResource=true)]
+  [FhirType("GraphDefinition","http://hl7.org/fhir/StructureDefinition/GraphDefinition")]
   public partial class GraphDefinition : Hl7.Fhir.Model.DomainResource
   {
     /// <summary>
@@ -98,7 +98,7 @@ public enum GraphCompartmentRule
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("GraphDefinition#Link", IsNestedType=true)]
+    [FhirType("GraphDefinition#Link")]
     [BackboneType("GraphDefinition.link")]
     public partial class LinkComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -438,7 +438,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("GraphDefinition#Target", IsNestedType=true)]
+    [FhirType("GraphDefinition#Target")]
     [BackboneType("GraphDefinition.link.target")]
     public partial class TargetComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -677,7 +677,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("GraphDefinition#Compartment", IsNestedType=true)]
+    [FhirType("GraphDefinition#Compartment")]
     [BackboneType("GraphDefinition.link.target.compartment")]
     public partial class CompartmentComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Group.cs b/src/Hl7.Fhir.STU3/Model/Generated/Group.cs
index 1127a4cbac..808fe23cc0 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/Group.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/Group.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Group","http://hl7.org/fhir/StructureDefinition/Group", IsResource=true)]
+  [FhirType("Group","http://hl7.org/fhir/StructureDefinition/Group")]
   public partial class Group : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -114,7 +114,7 @@ public enum GroupType
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Group#Characteristic", IsNestedType=true)]
+    [FhirType("Group#Characteristic")]
     [BackboneType("Group.characteristic")]
     public partial class CharacteristicComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -340,7 +340,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Group#Member", IsNestedType=true)]
+    [FhirType("Group#Member")]
     [BackboneType("Group.member")]
     public partial class MemberComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/GuidanceResponse.cs b/src/Hl7.Fhir.STU3/Model/Generated/GuidanceResponse.cs
index 93e342dcaf..528e51fd0a 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/GuidanceResponse.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/GuidanceResponse.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("GuidanceResponse","http://hl7.org/fhir/StructureDefinition/GuidanceResponse", IsResource=true)]
+  [FhirType("GuidanceResponse","http://hl7.org/fhir/StructureDefinition/GuidanceResponse")]
   public partial class GuidanceResponse : Hl7.Fhir.Model.DomainResource, IIdentifiable<Identifier>
   {
     /// <summary>
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/HealthcareService.cs b/src/Hl7.Fhir.STU3/Model/Generated/HealthcareService.cs
index ae03ae0c72..7b8a234e61 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/HealthcareService.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/HealthcareService.cs
@@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model
   /// </summary>
   [Serializable]
   [DataContract]
-  [FhirType("HealthcareService","http://hl7.org/fhir/StructureDefinition/HealthcareService", IsResource=true)]
+  [FhirType("HealthcareService","http://hl7.org/fhir/StructureDefinition/HealthcareService")]
   public partial class HealthcareService : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -65,7 +65,7 @@ public partial class HealthcareService : Hl7.Fhir.Model.DomainResource, IIdentif
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("HealthcareService#AvailableTime", IsNestedType=true)]
+    [FhirType("HealthcareService#AvailableTime")]
     [BackboneType("HealthcareService.availableTime")]
     public partial class AvailableTimeComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -341,7 +341,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("HealthcareService#NotAvailable", IsNestedType=true)]
+    [FhirType("HealthcareService#NotAvailable")]
     [BackboneType("HealthcareService.notAvailable")]
     public partial class NotAvailableComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/ImagingManifest.cs b/src/Hl7.Fhir.STU3/Model/Generated/ImagingManifest.cs
index 13b86fb031..d1b8747f06 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/ImagingManifest.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/ImagingManifest.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("ImagingManifest","http://hl7.org/fhir/StructureDefinition/ImagingManifest", IsResource=true)]
+  [FhirType("ImagingManifest","http://hl7.org/fhir/StructureDefinition/ImagingManifest")]
   public partial class ImagingManifest : Hl7.Fhir.Model.DomainResource, IIdentifiable<Identifier>
   {
     /// <summary>
@@ -68,7 +68,7 @@ public partial class ImagingManifest : Hl7.Fhir.Model.DomainResource, IIdentifia
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ImagingManifest#Study", IsNestedType=true)]
+    [FhirType("ImagingManifest#Study")]
     [BackboneType("ImagingManifest.study")]
     public partial class StudyComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -295,7 +295,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ImagingManifest#Series", IsNestedType=true)]
+    [FhirType("ImagingManifest#Series")]
     [BackboneType("ImagingManifest.study.series")]
     public partial class SeriesComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -495,7 +495,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ImagingManifest#Instance", IsNestedType=true)]
+    [FhirType("ImagingManifest#Instance")]
     [BackboneType("ImagingManifest.study.series.instance")]
     public partial class InstanceComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/ImagingStudy.cs b/src/Hl7.Fhir.STU3/Model/Generated/ImagingStudy.cs
index 28d2116a23..62280ea16d 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/ImagingStudy.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/ImagingStudy.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("ImagingStudy","http://hl7.org/fhir/StructureDefinition/ImagingStudy", IsResource=true)]
+  [FhirType("ImagingStudy","http://hl7.org/fhir/StructureDefinition/ImagingStudy")]
   public partial class ImagingStudy : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -101,7 +101,7 @@ public enum InstanceAvailability
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ImagingStudy#Series", IsNestedType=true)]
+    [FhirType("ImagingStudy#Series")]
     [BackboneType("ImagingStudy.series")]
     public partial class SeriesComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -624,7 +624,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ImagingStudy#Instance", IsNestedType=true)]
+    [FhirType("ImagingStudy#Instance")]
     [BackboneType("ImagingStudy.series.instance")]
     public partial class InstanceComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Immunization.cs b/src/Hl7.Fhir.STU3/Model/Generated/Immunization.cs
index c376e29dcc..4c7544e076 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/Immunization.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/Immunization.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Immunization","http://hl7.org/fhir/StructureDefinition/Immunization", IsResource=true)]
+  [FhirType("Immunization","http://hl7.org/fhir/StructureDefinition/Immunization")]
   public partial class Immunization : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -89,7 +89,7 @@ public enum ImmunizationStatusCodes
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Immunization#Practitioner", IsNestedType=true)]
+    [FhirType("Immunization#Practitioner")]
     [BackboneType("Immunization.practitioner")]
     public partial class PractitionerComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -244,7 +244,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Immunization#Explanation", IsNestedType=true)]
+    [FhirType("Immunization#Explanation")]
     [BackboneType("Immunization.explanation")]
     public partial class ExplanationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -400,7 +400,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Immunization#Reaction", IsNestedType=true)]
+    [FhirType("Immunization#Reaction")]
     [BackboneType("Immunization.reaction")]
     public partial class ReactionComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -614,7 +614,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Immunization#VaccinationProtocol", IsNestedType=true)]
+    [FhirType("Immunization#VaccinationProtocol")]
     [BackboneType("Immunization.vaccinationProtocol")]
     public partial class VaccinationProtocolComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/ImmunizationRecommendation.cs b/src/Hl7.Fhir.STU3/Model/Generated/ImmunizationRecommendation.cs
index 381ca3e25d..c01c2f9d1c 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/ImmunizationRecommendation.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/ImmunizationRecommendation.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("ImmunizationRecommendation","http://hl7.org/fhir/StructureDefinition/ImmunizationRecommendation", IsResource=true)]
+  [FhirType("ImmunizationRecommendation","http://hl7.org/fhir/StructureDefinition/ImmunizationRecommendation")]
   public partial class ImmunizationRecommendation : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -64,7 +64,7 @@ public partial class ImmunizationRecommendation : Hl7.Fhir.Model.DomainResource,
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("ImmunizationRecommendation#Recommendation", IsNestedType=true)]
+    [FhirType("ImmunizationRecommendation#Recommendation")]
     [BackboneType("ImmunizationRecommendation.recommendation")]
     public partial class RecommendationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -438,7 +438,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ImmunizationRecommendation#DateCriterion", IsNestedType=true)]
+    [FhirType("ImmunizationRecommendation#DateCriterion")]
     [BackboneType("ImmunizationRecommendation.recommendation.dateCriterion")]
     public partial class DateCriterionComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -610,7 +610,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ImmunizationRecommendation#Protocol", IsNestedType=true)]
+    [FhirType("ImmunizationRecommendation#Protocol")]
     [BackboneType("ImmunizationRecommendation.recommendation.protocol")]
     public partial class ProtocolComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/ImplementationGuide.cs b/src/Hl7.Fhir.STU3/Model/Generated/ImplementationGuide.cs
index 14c32c176c..3aeb6146ba 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/ImplementationGuide.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/ImplementationGuide.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("ImplementationGuide","http://hl7.org/fhir/StructureDefinition/ImplementationGuide", IsResource=true)]
+  [FhirType("ImplementationGuide","http://hl7.org/fhir/StructureDefinition/ImplementationGuide")]
   public partial class ImplementationGuide : Hl7.Fhir.Model.DomainResource
   {
     /// <summary>
@@ -147,7 +147,7 @@ public enum GuidePageKind
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ImplementationGuide#Dependency", IsNestedType=true)]
+    [FhirType("ImplementationGuide#Dependency")]
     [BackboneType("ImplementationGuide.dependency")]
     public partial class DependencyComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -338,7 +338,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ImplementationGuide#Package", IsNestedType=true)]
+    [FhirType("ImplementationGuide#Package")]
     [BackboneType("ImplementationGuide.package")]
     public partial class PackageComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -552,7 +552,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ImplementationGuide#Resource", IsNestedType=true)]
+    [FhirType("ImplementationGuide#Resource")]
     [BackboneType("ImplementationGuide.package.resource")]
     public partial class ResourceComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -883,7 +883,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ImplementationGuide#Global", IsNestedType=true)]
+    [FhirType("ImplementationGuide#Global")]
     [BackboneType("ImplementationGuide.global")]
     public partial class GlobalComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1059,7 +1059,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ImplementationGuide#Page", IsNestedType=true)]
+    [FhirType("ImplementationGuide#Page")]
     [BackboneType("ImplementationGuide.page")]
     public partial class PageComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Library.cs b/src/Hl7.Fhir.STU3/Model/Generated/Library.cs
index 9e0e3a43fe..dd36aa991c 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/Library.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/Library.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Library","http://hl7.org/fhir/StructureDefinition/Library", IsResource=true)]
+  [FhirType("Library","http://hl7.org/fhir/StructureDefinition/Library")]
   public partial class Library : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Linkage.cs b/src/Hl7.Fhir.STU3/Model/Generated/Linkage.cs
index 142a97c109..3d5204a5e9 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/Linkage.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/Linkage.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Linkage","http://hl7.org/fhir/StructureDefinition/Linkage", IsResource=true)]
+  [FhirType("Linkage","http://hl7.org/fhir/StructureDefinition/Linkage")]
   public partial class Linkage : Hl7.Fhir.Model.DomainResource
   {
     /// <summary>
@@ -95,7 +95,7 @@ public enum LinkageType
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Linkage#Item", IsNestedType=true)]
+    [FhirType("Linkage#Item")]
     [BackboneType("Linkage.item")]
     public partial class ItemComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/List.cs b/src/Hl7.Fhir.STU3/Model/Generated/List.cs
index d59cd21120..ec38b63542 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/List.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/List.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("List","http://hl7.org/fhir/StructureDefinition/List", IsResource=true)]
+  [FhirType("List","http://hl7.org/fhir/StructureDefinition/List")]
   public partial class List : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -96,7 +96,7 @@ public enum ListStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("List#Entry", IsNestedType=true)]
+    [FhirType("List#Entry")]
     [BackboneType("List.entry")]
     public partial class EntryComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Location.cs b/src/Hl7.Fhir.STU3/Model/Generated/Location.cs
index 590f6a7f6a..9ec5d97c6d 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/Location.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/Location.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Location","http://hl7.org/fhir/StructureDefinition/Location", IsResource=true)]
+  [FhirType("Location","http://hl7.org/fhir/StructureDefinition/Location")]
   public partial class Location : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -117,7 +117,7 @@ public enum LocationMode
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Location#Position", IsNestedType=true)]
+    [FhirType("Location#Position")]
     [BackboneType("Location.position")]
     public partial class PositionComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Measure.cs b/src/Hl7.Fhir.STU3/Model/Generated/Measure.cs
index 7336a3ccf2..38f8cf8677 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/Measure.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/Measure.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Measure","http://hl7.org/fhir/StructureDefinition/Measure", IsResource=true)]
+  [FhirType("Measure","http://hl7.org/fhir/StructureDefinition/Measure")]
   public partial class Measure : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -67,7 +67,7 @@ public partial class Measure : Hl7.Fhir.Model.DomainResource, IIdentifiable<List
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Measure#Group", IsNestedType=true)]
+    [FhirType("Measure#Group")]
     [BackboneType("Measure.group")]
     public partial class GroupComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -332,7 +332,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Measure#Population", IsNestedType=true)]
+    [FhirType("Measure#Population")]
     [BackboneType("Measure.group.population")]
     public partial class PopulationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -614,7 +614,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Measure#Stratifier", IsNestedType=true)]
+    [FhirType("Measure#Stratifier")]
     [BackboneType("Measure.group.stratifier")]
     public partial class StratifierComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -827,7 +827,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Measure#SupplementalData", IsNestedType=true)]
+    [FhirType("Measure#SupplementalData")]
     [BackboneType("Measure.supplementalData")]
     public partial class SupplementalDataComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/MeasureReport.cs b/src/Hl7.Fhir.STU3/Model/Generated/MeasureReport.cs
index e0f8fccc83..a9ba8de8c5 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/MeasureReport.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/MeasureReport.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("MeasureReport","http://hl7.org/fhir/StructureDefinition/MeasureReport", IsResource=true)]
+  [FhirType("MeasureReport","http://hl7.org/fhir/StructureDefinition/MeasureReport")]
   public partial class MeasureReport : Hl7.Fhir.Model.DomainResource, IIdentifiable<Identifier>
   {
     /// <summary>
@@ -123,7 +123,7 @@ public enum MeasureReportType
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MeasureReport#Group", IsNestedType=true)]
+    [FhirType("MeasureReport#Group")]
     [BackboneType("MeasureReport.group")]
     public partial class GroupComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -345,7 +345,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MeasureReport#Population", IsNestedType=true)]
+    [FhirType("MeasureReport#Population")]
     [BackboneType("MeasureReport.group.population")]
     public partial class PopulationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -567,7 +567,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MeasureReport#Stratifier", IsNestedType=true)]
+    [FhirType("MeasureReport#Stratifier")]
     [BackboneType("MeasureReport.group.stratifier")]
     public partial class StratifierComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -719,7 +719,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MeasureReport#StratifierGroup", IsNestedType=true)]
+    [FhirType("MeasureReport#StratifierGroup")]
     [BackboneType("MeasureReport.group.stratifier.stratum")]
     public partial class StratifierGroupComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -933,7 +933,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MeasureReport#StratifierGroupPopulation", IsNestedType=true)]
+    [FhirType("MeasureReport#StratifierGroupPopulation")]
     [BackboneType("MeasureReport.group.stratifier.stratum.population")]
     public partial class StratifierGroupPopulationComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Media.cs b/src/Hl7.Fhir.STU3/Model/Generated/Media.cs
index 1f076ab1db..6c2d90ccec 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/Media.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/Media.cs
@@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model
   /// </summary>
   [Serializable]
   [DataContract]
-  [FhirType("Media","http://hl7.org/fhir/StructureDefinition/Media", IsResource=true)]
+  [FhirType("Media","http://hl7.org/fhir/StructureDefinition/Media")]
   public partial class Media : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Medication.cs b/src/Hl7.Fhir.STU3/Model/Generated/Medication.cs
index 65adfa6357..687bf0ce06 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/Medication.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/Medication.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Medication","http://hl7.org/fhir/StructureDefinition/Medication", IsResource=true)]
+  [FhirType("Medication","http://hl7.org/fhir/StructureDefinition/Medication")]
   public partial class Medication : Hl7.Fhir.Model.DomainResource
   {
     /// <summary>
@@ -96,7 +96,7 @@ public enum MedicationStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Medication#Ingredient", IsNestedType=true)]
+    [FhirType("Medication#Ingredient")]
     [BackboneType("Medication.ingredient")]
     public partial class IngredientComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -294,7 +294,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Medication#Package", IsNestedType=true)]
+    [FhirType("Medication#Package")]
     [BackboneType("Medication.package")]
     public partial class PackageComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -473,7 +473,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Medication#Content", IsNestedType=true)]
+    [FhirType("Medication#Content")]
     [BackboneType("Medication.package.content")]
     public partial class ContentComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -628,7 +628,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Medication#Batch", IsNestedType=true)]
+    [FhirType("Medication#Batch")]
     [BackboneType("Medication.package.batch")]
     public partial class BatchComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/MedicationAdministration.cs b/src/Hl7.Fhir.STU3/Model/Generated/MedicationAdministration.cs
index 61dff5aeb5..dd121afede 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/MedicationAdministration.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/MedicationAdministration.cs
@@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("MedicationAdministration","http://hl7.org/fhir/StructureDefinition/MedicationAdministration", IsResource=true)]
+  [FhirType("MedicationAdministration","http://hl7.org/fhir/StructureDefinition/MedicationAdministration")]
   public partial class MedicationAdministration : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -114,7 +114,7 @@ public enum MedicationAdministrationStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationAdministration#Performer", IsNestedType=true)]
+    [FhirType("MedicationAdministration#Performer")]
     [BackboneType("MedicationAdministration.performer")]
     public partial class PerformerComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -270,7 +270,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationAdministration#Dosage", IsNestedType=true)]
+    [FhirType("MedicationAdministration#Dosage")]
     [BackboneType("MedicationAdministration.dosage")]
     public partial class DosageComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/MedicationDispense.cs b/src/Hl7.Fhir.STU3/Model/Generated/MedicationDispense.cs
index c44e54853b..c4330d72d3 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/MedicationDispense.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/MedicationDispense.cs
@@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("MedicationDispense","http://hl7.org/fhir/StructureDefinition/MedicationDispense", IsResource=true)]
+  [FhirType("MedicationDispense","http://hl7.org/fhir/StructureDefinition/MedicationDispense")]
   public partial class MedicationDispense : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -115,7 +115,7 @@ public enum MedicationDispenseStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationDispense#Performer", IsNestedType=true)]
+    [FhirType("MedicationDispense#Performer")]
     [BackboneType("MedicationDispense.performer")]
     public partial class PerformerComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -271,7 +271,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationDispense#Substitution", IsNestedType=true)]
+    [FhirType("MedicationDispense#Substitution")]
     [BackboneType("MedicationDispense.substitution")]
     public partial class SubstitutionComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/MedicationRequest.cs b/src/Hl7.Fhir.STU3/Model/Generated/MedicationRequest.cs
index 75adbec3e4..5fd58579ab 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/MedicationRequest.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/MedicationRequest.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("MedicationRequest","http://hl7.org/fhir/StructureDefinition/MedicationRequest", IsResource=true)]
+  [FhirType("MedicationRequest","http://hl7.org/fhir/StructureDefinition/MedicationRequest")]
   public partial class MedicationRequest : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -193,7 +193,7 @@ public enum MedicationRequestPriority
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationRequest#Requester", IsNestedType=true)]
+    [FhirType("MedicationRequest#Requester")]
     [BackboneType("MedicationRequest.requester")]
     public partial class RequesterComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -349,7 +349,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationRequest#DispenseRequest", IsNestedType=true)]
+    [FhirType("MedicationRequest#DispenseRequest")]
     [BackboneType("MedicationRequest.dispenseRequest")]
     public partial class DispenseRequestComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -595,7 +595,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationRequest#Substitution", IsNestedType=true)]
+    [FhirType("MedicationRequest#Substitution")]
     [BackboneType("MedicationRequest.substitution")]
     public partial class SubstitutionComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/MedicationStatement.cs b/src/Hl7.Fhir.STU3/Model/Generated/MedicationStatement.cs
index 64edeb5eb6..c5727f5cab 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/MedicationStatement.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/MedicationStatement.cs
@@ -62,7 +62,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("MedicationStatement","http://hl7.org/fhir/StructureDefinition/MedicationStatement", IsResource=true)]
+  [FhirType("MedicationStatement","http://hl7.org/fhir/StructureDefinition/MedicationStatement")]
   public partial class MedicationStatement : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/MessageDefinition.cs b/src/Hl7.Fhir.STU3/Model/Generated/MessageDefinition.cs
index ef6d69af04..da5e957c8c 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/MessageDefinition.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/MessageDefinition.cs
@@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("MessageDefinition","http://hl7.org/fhir/StructureDefinition/MessageDefinition", IsResource=true)]
+  [FhirType("MessageDefinition","http://hl7.org/fhir/StructureDefinition/MessageDefinition")]
   public partial class MessageDefinition : Hl7.Fhir.Model.DomainResource, IIdentifiable<Identifier>
   {
     /// <summary>
@@ -68,7 +68,7 @@ public partial class MessageDefinition : Hl7.Fhir.Model.DomainResource, IIdentif
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MessageDefinition#Focus", IsNestedType=true)]
+    [FhirType("MessageDefinition#Focus")]
     [BackboneType("MessageDefinition.focus")]
     public partial class FocusComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -329,7 +329,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MessageDefinition#AllowedResponse", IsNestedType=true)]
+    [FhirType("MessageDefinition#AllowedResponse")]
     [BackboneType("MessageDefinition.allowedResponse")]
     public partial class AllowedResponseComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/MessageHeader.cs b/src/Hl7.Fhir.STU3/Model/Generated/MessageHeader.cs
index 21e95f6e3e..104a59dfb9 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/MessageHeader.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/MessageHeader.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("MessageHeader","http://hl7.org/fhir/StructureDefinition/MessageHeader", IsResource=true)]
+  [FhirType("MessageHeader","http://hl7.org/fhir/StructureDefinition/MessageHeader")]
   public partial class MessageHeader : Hl7.Fhir.Model.DomainResource
   {
     /// <summary>
@@ -96,7 +96,7 @@ public enum ResponseType
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MessageHeader#MessageDestination", IsNestedType=true)]
+    [FhirType("MessageHeader#MessageDestination")]
     [BackboneType("MessageHeader.destination")]
     public partial class MessageDestinationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -311,7 +311,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MessageHeader#MessageSource", IsNestedType=true)]
+    [FhirType("MessageHeader#MessageSource")]
     [BackboneType("MessageHeader.source")]
     public partial class MessageSourceComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -610,7 +610,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MessageHeader#Response", IsNestedType=true)]
+    [FhirType("MessageHeader#Response")]
     [BackboneType("MessageHeader.response")]
     public partial class ResponseComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/NamingSystem.cs b/src/Hl7.Fhir.STU3/Model/Generated/NamingSystem.cs
index 15716b09f3..5da30b52cb 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/NamingSystem.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/NamingSystem.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("NamingSystem","http://hl7.org/fhir/StructureDefinition/NamingSystem", IsResource=true)]
+  [FhirType("NamingSystem","http://hl7.org/fhir/StructureDefinition/NamingSystem")]
   public partial class NamingSystem : Hl7.Fhir.Model.DomainResource
   {
     /// <summary>
@@ -130,7 +130,7 @@ public enum NamingSystemIdentifierType
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("NamingSystem#UniqueId", IsNestedType=true)]
+    [FhirType("NamingSystem#UniqueId")]
     [BackboneType("NamingSystem.uniqueId")]
     public partial class UniqueIdComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/NutritionOrder.cs b/src/Hl7.Fhir.STU3/Model/Generated/NutritionOrder.cs
index 602f7638c6..baa5efe158 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/NutritionOrder.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/NutritionOrder.cs
@@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("NutritionOrder","http://hl7.org/fhir/StructureDefinition/NutritionOrder", IsResource=true)]
+  [FhirType("NutritionOrder","http://hl7.org/fhir/StructureDefinition/NutritionOrder")]
   public partial class NutritionOrder : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -132,7 +132,7 @@ public enum NutritionOrderStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("NutritionOrder#OralDiet", IsNestedType=true)]
+    [FhirType("NutritionOrder#OralDiet")]
     [BackboneType("NutritionOrder.oralDiet")]
     public partial class OralDietComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -408,7 +408,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("NutritionOrder#Nutrient", IsNestedType=true)]
+    [FhirType("NutritionOrder#Nutrient")]
     [BackboneType("NutritionOrder.oralDiet.nutrient")]
     public partial class NutrientComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -560,7 +560,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("NutritionOrder#Texture", IsNestedType=true)]
+    [FhirType("NutritionOrder#Texture")]
     [BackboneType("NutritionOrder.oralDiet.texture")]
     public partial class TextureComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -713,7 +713,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("NutritionOrder#Supplement", IsNestedType=true)]
+    [FhirType("NutritionOrder#Supplement")]
     [BackboneType("NutritionOrder.supplement")]
     public partial class SupplementComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -977,7 +977,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("NutritionOrder#EnteralFormula", IsNestedType=true)]
+    [FhirType("NutritionOrder#EnteralFormula")]
     [BackboneType("NutritionOrder.enteralFormula")]
     public partial class EnteralFormulaComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1362,7 +1362,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("NutritionOrder#Administration", IsNestedType=true)]
+    [FhirType("NutritionOrder#Administration")]
     [BackboneType("NutritionOrder.enteralFormula.administration")]
     public partial class AdministrationComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Observation.cs b/src/Hl7.Fhir.STU3/Model/Generated/Observation.cs
index f898ee726e..79b8e62523 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/Observation.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/Observation.cs
@@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Observation","http://hl7.org/fhir/StructureDefinition/Observation", IsResource=true)]
+  [FhirType("Observation","http://hl7.org/fhir/StructureDefinition/Observation")]
   public partial class Observation : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -115,7 +115,7 @@ public enum ObservationRelationshipType
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Observation#ReferenceRange", IsNestedType=true)]
+    [FhirType("Observation#ReferenceRange")]
     [BackboneType("Observation.referenceRange")]
     public partial class ReferenceRangeComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -388,7 +388,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Observation#Related", IsNestedType=true)]
+    [FhirType("Observation#Related")]
     [BackboneType("Observation.related")]
     public partial class RelatedComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -563,7 +563,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Observation#Component", IsNestedType=true)]
+    [FhirType("Observation#Component")]
     [BackboneType("Observation.component")]
     public partial class ComponentComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/OperationDefinition.cs b/src/Hl7.Fhir.STU3/Model/Generated/OperationDefinition.cs
index 285dbb6dcf..fa06cfa615 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/OperationDefinition.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/OperationDefinition.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("OperationDefinition","http://hl7.org/fhir/StructureDefinition/OperationDefinition", IsResource=true)]
+  [FhirType("OperationDefinition","http://hl7.org/fhir/StructureDefinition/OperationDefinition")]
   public partial class OperationDefinition : Hl7.Fhir.Model.DomainResource
   {
     /// <summary>
@@ -90,7 +90,7 @@ public enum OperationKind
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("OperationDefinition#Parameter", IsNestedType=true)]
+    [FhirType("OperationDefinition#Parameter")]
     [BackboneType("OperationDefinition.parameter")]
     public partial class ParameterComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -580,7 +580,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("OperationDefinition#Binding", IsNestedType=true)]
+    [FhirType("OperationDefinition#Binding")]
     [BackboneType("OperationDefinition.parameter.binding")]
     public partial class BindingComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -757,7 +757,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("OperationDefinition#Overload", IsNestedType=true)]
+    [FhirType("OperationDefinition#Overload")]
     [BackboneType("OperationDefinition.overload")]
     public partial class OverloadComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Organization.cs b/src/Hl7.Fhir.STU3/Model/Generated/Organization.cs
index f740de161d..29705f66ce 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/Organization.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/Organization.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Organization","http://hl7.org/fhir/StructureDefinition/Organization", IsResource=true)]
+  [FhirType("Organization","http://hl7.org/fhir/StructureDefinition/Organization")]
   public partial class Organization : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -67,7 +67,7 @@ public partial class Organization : Hl7.Fhir.Model.DomainResource, IIdentifiable
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Organization#Contact", IsNestedType=true)]
+    [FhirType("Organization#Contact")]
     [BackboneType("Organization.contact")]
     public partial class ContactComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Patient.cs b/src/Hl7.Fhir.STU3/Model/Generated/Patient.cs
index 5fce35f02f..0114722cec 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/Patient.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/Patient.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Patient","http://hl7.org/fhir/StructureDefinition/Patient", IsResource=true)]
+  [FhirType("Patient","http://hl7.org/fhir/StructureDefinition/Patient")]
   public partial class Patient : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -101,7 +101,7 @@ public enum LinkType
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Patient#Contact", IsNestedType=true)]
+    [FhirType("Patient#Contact")]
     [BackboneType("Patient.contact")]
     public partial class ContactComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -403,7 +403,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Patient#Animal", IsNestedType=true)]
+    [FhirType("Patient#Animal")]
     [BackboneType("Patient.animal")]
     public partial class AnimalComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -584,7 +584,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Patient#Communication", IsNestedType=true)]
+    [FhirType("Patient#Communication")]
     [BackboneType("Patient.communication")]
     public partial class CommunicationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -757,7 +757,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Patient#Link", IsNestedType=true)]
+    [FhirType("Patient#Link")]
     [BackboneType("Patient.link")]
     public partial class LinkComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/PaymentNotice.cs b/src/Hl7.Fhir.STU3/Model/Generated/PaymentNotice.cs
index da7e41ef25..0ad8e324e8 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/PaymentNotice.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/PaymentNotice.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("PaymentNotice","http://hl7.org/fhir/StructureDefinition/PaymentNotice", IsResource=true)]
+  [FhirType("PaymentNotice","http://hl7.org/fhir/StructureDefinition/PaymentNotice")]
   public partial class PaymentNotice : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/PaymentReconciliation.cs b/src/Hl7.Fhir.STU3/Model/Generated/PaymentReconciliation.cs
index 36d867c734..b417a43090 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/PaymentReconciliation.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/PaymentReconciliation.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("PaymentReconciliation","http://hl7.org/fhir/StructureDefinition/PaymentReconciliation", IsResource=true)]
+  [FhirType("PaymentReconciliation","http://hl7.org/fhir/StructureDefinition/PaymentReconciliation")]
   public partial class PaymentReconciliation : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -67,7 +67,7 @@ public partial class PaymentReconciliation : Hl7.Fhir.Model.DomainResource, IIde
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("PaymentReconciliation#Details", IsNestedType=true)]
+    [FhirType("PaymentReconciliation#Details")]
     [BackboneType("PaymentReconciliation.detail")]
     public partial class DetailsComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -371,7 +371,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("PaymentReconciliation#Notes", IsNestedType=true)]
+    [FhirType("PaymentReconciliation#Notes")]
     [BackboneType("PaymentReconciliation.processNote")]
     public partial class NotesComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Person.cs b/src/Hl7.Fhir.STU3/Model/Generated/Person.cs
index d5cc195f9c..9281d3f7be 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/Person.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/Person.cs
@@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Person","http://hl7.org/fhir/StructureDefinition/Person", IsResource=true)]
+  [FhirType("Person","http://hl7.org/fhir/StructureDefinition/Person")]
   public partial class Person : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -99,7 +99,7 @@ public enum IdentityAssuranceLevel
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Person#Link", IsNestedType=true)]
+    [FhirType("Person#Link")]
     [BackboneType("Person.link")]
     public partial class LinkComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/PlanDefinition.cs b/src/Hl7.Fhir.STU3/Model/Generated/PlanDefinition.cs
index 8c6ddebf29..0ae8c32b20 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/PlanDefinition.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/PlanDefinition.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("PlanDefinition","http://hl7.org/fhir/StructureDefinition/PlanDefinition", IsResource=true)]
+  [FhirType("PlanDefinition","http://hl7.org/fhir/StructureDefinition/PlanDefinition")]
   public partial class PlanDefinition : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -67,7 +67,7 @@ public partial class PlanDefinition : Hl7.Fhir.Model.DomainResource, IIdentifiab
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("PlanDefinition#Goal", IsNestedType=true)]
+    [FhirType("PlanDefinition#Goal")]
     [BackboneType("PlanDefinition.goal")]
     public partial class GoalComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -352,7 +352,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("PlanDefinition#Target", IsNestedType=true)]
+    [FhirType("PlanDefinition#Target")]
     [BackboneType("PlanDefinition.goal.target")]
     public partial class TargetComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -531,7 +531,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("PlanDefinition#Action", IsNestedType=true)]
+    [FhirType("PlanDefinition#Action")]
     [BackboneType("PlanDefinition.action")]
     public partial class ActionComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1466,7 +1466,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("PlanDefinition#Condition", IsNestedType=true)]
+    [FhirType("PlanDefinition#Condition")]
     [BackboneType("PlanDefinition.action.condition")]
     public partial class ConditionComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1743,7 +1743,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("PlanDefinition#RelatedAction", IsNestedType=true)]
+    [FhirType("PlanDefinition#RelatedAction")]
     [BackboneType("PlanDefinition.action.relatedAction")]
     public partial class RelatedActionComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1961,7 +1961,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("PlanDefinition#Participant", IsNestedType=true)]
+    [FhirType("PlanDefinition#Participant")]
     [BackboneType("PlanDefinition.action.participant")]
     public partial class ParticipantComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2134,7 +2134,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("PlanDefinition#DynamicValue", IsNestedType=true)]
+    [FhirType("PlanDefinition#DynamicValue")]
     [BackboneType("PlanDefinition.action.dynamicValue")]
     public partial class DynamicValueComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Practitioner.cs b/src/Hl7.Fhir.STU3/Model/Generated/Practitioner.cs
index 6151d66f10..2d02c02df0 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/Practitioner.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/Practitioner.cs
@@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Practitioner","http://hl7.org/fhir/StructureDefinition/Practitioner", IsResource=true)]
+  [FhirType("Practitioner","http://hl7.org/fhir/StructureDefinition/Practitioner")]
   public partial class Practitioner : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -65,7 +65,7 @@ public partial class Practitioner : Hl7.Fhir.Model.DomainResource, IIdentifiable
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Practitioner#Qualification", IsNestedType=true)]
+    [FhirType("Practitioner#Qualification")]
     [BackboneType("Practitioner.qualification")]
     public partial class QualificationComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/PractitionerRole.cs b/src/Hl7.Fhir.STU3/Model/Generated/PractitionerRole.cs
index 8d9d174073..57654f8d86 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/PractitionerRole.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/PractitionerRole.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("PractitionerRole","http://hl7.org/fhir/StructureDefinition/PractitionerRole", IsResource=true)]
+  [FhirType("PractitionerRole","http://hl7.org/fhir/StructureDefinition/PractitionerRole")]
   public partial class PractitionerRole : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -68,7 +68,7 @@ public partial class PractitionerRole : Hl7.Fhir.Model.DomainResource, IIdentifi
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("PractitionerRole#AvailableTime", IsNestedType=true)]
+    [FhirType("PractitionerRole#AvailableTime")]
     [BackboneType("PractitionerRole.availableTime")]
     public partial class AvailableTimeComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -344,7 +344,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("PractitionerRole#NotAvailable", IsNestedType=true)]
+    [FhirType("PractitionerRole#NotAvailable")]
     [BackboneType("PractitionerRole.notAvailable")]
     public partial class NotAvailableComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Procedure.cs b/src/Hl7.Fhir.STU3/Model/Generated/Procedure.cs
index 020b8a4115..bac3aeb121 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/Procedure.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/Procedure.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Procedure","http://hl7.org/fhir/StructureDefinition/Procedure", IsResource=true)]
+  [FhirType("Procedure","http://hl7.org/fhir/StructureDefinition/Procedure")]
   public partial class Procedure : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -67,7 +67,7 @@ public partial class Procedure : Hl7.Fhir.Model.DomainResource, IIdentifiable<Li
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Procedure#Performer", IsNestedType=true)]
+    [FhirType("Procedure#Performer")]
     [BackboneType("Procedure.performer")]
     public partial class PerformerComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -249,7 +249,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Procedure#FocalDevice", IsNestedType=true)]
+    [FhirType("Procedure#FocalDevice")]
     [BackboneType("Procedure.focalDevice")]
     public partial class FocalDeviceComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/ProcedureRequest.cs b/src/Hl7.Fhir.STU3/Model/Generated/ProcedureRequest.cs
index 9531a91ac4..49b4b83e1b 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/ProcedureRequest.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/ProcedureRequest.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("ProcedureRequest","http://hl7.org/fhir/StructureDefinition/ProcedureRequest", IsResource=true)]
+  [FhirType("ProcedureRequest","http://hl7.org/fhir/StructureDefinition/ProcedureRequest")]
   public partial class ProcedureRequest : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -68,7 +68,7 @@ public partial class ProcedureRequest : Hl7.Fhir.Model.DomainResource, IIdentifi
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ProcedureRequest#Requester", IsNestedType=true)]
+    [FhirType("ProcedureRequest#Requester")]
     [BackboneType("ProcedureRequest.requester")]
     public partial class RequesterComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/ProcessRequest.cs b/src/Hl7.Fhir.STU3/Model/Generated/ProcessRequest.cs
index 7530d7d761..563fdf85e5 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/ProcessRequest.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/ProcessRequest.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("ProcessRequest","http://hl7.org/fhir/StructureDefinition/ProcessRequest", IsResource=true)]
+  [FhirType("ProcessRequest","http://hl7.org/fhir/StructureDefinition/ProcessRequest")]
   public partial class ProcessRequest : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -101,7 +101,7 @@ public enum ActionList
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ProcessRequest#Items", IsNestedType=true)]
+    [FhirType("ProcessRequest#Items")]
     [BackboneType("ProcessRequest.item")]
     public partial class ItemsComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/ProcessResponse.cs b/src/Hl7.Fhir.STU3/Model/Generated/ProcessResponse.cs
index 0d00332027..cf38488c68 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/ProcessResponse.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/ProcessResponse.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("ProcessResponse","http://hl7.org/fhir/StructureDefinition/ProcessResponse", IsResource=true)]
+  [FhirType("ProcessResponse","http://hl7.org/fhir/StructureDefinition/ProcessResponse")]
   public partial class ProcessResponse : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -67,7 +67,7 @@ public partial class ProcessResponse : Hl7.Fhir.Model.DomainResource, IIdentifia
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ProcessResponse#ProcessNote", IsNestedType=true)]
+    [FhirType("ProcessResponse#ProcessNote")]
     [BackboneType("ProcessResponse.processNote")]
     public partial class ProcessNoteComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Provenance.cs b/src/Hl7.Fhir.STU3/Model/Generated/Provenance.cs
index b082a431c1..a6da9469ed 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/Provenance.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/Provenance.cs
@@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Provenance","http://hl7.org/fhir/StructureDefinition/Provenance", IsResource=true)]
+  [FhirType("Provenance","http://hl7.org/fhir/StructureDefinition/Provenance")]
   public partial class Provenance : Hl7.Fhir.Model.DomainResource
   {
     /// <summary>
@@ -109,7 +109,7 @@ public enum ProvenanceEntityRole
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Provenance#Agent", IsNestedType=true)]
+    [FhirType("Provenance#Agent")]
     [BackboneType("Provenance.agent")]
     public partial class AgentComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -320,7 +320,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Provenance#Entity", IsNestedType=true)]
+    [FhirType("Provenance#Entity")]
     [BackboneType("Provenance.entity")]
     public partial class EntityComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Questionnaire.cs b/src/Hl7.Fhir.STU3/Model/Generated/Questionnaire.cs
index 1c616d44b5..5abcf6fb33 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/Questionnaire.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/Questionnaire.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Questionnaire","http://hl7.org/fhir/StructureDefinition/Questionnaire", IsResource=true)]
+  [FhirType("Questionnaire","http://hl7.org/fhir/StructureDefinition/Questionnaire")]
   public partial class Questionnaire : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -174,7 +174,7 @@ public enum QuestionnaireItemType
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Questionnaire#Item", IsNestedType=true)]
+    [FhirType("Questionnaire#Item")]
     [BackboneType("Questionnaire.item")]
     public partial class ItemComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -829,7 +829,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Questionnaire#EnableWhen", IsNestedType=true)]
+    [FhirType("Questionnaire#EnableWhen")]
     [BackboneType("Questionnaire.item.enableWhen")]
     public partial class EnableWhenComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1047,7 +1047,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Questionnaire#Option", IsNestedType=true)]
+    [FhirType("Questionnaire#Option")]
     [BackboneType("Questionnaire.item.option")]
     public partial class OptionComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/QuestionnaireResponse.cs b/src/Hl7.Fhir.STU3/Model/Generated/QuestionnaireResponse.cs
index 99c0862c7f..6b9b4c2e49 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/QuestionnaireResponse.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/QuestionnaireResponse.cs
@@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("QuestionnaireResponse","http://hl7.org/fhir/StructureDefinition/QuestionnaireResponse", IsResource=true)]
+  [FhirType("QuestionnaireResponse","http://hl7.org/fhir/StructureDefinition/QuestionnaireResponse")]
   public partial class QuestionnaireResponse : Hl7.Fhir.Model.DomainResource, IIdentifiable<Identifier>
   {
     /// <summary>
@@ -109,7 +109,7 @@ public enum QuestionnaireResponseStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("QuestionnaireResponse#Item", IsNestedType=true)]
+    [FhirType("QuestionnaireResponse#Item")]
     [BackboneType("QuestionnaireResponse.item")]
     public partial class ItemComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -420,7 +420,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("QuestionnaireResponse#Answer", IsNestedType=true)]
+    [FhirType("QuestionnaireResponse#Answer")]
     [BackboneType("QuestionnaireResponse.item.answer")]
     public partial class AnswerComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/ReferralRequest.cs b/src/Hl7.Fhir.STU3/Model/Generated/ReferralRequest.cs
index 24871f53bc..cbb5c39ce5 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/ReferralRequest.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/ReferralRequest.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("ReferralRequest","http://hl7.org/fhir/StructureDefinition/ReferralRequest", IsResource=true)]
+  [FhirType("ReferralRequest","http://hl7.org/fhir/StructureDefinition/ReferralRequest")]
   public partial class ReferralRequest : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -67,7 +67,7 @@ public partial class ReferralRequest : Hl7.Fhir.Model.DomainResource, IIdentifia
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ReferralRequest#Requester", IsNestedType=true)]
+    [FhirType("ReferralRequest#Requester")]
     [BackboneType("ReferralRequest.requester")]
     public partial class RequesterComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/RelatedPerson.cs b/src/Hl7.Fhir.STU3/Model/Generated/RelatedPerson.cs
index 467f9d426c..b31780143d 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/RelatedPerson.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/RelatedPerson.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("RelatedPerson","http://hl7.org/fhir/StructureDefinition/RelatedPerson", IsResource=true)]
+  [FhirType("RelatedPerson","http://hl7.org/fhir/StructureDefinition/RelatedPerson")]
   public partial class RelatedPerson : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/RequestGroup.cs b/src/Hl7.Fhir.STU3/Model/Generated/RequestGroup.cs
index f4d143f257..91389a5959 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/RequestGroup.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/RequestGroup.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("RequestGroup","http://hl7.org/fhir/StructureDefinition/RequestGroup", IsResource=true)]
+  [FhirType("RequestGroup","http://hl7.org/fhir/StructureDefinition/RequestGroup")]
   public partial class RequestGroup : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -67,7 +67,7 @@ public partial class RequestGroup : Hl7.Fhir.Model.DomainResource, IIdentifiable
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("RequestGroup#Action", IsNestedType=true)]
+    [FhirType("RequestGroup#Action")]
     [BackboneType("RequestGroup.action")]
     public partial class ActionComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -803,7 +803,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("RequestGroup#Condition", IsNestedType=true)]
+    [FhirType("RequestGroup#Condition")]
     [BackboneType("RequestGroup.action.condition")]
     public partial class ConditionComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1079,7 +1079,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("RequestGroup#RelatedAction", IsNestedType=true)]
+    [FhirType("RequestGroup#RelatedAction")]
     [BackboneType("RequestGroup.action.relatedAction")]
     public partial class RelatedActionComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/ResearchStudy.cs b/src/Hl7.Fhir.STU3/Model/Generated/ResearchStudy.cs
index 0ec67bf632..4437c6bb74 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/ResearchStudy.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/ResearchStudy.cs
@@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("ResearchStudy","http://hl7.org/fhir/StructureDefinition/ResearchStudy", IsResource=true)]
+  [FhirType("ResearchStudy","http://hl7.org/fhir/StructureDefinition/ResearchStudy")]
   public partial class ResearchStudy : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -114,7 +114,7 @@ public enum ResearchStudyStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ResearchStudy#Arm", IsNestedType=true)]
+    [FhirType("ResearchStudy#Arm")]
     [BackboneType("ResearchStudy.arm")]
     public partial class ArmComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/ResearchSubject.cs b/src/Hl7.Fhir.STU3/Model/Generated/ResearchSubject.cs
index a3adf329ae..30ea90a599 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/ResearchSubject.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/ResearchSubject.cs
@@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("ResearchSubject","http://hl7.org/fhir/StructureDefinition/ResearchSubject", IsResource=true)]
+  [FhirType("ResearchSubject","http://hl7.org/fhir/StructureDefinition/ResearchSubject")]
   public partial class ResearchSubject : Hl7.Fhir.Model.DomainResource, IIdentifiable<Identifier>
   {
     /// <summary>
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/RiskAssessment.cs b/src/Hl7.Fhir.STU3/Model/Generated/RiskAssessment.cs
index a3ba1c3cdc..9574aafc4d 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/RiskAssessment.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/RiskAssessment.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("RiskAssessment","http://hl7.org/fhir/StructureDefinition/RiskAssessment", IsResource=true)]
+  [FhirType("RiskAssessment","http://hl7.org/fhir/StructureDefinition/RiskAssessment")]
   public partial class RiskAssessment : Hl7.Fhir.Model.DomainResource, IIdentifiable<Identifier>
   {
     /// <summary>
@@ -68,7 +68,7 @@ public partial class RiskAssessment : Hl7.Fhir.Model.DomainResource, IIdentifiab
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("RiskAssessment#Prediction", IsNestedType=true)]
+    [FhirType("RiskAssessment#Prediction")]
     [BackboneType("RiskAssessment.prediction")]
     public partial class PredictionComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Schedule.cs b/src/Hl7.Fhir.STU3/Model/Generated/Schedule.cs
index 500497945a..18dbdfc66b 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/Schedule.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/Schedule.cs
@@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model
   /// </summary>
   [Serializable]
   [DataContract]
-  [FhirType("Schedule","http://hl7.org/fhir/StructureDefinition/Schedule", IsResource=true)]
+  [FhirType("Schedule","http://hl7.org/fhir/StructureDefinition/Schedule")]
   public partial class Schedule : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/SearchParameter.cs b/src/Hl7.Fhir.STU3/Model/Generated/SearchParameter.cs
index dcda0e4c83..8a761a8243 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/SearchParameter.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/SearchParameter.cs
@@ -52,7 +52,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("SearchParameter","http://hl7.org/fhir/StructureDefinition/SearchParameter", IsResource=true)]
+  [FhirType("SearchParameter","http://hl7.org/fhir/StructureDefinition/SearchParameter")]
   public partial class SearchParameter : Hl7.Fhir.Model.DomainResource
   {
     /// <summary>
@@ -242,7 +242,7 @@ public enum SearchModifierCode
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("SearchParameter#Component", IsNestedType=true)]
+    [FhirType("SearchParameter#Component")]
     [BackboneType("SearchParameter.component")]
     public partial class ComponentComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Sequence.cs b/src/Hl7.Fhir.STU3/Model/Generated/Sequence.cs
index 0c93b7a8a3..a73ff0be4a 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/Sequence.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/Sequence.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Sequence","http://hl7.org/fhir/StructureDefinition/Sequence", IsResource=true)]
+  [FhirType("Sequence","http://hl7.org/fhir/StructureDefinition/Sequence")]
   public partial class Sequence : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -135,7 +135,7 @@ public enum RepositoryType
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Sequence#ReferenceSeq", IsNestedType=true)]
+    [FhirType("Sequence#ReferenceSeq")]
     [BackboneType("Sequence.referenceSeq")]
     public partial class ReferenceSeqComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -532,7 +532,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Sequence#Variant", IsNestedType=true)]
+    [FhirType("Sequence#Variant")]
     [BackboneType("Sequence.variant")]
     public partial class VariantComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -875,7 +875,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Sequence#Quality", IsNestedType=true)]
+    [FhirType("Sequence#Quality")]
     [BackboneType("Sequence.quality")]
     public partial class QualityComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1529,7 +1529,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Sequence#Repository", IsNestedType=true)]
+    [FhirType("Sequence#Repository")]
     [BackboneType("Sequence.repository")]
     public partial class RepositoryComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/ServiceDefinition.cs b/src/Hl7.Fhir.STU3/Model/Generated/ServiceDefinition.cs
index d0893c22ce..0b06216d19 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/ServiceDefinition.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/ServiceDefinition.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("ServiceDefinition","http://hl7.org/fhir/StructureDefinition/ServiceDefinition", IsResource=true)]
+  [FhirType("ServiceDefinition","http://hl7.org/fhir/StructureDefinition/ServiceDefinition")]
   public partial class ServiceDefinition : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Slot.cs b/src/Hl7.Fhir.STU3/Model/Generated/Slot.cs
index 155585efe1..fd7d75e892 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/Slot.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/Slot.cs
@@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model
   /// </summary>
   [Serializable]
   [DataContract]
-  [FhirType("Slot","http://hl7.org/fhir/StructureDefinition/Slot", IsResource=true)]
+  [FhirType("Slot","http://hl7.org/fhir/StructureDefinition/Slot")]
   public partial class Slot : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Specimen.cs b/src/Hl7.Fhir.STU3/Model/Generated/Specimen.cs
index 658b93b57a..4a8be9edb6 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/Specimen.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/Specimen.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Specimen","http://hl7.org/fhir/StructureDefinition/Specimen", IsResource=true)]
+  [FhirType("Specimen","http://hl7.org/fhir/StructureDefinition/Specimen")]
   public partial class Specimen : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -101,7 +101,7 @@ public enum SpecimenStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Specimen#Collection", IsNestedType=true)]
+    [FhirType("Specimen#Collection")]
     [BackboneType("Specimen.collection")]
     public partial class CollectionComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -333,7 +333,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Specimen#Processing", IsNestedType=true)]
+    [FhirType("Specimen#Processing")]
     [BackboneType("Specimen.processing")]
     public partial class ProcessingComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -558,7 +558,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Specimen#Container", IsNestedType=true)]
+    [FhirType("Specimen#Container")]
     [BackboneType("Specimen.container")]
     public partial class ContainerComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/StructureDefinition.cs b/src/Hl7.Fhir.STU3/Model/Generated/StructureDefinition.cs
index 1da7f6de2b..a3588ad4ac 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/StructureDefinition.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/StructureDefinition.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("StructureDefinition","http://hl7.org/fhir/StructureDefinition/StructureDefinition", IsResource=true)]
+  [FhirType("StructureDefinition","http://hl7.org/fhir/StructureDefinition/StructureDefinition")]
   public partial class StructureDefinition : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -151,7 +151,7 @@ public enum TypeDerivationRule
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("StructureDefinition#Mapping", IsNestedType=true)]
+    [FhirType("StructureDefinition#Mapping")]
     [BackboneType("StructureDefinition.mapping")]
     public partial class MappingComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -425,7 +425,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("StructureDefinition#Snapshot", IsNestedType=true)]
+    [FhirType("StructureDefinition#Snapshot")]
     [BackboneType("StructureDefinition.snapshot")]
     public partial class SnapshotComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -552,7 +552,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("StructureDefinition#Differential", IsNestedType=true)]
+    [FhirType("StructureDefinition#Differential")]
     [BackboneType("StructureDefinition.differential")]
     public partial class DifferentialComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/StructureMap.cs b/src/Hl7.Fhir.STU3/Model/Generated/StructureMap.cs
index e6e7fab0eb..b5e3986a2a 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/StructureMap.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/StructureMap.cs
@@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model
   /// </summary>
   [Serializable]
   [DataContract]
-  [FhirType("StructureMap","http://hl7.org/fhir/StructureDefinition/StructureMap", IsResource=true)]
+  [FhirType("StructureMap","http://hl7.org/fhir/StructureDefinition/StructureMap")]
   public partial class StructureMap : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -357,7 +357,7 @@ public enum StructureMapTransform
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("StructureMap#Structure", IsNestedType=true)]
+    [FhirType("StructureMap#Structure")]
     [BackboneType("StructureMap.structure")]
     public partial class StructureComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -634,7 +634,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("StructureMap#Group", IsNestedType=true)]
+    [FhirType("StructureMap#Group")]
     [BackboneType("StructureMap.group")]
     public partial class GroupComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -964,7 +964,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("StructureMap#Input", IsNestedType=true)]
+    [FhirType("StructureMap#Input")]
     [BackboneType("StructureMap.group.input")]
     public partial class InputComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1238,7 +1238,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("StructureMap#Rule", IsNestedType=true)]
+    [FhirType("StructureMap#Rule")]
     [BackboneType("StructureMap.group.rule")]
     public partial class RuleComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1527,7 +1527,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("StructureMap#Source", IsNestedType=true)]
+    [FhirType("StructureMap#Source")]
     [BackboneType("StructureMap.group.rule.source")]
     public partial class SourceComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2042,7 +2042,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("StructureMap#Target", IsNestedType=true)]
+    [FhirType("StructureMap#Target")]
     [BackboneType("StructureMap.group.rule.target")]
     public partial class TargetComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2474,7 +2474,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("StructureMap#Parameter", IsNestedType=true)]
+    [FhirType("StructureMap#Parameter")]
     [BackboneType("StructureMap.group.rule.target.parameter")]
     public partial class ParameterComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2600,7 +2600,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("StructureMap#Dependent", IsNestedType=true)]
+    [FhirType("StructureMap#Dependent")]
     [BackboneType("StructureMap.group.rule.dependent")]
     public partial class DependentComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Subscription.cs b/src/Hl7.Fhir.STU3/Model/Generated/Subscription.cs
index c7e1eb5434..80174c605b 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/Subscription.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/Subscription.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("Subscription","http://hl7.org/fhir/StructureDefinition/Subscription", IsResource=true)]
+  [FhirType("Subscription","http://hl7.org/fhir/StructureDefinition/Subscription")]
   public partial class Subscription : Hl7.Fhir.Model.DomainResource
   {
     /// <summary>
@@ -141,7 +141,7 @@ public enum SubscriptionChannelType
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Subscription#Channel", IsNestedType=true)]
+    [FhirType("Subscription#Channel")]
     [BackboneType("Subscription.channel")]
     public partial class ChannelComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Substance.cs b/src/Hl7.Fhir.STU3/Model/Generated/Substance.cs
index f7713e86a7..9f751a503a 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/Substance.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/Substance.cs
@@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model
   /// </summary>
   [Serializable]
   [DataContract]
-  [FhirType("Substance","http://hl7.org/fhir/StructureDefinition/Substance", IsResource=true)]
+  [FhirType("Substance","http://hl7.org/fhir/StructureDefinition/Substance")]
   public partial class Substance : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -92,7 +92,7 @@ public enum FHIRSubstanceStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Substance#Instance", IsNestedType=true)]
+    [FhirType("Substance#Instance")]
     [BackboneType("Substance.instance")]
     public partial class InstanceComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -286,7 +286,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Substance#Ingredient", IsNestedType=true)]
+    [FhirType("Substance#Ingredient")]
     [BackboneType("Substance.ingredient")]
     public partial class IngredientComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/SupplyDelivery.cs b/src/Hl7.Fhir.STU3/Model/Generated/SupplyDelivery.cs
index 7c2b6296cb..bbdb871ea6 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/SupplyDelivery.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/SupplyDelivery.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("SupplyDelivery","http://hl7.org/fhir/StructureDefinition/SupplyDelivery", IsResource=true)]
+  [FhirType("SupplyDelivery","http://hl7.org/fhir/StructureDefinition/SupplyDelivery")]
   public partial class SupplyDelivery : Hl7.Fhir.Model.DomainResource, IIdentifiable<Identifier>
   {
     /// <summary>
@@ -123,7 +123,7 @@ public enum SupplyItemType
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("SupplyDelivery#SuppliedItem", IsNestedType=true)]
+    [FhirType("SupplyDelivery#SuppliedItem")]
     [BackboneType("SupplyDelivery.suppliedItem")]
     public partial class SuppliedItemComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/SupplyRequest.cs b/src/Hl7.Fhir.STU3/Model/Generated/SupplyRequest.cs
index e7be91a3fd..14af537cae 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/SupplyRequest.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/SupplyRequest.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("SupplyRequest","http://hl7.org/fhir/StructureDefinition/SupplyRequest", IsResource=true)]
+  [FhirType("SupplyRequest","http://hl7.org/fhir/StructureDefinition/SupplyRequest")]
   public partial class SupplyRequest : Hl7.Fhir.Model.DomainResource, IIdentifiable<Identifier>
   {
     /// <summary>
@@ -116,7 +116,7 @@ public enum SupplyRequestStatus
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SupplyRequest#OrderedItem", IsNestedType=true)]
+    [FhirType("SupplyRequest#OrderedItem")]
     [BackboneType("SupplyRequest.orderedItem")]
     public partial class OrderedItemComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -272,7 +272,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("SupplyRequest#Requester", IsNestedType=true)]
+    [FhirType("SupplyRequest#Requester")]
     [BackboneType("SupplyRequest.requester")]
     public partial class RequesterComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Task.cs b/src/Hl7.Fhir.STU3/Model/Generated/Task.cs
index 32eb4c6ac1..db4a1b9c2e 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/Task.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/Task.cs
@@ -48,7 +48,7 @@ namespace Hl7.Fhir.Model
   /// </summary>
   [Serializable]
   [DataContract]
-  [FhirType("Task","http://hl7.org/fhir/StructureDefinition/Task", IsResource=true)]
+  [FhirType("Task","http://hl7.org/fhir/StructureDefinition/Task")]
   public partial class Task : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -146,7 +146,7 @@ public enum TaskStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Task#Requester", IsNestedType=true)]
+    [FhirType("Task#Requester")]
     [BackboneType("Task.requester")]
     public partial class RequesterComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -302,7 +302,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Task#Restriction", IsNestedType=true)]
+    [FhirType("Task#Restriction")]
     [BackboneType("Task.restriction")]
     public partial class RestrictionComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -499,7 +499,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Task#Parameter", IsNestedType=true)]
+    [FhirType("Task#Parameter")]
     [BackboneType("Task.input")]
     public partial class ParameterComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -655,7 +655,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Task#Output", IsNestedType=true)]
+    [FhirType("Task#Output")]
     [BackboneType("Task.output")]
     public partial class OutputComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/TestReport.cs b/src/Hl7.Fhir.STU3/Model/Generated/TestReport.cs
index 59dd0ede90..572cddbf8b 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/TestReport.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/TestReport.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("TestReport","http://hl7.org/fhir/StructureDefinition/TestReport", IsResource=true)]
+  [FhirType("TestReport","http://hl7.org/fhir/StructureDefinition/TestReport")]
   public partial class TestReport : Hl7.Fhir.Model.DomainResource, IIdentifiable<Identifier>
   {
     /// <summary>
@@ -200,7 +200,7 @@ public enum TestReportActionResult
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("TestReport#Participant", IsNestedType=true)]
+    [FhirType("TestReport#Participant")]
     [BackboneType("TestReport.participant")]
     public partial class ParticipantComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -431,7 +431,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("TestReport#Setup", IsNestedType=true)]
+    [FhirType("TestReport#Setup")]
     [BackboneType("TestReport.setup")]
     public partial class SetupComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -559,7 +559,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestReport#SetupAction", IsNestedType=true)]
+    [FhirType("TestReport#SetupAction")]
     [BackboneType("TestReport.setup.action")]
     public partial class SetupActionComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -710,7 +710,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestReport#Operation", IsNestedType=true)]
+    [FhirType("TestReport#Operation")]
     [BackboneType("TestReport.setup.action.operation")]
     public partial class OperationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -943,7 +943,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestReport#Assert", IsNestedType=true)]
+    [FhirType("TestReport#Assert")]
     [BackboneType("TestReport.setup.action.assert")]
     public partial class AssertComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1173,7 +1173,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("TestReport#Test", IsNestedType=true)]
+    [FhirType("TestReport#Test")]
     [BackboneType("TestReport.test")]
     public partial class TestComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1387,7 +1387,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestReport#TestAction", IsNestedType=true)]
+    [FhirType("TestReport#TestAction")]
     [BackboneType("TestReport.test.action")]
     public partial class TestActionComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1538,7 +1538,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestReport#Teardown", IsNestedType=true)]
+    [FhirType("TestReport#Teardown")]
     [BackboneType("TestReport.teardown")]
     public partial class TeardownComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1666,7 +1666,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestReport#TeardownAction", IsNestedType=true)]
+    [FhirType("TestReport#TeardownAction")]
     [BackboneType("TestReport.teardown.action")]
     public partial class TeardownActionComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/TestScript.cs b/src/Hl7.Fhir.STU3/Model/Generated/TestScript.cs
index 839d019789..056a599635 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/TestScript.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/TestScript.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("TestScript","http://hl7.org/fhir/StructureDefinition/TestScript", IsResource=true)]
+  [FhirType("TestScript","http://hl7.org/fhir/StructureDefinition/TestScript")]
   public partial class TestScript : Hl7.Fhir.Model.DomainResource, IIdentifiable<Identifier>
   {
     /// <summary>
@@ -328,7 +328,7 @@ public enum AssertionResponseTypes
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#Origin", IsNestedType=true)]
+    [FhirType("TestScript#Origin")]
     [BackboneType("TestScript.origin")]
     public partial class OriginComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -501,7 +501,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#Destination", IsNestedType=true)]
+    [FhirType("TestScript#Destination")]
     [BackboneType("TestScript.destination")]
     public partial class DestinationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -673,7 +673,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#Metadata", IsNestedType=true)]
+    [FhirType("TestScript#Metadata")]
     [BackboneType("TestScript.metadata")]
     public partial class MetadataComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -826,7 +826,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#Link", IsNestedType=true)]
+    [FhirType("TestScript#Link")]
     [BackboneType("TestScript.metadata.link")]
     public partial class LinkComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1015,7 +1015,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#Capability", IsNestedType=true)]
+    [FhirType("TestScript#Capability")]
     [BackboneType("TestScript.metadata.capability")]
     public partial class CapabilityComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1404,7 +1404,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#Fixture", IsNestedType=true)]
+    [FhirType("TestScript#Fixture")]
     [BackboneType("TestScript.fixture")]
     public partial class FixtureComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1619,7 +1619,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#Variable", IsNestedType=true)]
+    [FhirType("TestScript#Variable")]
     [BackboneType("TestScript.variable")]
     public partial class VariableComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2066,7 +2066,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#Rule", IsNestedType=true)]
+    [FhirType("TestScript#Rule")]
     [BackboneType("TestScript.rule")]
     public partial class RuleComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2222,7 +2222,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#RuleParam", IsNestedType=true)]
+    [FhirType("TestScript#RuleParam")]
     [BackboneType("TestScript.rule.param")]
     public partial class RuleParamComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2411,7 +2411,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#Ruleset", IsNestedType=true)]
+    [FhirType("TestScript#Ruleset")]
     [BackboneType("TestScript.ruleset")]
     public partial class RulesetComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2567,7 +2567,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#RulesetRule", IsNestedType=true)]
+    [FhirType("TestScript#RulesetRule")]
     [BackboneType("TestScript.ruleset.rule")]
     public partial class RulesetRuleComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2739,7 +2739,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#RulesetRuleParam", IsNestedType=true)]
+    [FhirType("TestScript#RulesetRuleParam")]
     [BackboneType("TestScript.ruleset.rule.param")]
     public partial class RulesetRuleParamComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -2924,7 +2924,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#Setup", IsNestedType=true)]
+    [FhirType("TestScript#Setup")]
     [BackboneType("TestScript.setup")]
     public partial class SetupComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -3052,7 +3052,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#SetupAction", IsNestedType=true)]
+    [FhirType("TestScript#SetupAction")]
     [BackboneType("TestScript.setup.action")]
     public partial class SetupActionComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -3203,7 +3203,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#Operation", IsNestedType=true)]
+    [FhirType("TestScript#Operation")]
     [BackboneType("TestScript.setup.action.operation")]
     public partial class OperationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -3965,7 +3965,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#RequestHeader", IsNestedType=true)]
+    [FhirType("TestScript#RequestHeader")]
     [BackboneType("TestScript.setup.action.operation.requestHeader")]
     public partial class RequestHeaderComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -4155,7 +4155,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#Assert", IsNestedType=true)]
+    [FhirType("TestScript#Assert")]
     [BackboneType("TestScript.setup.action.assert")]
     public partial class AssertComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -5265,7 +5265,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#ActionAssertRule", IsNestedType=true)]
+    [FhirType("TestScript#ActionAssertRule")]
     [BackboneType("TestScript.setup.action.assert.rule")]
     public partial class ActionAssertRuleComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -5437,7 +5437,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#ActionAssertRuleParam", IsNestedType=true)]
+    [FhirType("TestScript#ActionAssertRuleParam")]
     [BackboneType("TestScript.setup.action.assert.rule.param")]
     public partial class ActionAssertRuleParamComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -5627,7 +5627,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#ActionAssertRuleset", IsNestedType=true)]
+    [FhirType("TestScript#ActionAssertRuleset")]
     [BackboneType("TestScript.setup.action.assert.ruleset")]
     public partial class ActionAssertRulesetComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -5799,7 +5799,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#ActionAssertRulesetRule", IsNestedType=true)]
+    [FhirType("TestScript#ActionAssertRulesetRule")]
     [BackboneType("TestScript.setup.action.assert.ruleset.rule")]
     public partial class ActionAssertRulesetRuleComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -5971,7 +5971,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#Param", IsNestedType=true)]
+    [FhirType("TestScript#Param")]
     [BackboneType("TestScript.setup.action.assert.ruleset.rule.param")]
     public partial class ParamComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -6157,7 +6157,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#Test", IsNestedType=true)]
+    [FhirType("TestScript#Test")]
     [BackboneType("TestScript.test")]
     public partial class TestComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -6371,7 +6371,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#TestAction", IsNestedType=true)]
+    [FhirType("TestScript#TestAction")]
     [BackboneType("TestScript.test.action")]
     public partial class TestActionComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -6522,7 +6522,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#Teardown", IsNestedType=true)]
+    [FhirType("TestScript#Teardown")]
     [BackboneType("TestScript.teardown")]
     public partial class TeardownComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -6650,7 +6650,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#TeardownAction", IsNestedType=true)]
+    [FhirType("TestScript#TeardownAction")]
     [BackboneType("TestScript.teardown.action")]
     public partial class TeardownActionComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Timing.cs b/src/Hl7.Fhir.STU3/Model/Generated/Timing.cs
index f863dd75f0..f1dbbd33eb 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/Timing.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/Timing.cs
@@ -248,7 +248,7 @@ public enum EventTiming
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Timing#Repeat", IsNestedType=true)]
+    [FhirType("Timing#Repeat")]
     [BackboneType("Timing.repeat")]
     public partial class RepeatComponent : Hl7.Fhir.Model.Element
     {
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/ValueSet.cs b/src/Hl7.Fhir.STU3/Model/Generated/ValueSet.cs
index ea725d6494..5300ef5f0c 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/ValueSet.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/ValueSet.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("ValueSet","http://hl7.org/fhir/StructureDefinition/ValueSet", IsResource=true)]
+  [FhirType("ValueSet","http://hl7.org/fhir/StructureDefinition/ValueSet")]
   public partial class ValueSet : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -67,7 +67,7 @@ public partial class ValueSet : Hl7.Fhir.Model.DomainResource, IIdentifiable<Lis
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ValueSet#Compose", IsNestedType=true)]
+    [FhirType("ValueSet#Compose")]
     [BackboneType("ValueSet.compose")]
     public partial class ComposeComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -306,7 +306,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ValueSet#ConceptSet", IsNestedType=true)]
+    [FhirType("ValueSet#ConceptSet")]
     [BackboneType("ValueSet.compose.include")]
     public partial class ConceptSetComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -590,7 +590,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ValueSet#ConceptReference", IsNestedType=true)]
+    [FhirType("ValueSet#ConceptReference")]
     [BackboneType("ValueSet.compose.include.concept")]
     public partial class ConceptReferenceComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -804,7 +804,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ValueSet#Designation", IsNestedType=true)]
+    [FhirType("ValueSet#Designation")]
     [BackboneType("ValueSet.compose.include.concept.designation")]
     public partial class DesignationComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1020,7 +1020,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ValueSet#Filter", IsNestedType=true)]
+    [FhirType("ValueSet#Filter")]
     [BackboneType("ValueSet.compose.include.filter")]
     public partial class FilterComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1256,7 +1256,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ValueSet#Expansion", IsNestedType=true)]
+    [FhirType("ValueSet#Expansion")]
     [BackboneType("ValueSet.expansion")]
     public partial class ExpansionComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1584,7 +1584,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ValueSet#Parameter", IsNestedType=true)]
+    [FhirType("ValueSet#Parameter")]
     [BackboneType("ValueSet.expansion.parameter")]
     public partial class ParameterComponent : Hl7.Fhir.Model.BackboneElement
     {
@@ -1756,7 +1756,7 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ValueSet#Contains", IsNestedType=true)]
+    [FhirType("ValueSet#Contains")]
     [BackboneType("ValueSet.expansion.contains")]
     public partial class ContainsComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/VisionPrescription.cs b/src/Hl7.Fhir.STU3/Model/Generated/VisionPrescription.cs
index b49b8bf86e..e2db17de91 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/VisionPrescription.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/VisionPrescription.cs
@@ -51,7 +51,7 @@ namespace Hl7.Fhir.Model
   /// </remarks>
   [Serializable]
   [DataContract]
-  [FhirType("VisionPrescription","http://hl7.org/fhir/StructureDefinition/VisionPrescription", IsResource=true)]
+  [FhirType("VisionPrescription","http://hl7.org/fhir/StructureDefinition/VisionPrescription")]
   public partial class VisionPrescription : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<Identifier>>
   {
     /// <summary>
@@ -123,7 +123,7 @@ public enum VisionBase
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("VisionPrescription#Dispense", IsNestedType=true)]
+    [FhirType("VisionPrescription#Dispense")]
     [BackboneType("VisionPrescription.dispense")]
     public partial class DispenseComponent : Hl7.Fhir.Model.BackboneElement
     {
diff --git a/src/Hl7.Fhir.Shared.Tests/Validation/SearchDataExtraction.cs b/src/Hl7.Fhir.Shared.Tests/Validation/SearchDataExtraction.cs
index 6e4f982a63..6ba46b326b 100644
--- a/src/Hl7.Fhir.Shared.Tests/Validation/SearchDataExtraction.cs
+++ b/src/Hl7.Fhir.Shared.Tests/Validation/SearchDataExtraction.cs
@@ -131,7 +131,7 @@ private static void ExtractExamplesFromResource(Dictionary<string, int> exampleS
             try
             {
                 // we perform the Select on a Poco, because then we get the FHIR dialect of FhirPath as well.
-                results = resource.Select(index.Expression, new FhirEvaluationContext(resource.ToTypedElement()) { ElementResolver = mockResolver });
+                results = resource.Select(index.Expression, new FhirEvaluationContext { ElementResolver = mockResolver });
             }
             catch (Exception)
             {
@@ -189,4 +189,4 @@ private static ITypedElement mockResolver(string url)
             return null;
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/Hl7.Fhir.Specification.Shared.Tests/Snapshot/SnapshotGeneratorManifestTests.cs b/src/Hl7.Fhir.Specification.Shared.Tests/Snapshot/SnapshotGeneratorManifestTests.cs
index 75f814e8a0..9e422ac5e8 100644
--- a/src/Hl7.Fhir.Specification.Shared.Tests/Snapshot/SnapshotGeneratorManifestTests.cs
+++ b/src/Hl7.Fhir.Specification.Shared.Tests/Snapshot/SnapshotGeneratorManifestTests.cs
@@ -83,7 +83,7 @@ public class SnapshotGeneratorManifestTests
 
         static readonly SnapshotGeneratorSettings _snapGenSettings = new SnapshotGeneratorSettings()
         {
-            ForceRegenerateSnapshots = true,
+            RegenerationBehaviour = RegenerationSettings.REGENERATE_ONCE,
             GenerateSnapshotForExternalProfiles = true
         };
 
@@ -788,7 +788,7 @@ class SnapshotEvaluationContext : FhirEvaluationContext
 
             public SnapshotEvaluationContext(
                 string testPath, IResourceResolver resolver, string id,
-                StructureDefinition input, StructureDefinition generated) : base(generated.ToTypedElement())
+                StructureDefinition input, StructureDefinition generated)
             {
                 _testPath = testPath ?? throw new ArgumentNullException(nameof(testPath));
                 TestResolver = resolver ?? throw new ArgumentNullException(nameof(resolver));
@@ -799,6 +799,8 @@ public SnapshotEvaluationContext(
                 Id = id ?? throw new ArgumentNullException(nameof(id));
                 Assert.AreEqual(id, generated.Id);
                 this.Tracer = this.Trace;
+
+                WithResourceOverrides(Generated);
             }
 
             void Trace(string msg, IEnumerable<ITypedElement> elems)
diff --git a/src/Hl7.Fhir.Specification.Shared.Tests/Snapshot/SnapshotGeneratorTest.cs b/src/Hl7.Fhir.Specification.Shared.Tests/Snapshot/SnapshotGeneratorTest.cs
index 48fb3b9acd..125a983907 100644
--- a/src/Hl7.Fhir.Specification.Shared.Tests/Snapshot/SnapshotGeneratorTest.cs
+++ b/src/Hl7.Fhir.Specification.Shared.Tests/Snapshot/SnapshotGeneratorTest.cs
@@ -57,7 +57,7 @@ public partial class SnapshotGeneratorTest2
         {
             // Throw on unresolved profile references; must include in TestData folder
             GenerateSnapshotForExternalProfiles = true,
-            ForceRegenerateSnapshots = true,
+            RegenerationBehaviour = RegenerationSettings.REGENERATE_ONCE,
             GenerateExtensionsOnConstraints = false,
             GenerateAnnotationsOnConstraints = false,
             GenerateElementIds = true // STU3

From 3c7459d29bfe0456a07adbf5315798b8a19de838 Mon Sep 17 00:00:00 2001
From: Ewout Kramer <ewout@fire.ly>
Date: Fri, 18 Oct 2024 17:08:39 +0200
Subject: [PATCH 06/18] Binary changes.

---
 .../CompatibilitySuppressions.xml             | 56 +++++++++++++++++++
 1 file changed, 56 insertions(+)

diff --git a/src/Hl7.Fhir.Base/CompatibilitySuppressions.xml b/src/Hl7.Fhir.Base/CompatibilitySuppressions.xml
index 3115716df0..cf40ed7530 100644
--- a/src/Hl7.Fhir.Base/CompatibilitySuppressions.xml
+++ b/src/Hl7.Fhir.Base/CompatibilitySuppressions.xml
@@ -7,6 +7,34 @@
     <Left>lib/netstandard2.0/Hl7.Fhir.Base.dll</Left>
     <Right>lib/net8.0/Hl7.Fhir.Base.dll</Right>
   </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:Hl7.Fhir.Introspection.FhirTypeAttribute.get_IsNestedType</Target>
+    <Left>lib/net8.0/Hl7.Fhir.Base.dll</Left>
+    <Right>lib/net8.0/Hl7.Fhir.Base.dll</Right>
+    <IsBaselineSuppression>true</IsBaselineSuppression>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:Hl7.Fhir.Introspection.FhirTypeAttribute.get_IsResource</Target>
+    <Left>lib/net8.0/Hl7.Fhir.Base.dll</Left>
+    <Right>lib/net8.0/Hl7.Fhir.Base.dll</Right>
+    <IsBaselineSuppression>true</IsBaselineSuppression>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:Hl7.Fhir.Introspection.FhirTypeAttribute.set_IsNestedType(System.Boolean)</Target>
+    <Left>lib/net8.0/Hl7.Fhir.Base.dll</Left>
+    <Right>lib/net8.0/Hl7.Fhir.Base.dll</Right>
+    <IsBaselineSuppression>true</IsBaselineSuppression>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:Hl7.Fhir.Introspection.FhirTypeAttribute.set_IsResource(System.Boolean)</Target>
+    <Left>lib/net8.0/Hl7.Fhir.Base.dll</Left>
+    <Right>lib/net8.0/Hl7.Fhir.Base.dll</Right>
+    <IsBaselineSuppression>true</IsBaselineSuppression>
+  </Suppression>
   <Suppression>
     <DiagnosticId>CP0002</DiagnosticId>
     <Target>M:Hl7.Fhir.Model.Parameters.get_Item(System.String)</Target>
@@ -21,6 +49,34 @@
     <Right>lib/net8.0/Hl7.Fhir.Base.dll</Right>
     <IsBaselineSuppression>true</IsBaselineSuppression>
   </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:Hl7.Fhir.Introspection.FhirTypeAttribute.get_IsNestedType</Target>
+    <Left>lib/netstandard2.0/Hl7.Fhir.Base.dll</Left>
+    <Right>lib/netstandard2.0/Hl7.Fhir.Base.dll</Right>
+    <IsBaselineSuppression>true</IsBaselineSuppression>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:Hl7.Fhir.Introspection.FhirTypeAttribute.get_IsResource</Target>
+    <Left>lib/netstandard2.0/Hl7.Fhir.Base.dll</Left>
+    <Right>lib/netstandard2.0/Hl7.Fhir.Base.dll</Right>
+    <IsBaselineSuppression>true</IsBaselineSuppression>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:Hl7.Fhir.Introspection.FhirTypeAttribute.set_IsNestedType(System.Boolean)</Target>
+    <Left>lib/netstandard2.0/Hl7.Fhir.Base.dll</Left>
+    <Right>lib/netstandard2.0/Hl7.Fhir.Base.dll</Right>
+    <IsBaselineSuppression>true</IsBaselineSuppression>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:Hl7.Fhir.Introspection.FhirTypeAttribute.set_IsResource(System.Boolean)</Target>
+    <Left>lib/netstandard2.0/Hl7.Fhir.Base.dll</Left>
+    <Right>lib/netstandard2.0/Hl7.Fhir.Base.dll</Right>
+    <IsBaselineSuppression>true</IsBaselineSuppression>
+  </Suppression>
   <Suppression>
     <DiagnosticId>CP0002</DiagnosticId>
     <Target>M:Hl7.Fhir.Model.Parameters.get_Item(System.String)</Target>

From 960031eeea9151da5c6815bd71a4a98189bddbf6 Mon Sep 17 00:00:00 2001
From: Ewout Kramer <ewout@fire.ly>
Date: Fri, 18 Oct 2024 17:51:40 +0200
Subject: [PATCH 07/18] Removed BackboneTypeAttribute.

---
 .../CompatibilitySuppressions.xml             |  28 ++++
 .../Introspection/BackboneTypeAttribute.cs    |  35 -----
 .../Introspection/ClassMapping.cs             |  12 +-
 .../Introspection/FhirTypeAttribute.cs        |   5 +
 src/Hl7.Fhir.Base/Model/Generated/Bundle.cs   |  25 ++--
 .../Model/Generated/OperationOutcome.cs       |   5 +-
 .../Model/Generated/Parameters.cs             |   5 +-
 .../Model/Generated/CapabilityStatement.cs    |  65 ++++-----
 .../Model/Generated/CodeSystem.cs             |  25 ++--
 .../Model/Generated/ElementDefinition.cs      |  45 +++---
 .../Model/Generated/StructureDefinition.cs    |  20 ++-
 .../Model/Generated/ValueSet.cs               |  60 ++++----
 src/Hl7.Fhir.R4/Model/Generated/Account.cs    |  10 +-
 .../Model/Generated/ActivityDefinition.cs     |  10 +-
 .../Model/Generated/AdverseEvent.cs           |  10 +-
 .../Model/Generated/AllergyIntolerance.cs     |   5 +-
 .../Model/Generated/Appointment.cs            |   5 +-
 src/Hl7.Fhir.R4/Model/Generated/AuditEvent.cs |  25 ++--
 .../Generated/BiologicallyDerivedProduct.cs   |  20 ++-
 src/Hl7.Fhir.R4/Model/Generated/CarePlan.cs   |  10 +-
 src/Hl7.Fhir.R4/Model/Generated/CareTeam.cs   |   5 +-
 .../Model/Generated/CatalogEntry.cs           |   5 +-
 src/Hl7.Fhir.R4/Model/Generated/ChargeItem.cs |   5 +-
 .../Model/Generated/ChargeItemDefinition.cs   |  15 +-
 src/Hl7.Fhir.R4/Model/Generated/Claim.cs      |  55 +++-----
 .../Model/Generated/ClaimResponse.cs          |  60 ++++----
 .../Model/Generated/ClinicalImpression.cs     |  10 +-
 .../Model/Generated/Communication.cs          |   5 +-
 .../Model/Generated/CommunicationRequest.cs   |   5 +-
 .../Model/Generated/CompartmentDefinition.cs  |   5 +-
 .../Model/Generated/Composition.cs            |  20 ++-
 src/Hl7.Fhir.R4/Model/Generated/ConceptMap.cs |  25 ++--
 src/Hl7.Fhir.R4/Model/Generated/Condition.cs  |  10 +-
 src/Hl7.Fhir.R4/Model/Generated/Consent.cs    |  25 ++--
 src/Hl7.Fhir.R4/Model/Generated/Contract.cs   |  75 ++++------
 src/Hl7.Fhir.R4/Model/Generated/Coverage.cs   |  15 +-
 .../Generated/CoverageEligibilityRequest.cs   |  20 ++-
 .../Generated/CoverageEligibilityResponse.cs  |  20 ++-
 .../Model/Generated/DataRequirement.cs        |  15 +-
 .../Model/Generated/DetectedIssue.cs          |  10 +-
 src/Hl7.Fhir.R4/Model/Generated/Device.cs     |  25 ++--
 .../Model/Generated/DeviceDefinition.cs       |  30 ++--
 .../Model/Generated/DeviceMetric.cs           |   5 +-
 .../Model/Generated/DeviceRequest.cs          |   5 +-
 .../Model/Generated/DiagnosticReport.cs       |   5 +-
 .../Model/Generated/DocumentManifest.cs       |   5 +-
 .../Model/Generated/DocumentReference.cs      |  15 +-
 src/Hl7.Fhir.R4/Model/Generated/Dosage.cs     |   5 +-
 .../Generated/EffectEvidenceSynthesis.cs      |  30 ++--
 src/Hl7.Fhir.R4/Model/Generated/Encounter.cs  |  30 ++--
 .../Model/Generated/EpisodeOfCare.cs          |  10 +-
 .../Model/Generated/EvidenceVariable.cs       |   5 +-
 .../Model/Generated/ExampleScenario.cs        |  40 +++---
 .../Model/Generated/ExplanationOfBenefit.cs   | 100 ++++++--------
 .../Model/Generated/FamilyMemberHistory.cs    |   5 +-
 src/Hl7.Fhir.R4/Model/Generated/Goal.cs       |   5 +-
 .../Model/Generated/GraphDefinition.cs        |  15 +-
 src/Hl7.Fhir.R4/Model/Generated/Group.cs      |  10 +-
 .../Model/Generated/HealthcareService.cs      |  15 +-
 .../Model/Generated/ImagingStudy.cs           |  15 +-
 .../Model/Generated/Immunization.cs           |  20 ++-
 .../Generated/ImmunizationRecommendation.cs   |  10 +-
 .../Model/Generated/ImplementationGuide.cs    |  55 +++-----
 .../Model/Generated/InsurancePlan.cs          |  45 +++---
 src/Hl7.Fhir.R4/Model/Generated/Invoice.cs    |  15 +-
 src/Hl7.Fhir.R4/Model/Generated/Linkage.cs    |   5 +-
 src/Hl7.Fhir.R4/Model/Generated/List.cs       |   5 +-
 src/Hl7.Fhir.R4/Model/Generated/Location.cs   |  10 +-
 src/Hl7.Fhir.R4/Model/Generated/Measure.cs    |  25 ++--
 .../Model/Generated/MeasureReport.cs          |  30 ++--
 src/Hl7.Fhir.R4/Model/Generated/Medication.cs |  10 +-
 .../Generated/MedicationAdministration.cs     |  10 +-
 .../Model/Generated/MedicationDispense.cs     |  10 +-
 .../Model/Generated/MedicationKnowledge.cs    |  80 +++++------
 .../Model/Generated/MedicationRequest.cs      |  15 +-
 .../Model/Generated/MedicinalProduct.cs       |  25 ++--
 .../MedicinalProductAuthorization.cs          |  10 +-
 .../MedicinalProductContraindication.cs       |   5 +-
 .../Generated/MedicinalProductIndication.cs   |   5 +-
 .../Generated/MedicinalProductIngredient.cs   |  20 ++-
 .../Generated/MedicinalProductInteraction.cs  |   5 +-
 .../Generated/MedicinalProductPackaged.cs     |  10 +-
 .../MedicinalProductPharmaceutical.cs         |  20 ++-
 .../Model/Generated/MessageDefinition.cs      |  10 +-
 .../Model/Generated/MessageHeader.cs          |  15 +-
 .../Model/Generated/MolecularSequence.cs      |  40 +++---
 .../Model/Generated/NamingSystem.cs           |   5 +-
 .../Model/Generated/NutritionOrder.cs         |  30 ++--
 .../Model/Generated/Observation.cs            |  10 +-
 .../Model/Generated/ObservationDefinition.cs  |  10 +-
 .../Model/Generated/OperationDefinition.cs    |  20 ++-
 .../Model/Generated/Organization.cs           |   5 +-
 src/Hl7.Fhir.R4/Model/Generated/Patient.cs    |  15 +-
 .../Model/Generated/PaymentReconciliation.cs  |  10 +-
 src/Hl7.Fhir.R4/Model/Generated/Person.cs     |   5 +-
 .../Model/Generated/PlanDefinition.cs         |  35 ++---
 .../Model/Generated/Practitioner.cs           |   5 +-
 .../Model/Generated/PractitionerRole.cs       |  10 +-
 src/Hl7.Fhir.R4/Model/Generated/Procedure.cs  |  10 +-
 src/Hl7.Fhir.R4/Model/Generated/Provenance.cs |  10 +-
 .../Model/Generated/Questionnaire.cs          |  20 ++-
 .../Model/Generated/QuestionnaireResponse.cs  |  10 +-
 .../Model/Generated/RelatedPerson.cs          |   5 +-
 .../Model/Generated/RequestGroup.cs           |  15 +-
 .../Generated/ResearchElementDefinition.cs    |   5 +-
 .../Model/Generated/ResearchStudy.cs          |  10 +-
 .../Model/Generated/RiskAssessment.cs         |   5 +-
 .../Model/Generated/RiskEvidenceSynthesis.cs  |  25 ++--
 .../Model/Generated/SearchParameter.cs        |   5 +-
 src/Hl7.Fhir.R4/Model/Generated/Specimen.cs   |  15 +-
 .../Model/Generated/SpecimenDefinition.cs     |  20 ++-
 .../Model/Generated/StructureMap.cs           |  40 +++---
 .../Model/Generated/Subscription.cs           |   5 +-
 src/Hl7.Fhir.R4/Model/Generated/Substance.cs  |  10 +-
 .../Model/Generated/SubstanceAmount.cs        |   5 +-
 .../Model/Generated/SubstanceNucleicAcid.cs   |  15 +-
 .../Model/Generated/SubstancePolymer.cs       |  30 ++--
 .../Model/Generated/SubstanceProtein.cs       |   5 +-
 .../SubstanceReferenceInformation.cs          |  20 ++-
 .../Generated/SubstanceSourceMaterial.cs      |  30 ++--
 .../Model/Generated/SubstanceSpecification.cs |  50 +++----
 .../Model/Generated/SupplyDelivery.cs         |   5 +-
 .../Model/Generated/SupplyRequest.cs          |   5 +-
 src/Hl7.Fhir.R4/Model/Generated/Task.cs       |  15 +-
 .../Generated/TerminologyCapabilities.cs      |  50 +++----
 src/Hl7.Fhir.R4/Model/Generated/TestReport.cs |  45 +++---
 src/Hl7.Fhir.R4/Model/Generated/TestScript.cs |  80 +++++------
 src/Hl7.Fhir.R4/Model/Generated/Timing.cs     |   5 +-
 .../Model/Generated/VerificationResult.cs     |  15 +-
 .../Model/Generated/VisionPrescription.cs     |  10 +-
 src/Hl7.Fhir.R4B/Model/Generated/Account.cs   |  10 +-
 .../Model/Generated/ActivityDefinition.cs     |  10 +-
 .../AdministrableProductDefinition.cs         |  20 ++-
 .../Model/Generated/AdverseEvent.cs           |  10 +-
 .../Model/Generated/AllergyIntolerance.cs     |   5 +-
 .../Model/Generated/Appointment.cs            |   5 +-
 .../Model/Generated/AuditEvent.cs             |  25 ++--
 .../Generated/BiologicallyDerivedProduct.cs   |  20 ++-
 src/Hl7.Fhir.R4B/Model/Generated/CarePlan.cs  |  10 +-
 src/Hl7.Fhir.R4B/Model/Generated/CareTeam.cs  |   5 +-
 .../Model/Generated/CatalogEntry.cs           |   5 +-
 .../Model/Generated/ChargeItem.cs             |   5 +-
 .../Model/Generated/ChargeItemDefinition.cs   |  15 +-
 src/Hl7.Fhir.R4B/Model/Generated/Citation.cs  | 115 +++++++---------
 src/Hl7.Fhir.R4B/Model/Generated/Claim.cs     |  55 +++-----
 .../Model/Generated/ClaimResponse.cs          |  60 ++++----
 .../Model/Generated/ClinicalImpression.cs     |  10 +-
 .../Model/Generated/ClinicalUseDefinition.cs  |  35 ++---
 .../Model/Generated/Communication.cs          |   5 +-
 .../Model/Generated/CommunicationRequest.cs   |   5 +-
 .../Model/Generated/CompartmentDefinition.cs  |   5 +-
 .../Model/Generated/Composition.cs            |  20 ++-
 .../Model/Generated/ConceptMap.cs             |  25 ++--
 src/Hl7.Fhir.R4B/Model/Generated/Condition.cs |  10 +-
 src/Hl7.Fhir.R4B/Model/Generated/Consent.cs   |  25 ++--
 src/Hl7.Fhir.R4B/Model/Generated/Contract.cs  |  75 ++++------
 src/Hl7.Fhir.R4B/Model/Generated/Coverage.cs  |  15 +-
 .../Generated/CoverageEligibilityRequest.cs   |  20 ++-
 .../Generated/CoverageEligibilityResponse.cs  |  20 ++-
 .../Model/Generated/DataRequirement.cs        |  15 +-
 .../Model/Generated/DetectedIssue.cs          |  10 +-
 src/Hl7.Fhir.R4B/Model/Generated/Device.cs    |  25 ++--
 .../Model/Generated/DeviceDefinition.cs       |  30 ++--
 .../Model/Generated/DeviceMetric.cs           |   5 +-
 .../Model/Generated/DeviceRequest.cs          |   5 +-
 .../Model/Generated/DiagnosticReport.cs       |   5 +-
 .../Model/Generated/DocumentManifest.cs       |   5 +-
 .../Model/Generated/DocumentReference.cs      |  15 +-
 src/Hl7.Fhir.R4B/Model/Generated/Dosage.cs    |   5 +-
 src/Hl7.Fhir.R4B/Model/Generated/Encounter.cs |  30 ++--
 .../Model/Generated/EpisodeOfCare.cs          |  10 +-
 src/Hl7.Fhir.R4B/Model/Generated/Evidence.cs  |  35 ++---
 .../Model/Generated/EvidenceReport.cs         |  20 ++-
 .../Model/Generated/EvidenceVariable.cs       |  15 +-
 .../Model/Generated/ExampleScenario.cs        |  40 +++---
 .../Model/Generated/ExplanationOfBenefit.cs   | 100 ++++++--------
 .../Model/Generated/FamilyMemberHistory.cs    |   5 +-
 src/Hl7.Fhir.R4B/Model/Generated/Goal.cs      |   5 +-
 .../Model/Generated/GraphDefinition.cs        |  15 +-
 src/Hl7.Fhir.R4B/Model/Generated/Group.cs     |  10 +-
 .../Model/Generated/HealthcareService.cs      |  15 +-
 .../Model/Generated/ImagingStudy.cs           |  15 +-
 .../Model/Generated/Immunization.cs           |  20 ++-
 .../Generated/ImmunizationRecommendation.cs   |  10 +-
 .../Model/Generated/ImplementationGuide.cs    |  55 +++-----
 .../Model/Generated/Ingredient.cs             |  20 ++-
 .../Model/Generated/InsurancePlan.cs          |  45 +++---
 src/Hl7.Fhir.R4B/Model/Generated/Invoice.cs   |  15 +-
 src/Hl7.Fhir.R4B/Model/Generated/Linkage.cs   |   5 +-
 src/Hl7.Fhir.R4B/Model/Generated/List.cs      |   5 +-
 src/Hl7.Fhir.R4B/Model/Generated/Location.cs  |  10 +-
 .../Generated/ManufacturedItemDefinition.cs   |   5 +-
 src/Hl7.Fhir.R4B/Model/Generated/Measure.cs   |  25 ++--
 .../Model/Generated/MeasureReport.cs          |  30 ++--
 .../Model/Generated/Medication.cs             |  10 +-
 .../Generated/MedicationAdministration.cs     |  10 +-
 .../Model/Generated/MedicationDispense.cs     |  10 +-
 .../Model/Generated/MedicationKnowledge.cs    |  80 +++++------
 .../Model/Generated/MedicationRequest.cs      |  15 +-
 .../Generated/MedicinalProductDefinition.cs   |  35 ++---
 .../Model/Generated/MessageDefinition.cs      |  10 +-
 .../Model/Generated/MessageHeader.cs          |  15 +-
 .../Model/Generated/MolecularSequence.cs      |  40 +++---
 .../Model/Generated/NamingSystem.cs           |   5 +-
 .../Model/Generated/NutritionOrder.cs         |  30 ++--
 .../Model/Generated/NutritionProduct.cs       |  20 ++-
 .../Model/Generated/Observation.cs            |  10 +-
 .../Model/Generated/ObservationDefinition.cs  |  10 +-
 .../Model/Generated/OperationDefinition.cs    |  20 ++-
 .../Model/Generated/Organization.cs           |   5 +-
 .../Generated/PackagedProductDefinition.cs    |  25 ++--
 src/Hl7.Fhir.R4B/Model/Generated/Patient.cs   |  15 +-
 .../Model/Generated/PaymentReconciliation.cs  |  10 +-
 src/Hl7.Fhir.R4B/Model/Generated/Person.cs    |   5 +-
 .../Model/Generated/PlanDefinition.cs         |  35 ++---
 .../Model/Generated/Practitioner.cs           |   5 +-
 .../Model/Generated/PractitionerRole.cs       |  10 +-
 src/Hl7.Fhir.R4B/Model/Generated/Procedure.cs |  10 +-
 .../Model/Generated/Provenance.cs             |  10 +-
 .../Model/Generated/Questionnaire.cs          |  20 ++-
 .../Model/Generated/QuestionnaireResponse.cs  |  10 +-
 .../Model/Generated/RegulatedAuthorization.cs |   5 +-
 .../Model/Generated/RelatedPerson.cs          |   5 +-
 .../Model/Generated/RequestGroup.cs           |  15 +-
 .../Generated/ResearchElementDefinition.cs    |   5 +-
 .../Model/Generated/ResearchStudy.cs          |  10 +-
 .../Model/Generated/RiskAssessment.cs         |   5 +-
 .../Model/Generated/SearchParameter.cs        |   5 +-
 src/Hl7.Fhir.R4B/Model/Generated/Specimen.cs  |  15 +-
 .../Model/Generated/SpecimenDefinition.cs     |  20 ++-
 .../Model/Generated/StructureMap.cs           |  40 +++---
 .../Model/Generated/Subscription.cs           |   5 +-
 .../Model/Generated/SubscriptionStatus.cs     |   5 +-
 .../Model/Generated/SubscriptionTopic.cs      |  25 ++--
 src/Hl7.Fhir.R4B/Model/Generated/Substance.cs |  10 +-
 .../Model/Generated/SubstanceDefinition.cs    |  50 +++----
 .../Model/Generated/SupplyDelivery.cs         |   5 +-
 .../Model/Generated/SupplyRequest.cs          |   5 +-
 src/Hl7.Fhir.R4B/Model/Generated/Task.cs      |  15 +-
 .../Generated/TerminologyCapabilities.cs      |  50 +++----
 .../Model/Generated/TestReport.cs             |  45 +++---
 .../Model/Generated/TestScript.cs             |  80 +++++------
 src/Hl7.Fhir.R4B/Model/Generated/Timing.cs    |   5 +-
 .../Model/Generated/VerificationResult.cs     |  15 +-
 .../Model/Generated/VisionPrescription.cs     |  10 +-
 src/Hl7.Fhir.R5/Model/Generated/Account.cs    |  30 ++--
 .../Model/Generated/ActivityDefinition.cs     |  10 +-
 .../AdministrableProductDefinition.cs         |  20 ++-
 .../Model/Generated/AdverseEvent.cs           |  35 ++---
 .../Model/Generated/AllergyIntolerance.cs     |  10 +-
 .../Model/Generated/Appointment.cs            |  25 ++--
 .../Model/Generated/ArtifactAssessment.cs     |   5 +-
 src/Hl7.Fhir.R5/Model/Generated/AuditEvent.cs |  25 ++--
 .../Model/Generated/Availability.cs           |  10 +-
 .../Generated/BiologicallyDerivedProduct.cs   |  10 +-
 .../BiologicallyDerivedProductDispense.cs     |   5 +-
 .../Model/Generated/BodyStructure.cs          |  15 +-
 src/Hl7.Fhir.R5/Model/Generated/CarePlan.cs   |   5 +-
 src/Hl7.Fhir.R5/Model/Generated/CareTeam.cs   |   5 +-
 src/Hl7.Fhir.R5/Model/Generated/ChargeItem.cs |   5 +-
 .../Model/Generated/ChargeItemDefinition.cs   |  10 +-
 src/Hl7.Fhir.R5/Model/Generated/Citation.cs   |  90 +++++-------
 src/Hl7.Fhir.R5/Model/Generated/Claim.cs      |  65 ++++-----
 .../Model/Generated/ClaimResponse.cs          |  75 ++++------
 .../Model/Generated/ClinicalImpression.cs     |   5 +-
 .../Model/Generated/ClinicalUseDefinition.cs  |  35 ++---
 .../Model/Generated/Communication.cs          |   5 +-
 .../Model/Generated/CommunicationRequest.cs   |   5 +-
 .../Model/Generated/CompartmentDefinition.cs  |   5 +-
 .../Model/Generated/Composition.cs            |  15 +-
 src/Hl7.Fhir.R5/Model/Generated/ConceptMap.cs |  40 +++---
 src/Hl7.Fhir.R5/Model/Generated/Condition.cs  |  10 +-
 .../Model/Generated/ConditionDefinition.cs    |  25 ++--
 src/Hl7.Fhir.R5/Model/Generated/Consent.cs    |  25 ++--
 src/Hl7.Fhir.R5/Model/Generated/Contract.cs   |  75 ++++------
 src/Hl7.Fhir.R5/Model/Generated/Coverage.cs   |  20 ++-
 .../Generated/CoverageEligibilityRequest.cs   |  25 ++--
 .../Generated/CoverageEligibilityResponse.cs  |  25 ++--
 .../Model/Generated/DataRequirement.cs        |  20 ++-
 .../Model/Generated/DetectedIssue.cs          |  10 +-
 src/Hl7.Fhir.R5/Model/Generated/Device.cs     |  25 ++--
 .../Model/Generated/DeviceAssociation.cs      |   5 +-
 .../Model/Generated/DeviceDefinition.cs       |  80 +++++------
 .../Model/Generated/DeviceDispense.cs         |   5 +-
 .../Model/Generated/DeviceMetric.cs           |   5 +-
 .../Model/Generated/DeviceRequest.cs          |   5 +-
 .../Model/Generated/DeviceUsage.cs            |   5 +-
 .../Model/Generated/DiagnosticReport.cs       |  10 +-
 .../Model/Generated/DocumentReference.cs      |  20 ++-
 src/Hl7.Fhir.R5/Model/Generated/Dosage.cs     |   5 +-
 src/Hl7.Fhir.R5/Model/Generated/Encounter.cs  |  25 ++--
 .../Model/Generated/EncounterHistory.cs       |   5 +-
 src/Hl7.Fhir.R5/Model/Generated/Endpoint.cs   |   5 +-
 .../Model/Generated/EpisodeOfCare.cs          |  15 +-
 src/Hl7.Fhir.R5/Model/Generated/Evidence.cs   |  35 ++---
 .../Model/Generated/EvidenceReport.cs         |  25 ++--
 .../Model/Generated/EvidenceVariable.cs       |  25 ++--
 .../Model/Generated/ExampleScenario.cs        |  40 +++---
 .../Model/Generated/ExplanationOfBenefit.cs   | 120 +++++++---------
 .../Model/Generated/FamilyMemberHistory.cs    |  15 +-
 .../Model/Generated/GenomicStudy.cs           |  25 ++--
 src/Hl7.Fhir.R5/Model/Generated/Goal.cs       |   5 +-
 .../Model/Generated/GraphDefinition.cs        |  15 +-
 src/Hl7.Fhir.R5/Model/Generated/Group.cs      |  10 +-
 .../Model/Generated/HealthcareService.cs      |   5 +-
 .../Model/Generated/ImagingSelection.cs       |  20 ++-
 .../Model/Generated/ImagingStudy.cs           |  15 +-
 .../Model/Generated/Immunization.cs           |  20 ++-
 .../Generated/ImmunizationRecommendation.cs   |  10 +-
 .../Model/Generated/ImplementationGuide.cs    |  55 +++-----
 src/Hl7.Fhir.R5/Model/Generated/Ingredient.cs |  20 ++-
 .../Model/Generated/InsurancePlan.cs          |  40 +++---
 .../Model/Generated/InventoryItem.cs          |  30 ++--
 .../Model/Generated/InventoryReport.cs        |  10 +-
 src/Hl7.Fhir.R5/Model/Generated/Invoice.cs    |  10 +-
 src/Hl7.Fhir.R5/Model/Generated/Linkage.cs    |   5 +-
 src/Hl7.Fhir.R5/Model/Generated/List.cs       |   5 +-
 src/Hl7.Fhir.R5/Model/Generated/Location.cs   |   5 +-
 .../Generated/ManufacturedItemDefinition.cs   |  15 +-
 src/Hl7.Fhir.R5/Model/Generated/Measure.cs    |  30 ++--
 .../Model/Generated/MeasureReport.cs          |  30 ++--
 src/Hl7.Fhir.R5/Model/Generated/Medication.cs |  10 +-
 .../Generated/MedicationAdministration.cs     |  10 +-
 .../Model/Generated/MedicationDispense.cs     |  10 +-
 .../Model/Generated/MedicationKnowledge.cs    |  90 +++++-------
 .../Model/Generated/MedicationRequest.cs      |  15 +-
 .../Model/Generated/MedicationStatement.cs    |   5 +-
 .../Generated/MedicinalProductDefinition.cs   |  35 ++---
 .../Model/Generated/MessageDefinition.cs      |  10 +-
 .../Model/Generated/MessageHeader.cs          |  15 +-
 .../Model/Generated/MolecularSequence.cs      |  15 +-
 .../Model/Generated/NamingSystem.cs           |   5 +-
 .../Model/Generated/NutritionIntake.cs        |  15 +-
 .../Model/Generated/NutritionOrder.cs         |  50 +++----
 .../Model/Generated/NutritionProduct.cs       |  20 ++-
 .../Model/Generated/Observation.cs            |  15 +-
 .../Model/Generated/ObservationDefinition.cs  |  10 +-
 .../Model/Generated/OperationDefinition.cs    |  20 ++-
 .../Model/Generated/Organization.cs           |   5 +-
 .../Generated/PackagedProductDefinition.cs    |  20 ++-
 src/Hl7.Fhir.R5/Model/Generated/Patient.cs    |  15 +-
 .../Model/Generated/PaymentReconciliation.cs  |  10 +-
 src/Hl7.Fhir.R5/Model/Generated/Permission.cs |  25 ++--
 src/Hl7.Fhir.R5/Model/Generated/Person.cs     |  10 +-
 .../Model/Generated/PlanDefinition.cs         |  55 +++-----
 .../Model/Generated/Practitioner.cs           |  10 +-
 src/Hl7.Fhir.R5/Model/Generated/Procedure.cs  |  10 +-
 src/Hl7.Fhir.R5/Model/Generated/Provenance.cs |  10 +-
 .../Model/Generated/Questionnaire.cs          |  20 ++-
 .../Model/Generated/QuestionnaireResponse.cs  |  10 +-
 .../Model/Generated/RegulatedAuthorization.cs |   5 +-
 .../Model/Generated/RelatedPerson.cs          |   5 +-
 .../Model/Generated/RequestOrchestration.cs   |  35 ++---
 .../Model/Generated/Requirements.cs           |   5 +-
 .../Model/Generated/ResearchStudy.cs          |  35 ++---
 .../Model/Generated/ResearchSubject.cs        |   5 +-
 .../Model/Generated/RiskAssessment.cs         |   5 +-
 .../Model/Generated/SearchParameter.cs        |   5 +-
 .../Model/Generated/ServiceRequest.cs         |  15 +-
 src/Hl7.Fhir.R5/Model/Generated/Specimen.cs   |  20 ++-
 .../Model/Generated/SpecimenDefinition.cs     |  20 ++-
 .../Model/Generated/StructureMap.cs           |  45 +++---
 .../Model/Generated/Subscription.cs           |  10 +-
 .../Model/Generated/SubscriptionStatus.cs     |   5 +-
 .../Model/Generated/SubscriptionTopic.cs      |  25 ++--
 src/Hl7.Fhir.R5/Model/Generated/Substance.cs  |   5 +-
 .../Model/Generated/SubstanceDefinition.cs    |  55 +++-----
 .../Model/Generated/SubstanceNucleicAcid.cs   |  15 +-
 .../Model/Generated/SubstancePolymer.cs       |  30 ++--
 .../Model/Generated/SubstanceProtein.cs       |   5 +-
 .../SubstanceReferenceInformation.cs          |  15 +-
 .../Generated/SubstanceSourceMaterial.cs      |  30 ++--
 .../Model/Generated/SupplyDelivery.cs         |   5 +-
 .../Model/Generated/SupplyRequest.cs          |   5 +-
 src/Hl7.Fhir.R5/Model/Generated/Task.cs       |  20 ++-
 .../Generated/TerminologyCapabilities.cs      |  50 +++----
 src/Hl7.Fhir.R5/Model/Generated/TestPlan.cs   |  35 ++---
 src/Hl7.Fhir.R5/Model/Generated/TestReport.cs |  50 +++----
 src/Hl7.Fhir.R5/Model/Generated/TestScript.cs |  90 +++++-------
 src/Hl7.Fhir.R5/Model/Generated/Timing.cs     |   5 +-
 src/Hl7.Fhir.R5/Model/Generated/Transport.cs  |  15 +-
 .../Model/Generated/VerificationResult.cs     |  15 +-
 .../Model/Generated/VisionPrescription.cs     |  10 +-
 ...ValidateAllExamplesSearchExtractionTest.cs |   4 +-
 .../Validation/SearchDataExtraction.cs        |   4 +-
 src/Hl7.Fhir.STU3/Model/Generated/Account.cs  |  10 +-
 .../Model/Generated/ActivityDefinition.cs     |  10 +-
 .../Model/Generated/AdverseEvent.cs           |   5 +-
 .../Model/Generated/AllergyIntolerance.cs     |   5 +-
 .../Model/Generated/Appointment.cs            |   5 +-
 .../Model/Generated/AuditEvent.cs             |  25 ++--
 .../Model/Generated/CapabilityStatement.cs    |  75 ++++------
 src/Hl7.Fhir.STU3/Model/Generated/CarePlan.cs |  10 +-
 src/Hl7.Fhir.STU3/Model/Generated/CareTeam.cs |   5 +-
 .../Model/Generated/ChargeItem.cs             |   5 +-
 src/Hl7.Fhir.STU3/Model/Generated/Claim.cs    |  55 +++-----
 .../Model/Generated/ClaimResponse.cs          |  50 +++----
 .../Model/Generated/ClinicalImpression.cs     |  10 +-
 .../Model/Generated/CodeSystem.cs             |  25 ++--
 .../Model/Generated/Communication.cs          |   5 +-
 .../Model/Generated/CommunicationRequest.cs   |  10 +-
 .../Model/Generated/CompartmentDefinition.cs  |   5 +-
 .../Model/Generated/Composition.cs            |  20 ++-
 .../Model/Generated/ConceptMap.cs             |  25 ++--
 .../Model/Generated/Condition.cs              |  10 +-
 src/Hl7.Fhir.STU3/Model/Generated/Consent.cs  |  30 ++--
 src/Hl7.Fhir.STU3/Model/Generated/Contract.cs |  45 +++---
 src/Hl7.Fhir.STU3/Model/Generated/Coverage.cs |   5 +-
 .../Model/Generated/DataElement.cs            |   5 +-
 .../Model/Generated/DataRequirement.cs        |  10 +-
 .../Model/Generated/DetectedIssue.cs          |   5 +-
 src/Hl7.Fhir.STU3/Model/Generated/Device.cs   |   5 +-
 .../Model/Generated/DeviceComponent.cs        |   5 +-
 .../Model/Generated/DeviceMetric.cs           |   5 +-
 .../Model/Generated/DeviceRequest.cs          |   5 +-
 .../Model/Generated/DiagnosticReport.cs       |  10 +-
 .../Model/Generated/DocumentManifest.cs       |  10 +-
 .../Model/Generated/DocumentReference.cs      |  20 ++-
 .../Model/Generated/ElementDefinition.cs      |  40 +++---
 .../Model/Generated/EligibilityResponse.cs    |  20 ++-
 .../Model/Generated/Encounter.cs              |  30 ++--
 .../Model/Generated/EpisodeOfCare.cs          |  10 +-
 .../Model/Generated/ExpansionProfile.cs       |  35 ++---
 .../Model/Generated/ExplanationOfBenefit.cs   |  90 +++++-------
 .../Model/Generated/FamilyMemberHistory.cs    |   5 +-
 src/Hl7.Fhir.STU3/Model/Generated/Goal.cs     |   5 +-
 .../Model/Generated/GraphDefinition.cs        |  15 +-
 src/Hl7.Fhir.STU3/Model/Generated/Group.cs    |  10 +-
 .../Model/Generated/HealthcareService.cs      |  10 +-
 .../Model/Generated/ImagingManifest.cs        |  15 +-
 .../Model/Generated/ImagingStudy.cs           |  10 +-
 .../Model/Generated/Immunization.cs           |  20 ++-
 .../Generated/ImmunizationRecommendation.cs   |  15 +-
 .../Model/Generated/ImplementationGuide.cs    |  25 ++--
 src/Hl7.Fhir.STU3/Model/Generated/Linkage.cs  |   5 +-
 src/Hl7.Fhir.STU3/Model/Generated/List.cs     |   5 +-
 src/Hl7.Fhir.STU3/Model/Generated/Location.cs |   5 +-
 src/Hl7.Fhir.STU3/Model/Generated/Measure.cs  |  20 ++-
 .../Model/Generated/MeasureReport.cs          |  25 ++--
 .../Model/Generated/Medication.cs             |  20 ++-
 .../Generated/MedicationAdministration.cs     |  10 +-
 .../Model/Generated/MedicationDispense.cs     |  10 +-
 .../Model/Generated/MedicationRequest.cs      |  15 +-
 .../Model/Generated/MessageDefinition.cs      |  10 +-
 .../Model/Generated/MessageHeader.cs          |  15 +-
 .../Model/Generated/NamingSystem.cs           |   5 +-
 .../Model/Generated/NutritionOrder.cs         |  30 ++--
 .../Model/Generated/Observation.cs            |  15 +-
 .../Model/Generated/OperationDefinition.cs    |  15 +-
 .../Model/Generated/Organization.cs           |   5 +-
 src/Hl7.Fhir.STU3/Model/Generated/Patient.cs  |  20 ++-
 .../Model/Generated/PaymentReconciliation.cs  |  10 +-
 src/Hl7.Fhir.STU3/Model/Generated/Person.cs   |   5 +-
 .../Model/Generated/PlanDefinition.cs         |  35 ++---
 .../Model/Generated/Practitioner.cs           |   5 +-
 .../Model/Generated/PractitionerRole.cs       |  10 +-
 .../Model/Generated/Procedure.cs              |  10 +-
 .../Model/Generated/ProcedureRequest.cs       |   5 +-
 .../Model/Generated/ProcessRequest.cs         |   5 +-
 .../Model/Generated/ProcessResponse.cs        |   5 +-
 .../Model/Generated/Provenance.cs             |  10 +-
 .../Model/Generated/Questionnaire.cs          |  15 +-
 .../Model/Generated/QuestionnaireResponse.cs  |  10 +-
 .../Model/Generated/ReferralRequest.cs        |   5 +-
 .../Model/Generated/RequestGroup.cs           |  15 +-
 .../Model/Generated/ResearchStudy.cs          |   5 +-
 .../Model/Generated/RiskAssessment.cs         |   5 +-
 .../Model/Generated/SearchParameter.cs        |   5 +-
 src/Hl7.Fhir.STU3/Model/Generated/Sequence.cs |  20 ++-
 src/Hl7.Fhir.STU3/Model/Generated/Specimen.cs |  15 +-
 .../Model/Generated/StructureDefinition.cs    |  15 +-
 .../Model/Generated/StructureMap.cs           |  40 +++---
 .../Model/Generated/Subscription.cs           |   5 +-
 .../Model/Generated/Substance.cs              |  10 +-
 .../Model/Generated/SupplyDelivery.cs         |   5 +-
 .../Model/Generated/SupplyRequest.cs          |  10 +-
 src/Hl7.Fhir.STU3/Model/Generated/Task.cs     |  20 ++-
 .../Model/Generated/TestReport.cs             |  45 +++---
 .../Model/Generated/TestScript.cs             | 130 +++++++-----------
 src/Hl7.Fhir.STU3/Model/Generated/Timing.cs   |   5 +-
 src/Hl7.Fhir.STU3/Model/Generated/ValueSet.cs |  40 +++---
 .../Model/Generated/VisionPrescription.cs     |   5 +-
 .../Snapshot/SnapshotGeneratorTest.cs         |   2 +-
 .../PocoTests/FhirPathParallelTest.cs         |   2 +-
 484 files changed, 3714 insertions(+), 5563 deletions(-)
 delete mode 100644 src/Hl7.Fhir.Base/Introspection/BackboneTypeAttribute.cs

diff --git a/src/Hl7.Fhir.Base/CompatibilitySuppressions.xml b/src/Hl7.Fhir.Base/CompatibilitySuppressions.xml
index cf40ed7530..04e8e65e21 100644
--- a/src/Hl7.Fhir.Base/CompatibilitySuppressions.xml
+++ b/src/Hl7.Fhir.Base/CompatibilitySuppressions.xml
@@ -1,12 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- https://learn.microsoft.com/en-us/dotnet/fundamentals/package-validation/diagnostic-ids -->
 <Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:Hl7.Fhir.Introspection.BackboneTypeAttribute</Target>
+    <Left>lib/net8.0/Hl7.Fhir.Base.dll</Left>
+    <Right>lib/net8.0/Hl7.Fhir.Base.dll</Right>
+    <IsBaselineSuppression>true</IsBaselineSuppression>
+  </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
     <Target>T:System.Runtime.CompilerServices.CollectionBuilderAttribute</Target>
     <Left>lib/netstandard2.0/Hl7.Fhir.Base.dll</Left>
     <Right>lib/net8.0/Hl7.Fhir.Base.dll</Right>
   </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:Hl7.Fhir.Introspection.BackboneTypeAttribute</Target>
+    <Left>lib/netstandard2.0/Hl7.Fhir.Base.dll</Left>
+    <Right>lib/netstandard2.0/Hl7.Fhir.Base.dll</Right>
+    <IsBaselineSuppression>true</IsBaselineSuppression>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:Hl7.Fhir.Introspection.ClassMapping.get_DefinitionPath</Target>
+    <Left>lib/net8.0/Hl7.Fhir.Base.dll</Left>
+    <Right>lib/net8.0/Hl7.Fhir.Base.dll</Right>
+    <IsBaselineSuppression>true</IsBaselineSuppression>
+  </Suppression>
   <Suppression>
     <DiagnosticId>CP0002</DiagnosticId>
     <Target>M:Hl7.Fhir.Introspection.FhirTypeAttribute.get_IsNestedType</Target>
@@ -49,6 +70,13 @@
     <Right>lib/net8.0/Hl7.Fhir.Base.dll</Right>
     <IsBaselineSuppression>true</IsBaselineSuppression>
   </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:Hl7.Fhir.Introspection.ClassMapping.get_DefinitionPath</Target>
+    <Left>lib/netstandard2.0/Hl7.Fhir.Base.dll</Left>
+    <Right>lib/netstandard2.0/Hl7.Fhir.Base.dll</Right>
+    <IsBaselineSuppression>true</IsBaselineSuppression>
+  </Suppression>
   <Suppression>
     <DiagnosticId>CP0002</DiagnosticId>
     <Target>M:Hl7.Fhir.Introspection.FhirTypeAttribute.get_IsNestedType</Target>
diff --git a/src/Hl7.Fhir.Base/Introspection/BackboneTypeAttribute.cs b/src/Hl7.Fhir.Base/Introspection/BackboneTypeAttribute.cs
deleted file mode 100644
index 6785c7af3b..0000000000
--- a/src/Hl7.Fhir.Base/Introspection/BackboneTypeAttribute.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-/* 
- * Copyright (c) 2023, Firely (info@fire.ly) and contributors
- * See the file CONTRIBUTORS for details.
- * 
- * This file is licensed under the BSD 3-Clause license
- * available at https://raw.githubusercontent.com/FirelyTeam/firely-net-sdk/master/LICENSE
- */
-
-using System;
-
-#nullable enable
-
-namespace Hl7.Fhir.Introspection
-{
-    /// <summary>
-    /// This attribute is applied to classes that represent Backbone types.
-    /// </summary>
-    [AttributeUsage(AttributeTargets.Class, Inherited = false, AllowMultiple = false)]
-    public sealed class BackboneTypeAttribute : Attribute
-    {
-        public BackboneTypeAttribute(string definitionPath)
-        {
-            DefinitionPath = definitionPath ?? throw new ArgumentNullException(nameof(definitionPath));
-        }
-
-        /// <summary>
-        /// The path in the StructureDefinition where the backbone was defined.
-        /// </summary>
-        /// <remarks>When the backbone is reused in the resource, and thus appears on multiple paths,
-        /// this is the initial path where the backbone was defined.</remarks>
-        public string DefinitionPath { get; private set; }
-    }
-}
-
-#nullable restore
\ No newline at end of file
diff --git a/src/Hl7.Fhir.Base/Introspection/ClassMapping.cs b/src/Hl7.Fhir.Base/Introspection/ClassMapping.cs
index 9de5ecf76f..98f2324cf8 100644
--- a/src/Hl7.Fhir.Base/Introspection/ClassMapping.cs
+++ b/src/Hl7.Fhir.Base/Introspection/ClassMapping.cs
@@ -88,16 +88,13 @@ public static bool TryCreate(Type type, [NotNullWhen(true)]out ClassMapping? res
             // Now continue with the normal algorithm, types adorned with the [FhirTypeAttribute]
             if (GetAttribute<FhirTypeAttribute>(type.GetTypeInfo(), release) is not { } typeAttribute) return false;
 
-            var backboneAttribute = GetAttribute<BackboneTypeAttribute>(type, release);
-
             result = new ClassMapping(collectTypeName(typeAttribute, type), type, release)
             {
                 IsResource = type.CanBeTreatedAsType(typeof(Resource)),
                 IsCodeOfT = ReflectionHelper.IsClosedGenericType(type) &&
                                 ReflectionHelper.IsConstructedFromGenericTypeDefinition(type, typeof(Code<>)),
                 IsFhirPrimitive = typeof(PrimitiveType).IsAssignableFrom(type),
-                IsBackboneType = backboneAttribute is not null,
-                DefinitionPath = backboneAttribute?.DefinitionPath,
+                IsBackboneType = typeAttribute.IsBackboneType,
                 IsBindable = GetAttribute<BindableAttribute>(type.GetTypeInfo(), release)?.IsBindable ?? false,
                 Canonical = typeAttribute.Canonical,
                 ValidationAttributes = GetAttributes<ValidationAttribute>(type.GetTypeInfo(), release).ToArray(),
@@ -173,13 +170,6 @@ private ClassMapping(string name, Type nativeType, FhirRelease release)
         /// </summary>
         public bool IsBackboneType { get; private set; } = false;
 
-
-        /// <summary>
-        /// If this is a backbone type (<see cref="IsBackboneType"/>), then this contains the path
-        /// in the StructureDefinition where the backbone was defined first.
-        /// </summary>
-        public string? DefinitionPath { get; private set; }
-
         /// <summary>
         /// Indicates whether this class can be used for binding.
         /// </summary>
diff --git a/src/Hl7.Fhir.Base/Introspection/FhirTypeAttribute.cs b/src/Hl7.Fhir.Base/Introspection/FhirTypeAttribute.cs
index 5ab5e3611f..4570483ceb 100644
--- a/src/Hl7.Fhir.Base/Introspection/FhirTypeAttribute.cs
+++ b/src/Hl7.Fhir.Base/Introspection/FhirTypeAttribute.cs
@@ -60,5 +60,10 @@ public FhirTypeAttribute(string name, string canonical)
         /// The canonical of the StructureDefinition defining this type.
         /// </summary>
         public string? Canonical { get; set; }
+
+        /// <summary>
+        /// Indicates whether this class represents the nested complex type for a (backbone) element.
+        /// </summary>
+        public bool IsBackboneType { get; set; }
     }
 }
\ No newline at end of file
diff --git a/src/Hl7.Fhir.Base/Model/Generated/Bundle.cs b/src/Hl7.Fhir.Base/Model/Generated/Bundle.cs
index af9e42c614..793a725615 100644
--- a/src/Hl7.Fhir.Base/Model/Generated/Bundle.cs
+++ b/src/Hl7.Fhir.Base/Model/Generated/Bundle.cs
@@ -945,14 +945,13 @@ public enum HTTPVerb
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Bundle#Link")]
-    [BackboneType("Bundle.link")]
+    [FhirType("Bundle.link", IsBackboneType=true)]
     public partial class LinkComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Bundle#Link"; } }
+      public override string TypeName { get { return "Bundle.link"; } }
 
       /// <summary>
       /// See http://www.iana.org/assignments/link-relations/link-relations.xhtml#link-relations-1
@@ -1135,14 +1134,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Bundle#Entry")]
-    [BackboneType("Bundle.entry")]
+    [FhirType("Bundle.entry", IsBackboneType=true)]
     public partial class EntryComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Bundle#Entry"; } }
+      public override string TypeName { get { return "Bundle.entry"; } }
 
       /// <summary>
       /// Links related to this entry
@@ -1407,14 +1405,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Bundle#Search")]
-    [BackboneType("Bundle.entry.search")]
+    [FhirType("Bundle.entry.search", IsBackboneType=true)]
     public partial class SearchComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Bundle#Search"; } }
+      public override string TypeName { get { return "Bundle.entry.search"; } }
 
       /// <summary>
       /// match | include - why this is in the result set
@@ -1596,14 +1593,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Bundle#Request")]
-    [BackboneType("Bundle.entry.request")]
+    [FhirType("Bundle.entry.request", IsBackboneType=true)]
     public partial class RequestComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Bundle#Request"; } }
+      public override string TypeName { get { return "Bundle.entry.request"; } }
 
       /// <summary>
       /// GET | HEAD | POST | PUT | DELETE | PATCH
@@ -1959,14 +1955,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Bundle#Response")]
-    [BackboneType("Bundle.entry.response")]
+    [FhirType("Bundle.entry.response", IsBackboneType=true)]
     public partial class ResponseComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Bundle#Response"; } }
+      public override string TypeName { get { return "Bundle.entry.response"; } }
 
       /// <summary>
       /// Status response code (text optional)
diff --git a/src/Hl7.Fhir.Base/Model/Generated/OperationOutcome.cs b/src/Hl7.Fhir.Base/Model/Generated/OperationOutcome.cs
index 692f9afc3d..a50383dd61 100644
--- a/src/Hl7.Fhir.Base/Model/Generated/OperationOutcome.cs
+++ b/src/Hl7.Fhir.Base/Model/Generated/OperationOutcome.cs
@@ -316,14 +316,13 @@ public enum IssueType
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("OperationOutcome#Issue")]
-    [BackboneType("OperationOutcome.issue")]
+    [FhirType("OperationOutcome.issue", IsBackboneType=true)]
     public partial class IssueComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "OperationOutcome#Issue"; } }
+      public override string TypeName { get { return "OperationOutcome.issue"; } }
 
       /// <summary>
       /// fatal | error | warning | information | success
diff --git a/src/Hl7.Fhir.Base/Model/Generated/Parameters.cs b/src/Hl7.Fhir.Base/Model/Generated/Parameters.cs
index a921774fe0..03e70f9f40 100644
--- a/src/Hl7.Fhir.Base/Model/Generated/Parameters.cs
+++ b/src/Hl7.Fhir.Base/Model/Generated/Parameters.cs
@@ -68,14 +68,13 @@ public partial class Parameters : Hl7.Fhir.Model.Resource
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Parameters#Parameter")]
-    [BackboneType("Parameters.parameter")]
+    [FhirType("Parameters.parameter", IsBackboneType=true)]
     public partial class ParameterComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Parameters#Parameter"; } }
+      public override string TypeName { get { return "Parameters.parameter"; } }
 
       /// <summary>
       /// Name from the definition
diff --git a/src/Hl7.Fhir.Conformance/Model/Generated/CapabilityStatement.cs b/src/Hl7.Fhir.Conformance/Model/Generated/CapabilityStatement.cs
index 4def5dd30c..edc3979a16 100644
--- a/src/Hl7.Fhir.Conformance/Model/Generated/CapabilityStatement.cs
+++ b/src/Hl7.Fhir.Conformance/Model/Generated/CapabilityStatement.cs
@@ -362,14 +362,13 @@ public enum DocumentMode
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CapabilityStatement#Software")]
-    [BackboneType("CapabilityStatement.software")]
+    [FhirType("CapabilityStatement.software", IsBackboneType=true)]
     public partial class SoftwareComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "CapabilityStatement#Software"; } }
+      public override string TypeName { get { return "CapabilityStatement.software"; } }
 
       /// <summary>
       /// A name the software is known by
@@ -593,14 +592,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CapabilityStatement#Implementation")]
-    [BackboneType("CapabilityStatement.implementation")]
+    [FhirType("CapabilityStatement.implementation", IsBackboneType=true)]
     public partial class ImplementationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "CapabilityStatement#Implementation"; } }
+      public override string TypeName { get { return "CapabilityStatement.implementation"; } }
 
       /// <summary>
       /// Describes this specific instance
@@ -811,14 +809,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CapabilityStatement#Rest")]
-    [BackboneType("CapabilityStatement.rest")]
+    [FhirType("CapabilityStatement.rest", IsBackboneType=true)]
     public partial class RestComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "CapabilityStatement#Rest"; } }
+      public override string TypeName { get { return "CapabilityStatement.rest"; } }
 
       /// <summary>
       /// client | server
@@ -1174,14 +1171,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CapabilityStatement#Security")]
-    [BackboneType("CapabilityStatement.rest.security")]
+    [FhirType("CapabilityStatement.rest.security", IsBackboneType=true)]
     public partial class SecurityComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "CapabilityStatement#Security"; } }
+      public override string TypeName { get { return "CapabilityStatement.rest.security"; } }
 
       /// <summary>
       /// Adds CORS Headers (http://enable-cors.org/)
@@ -1389,14 +1385,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CapabilityStatement#Resource")]
-    [BackboneType("CapabilityStatement.rest.resource")]
+    [FhirType("CapabilityStatement.rest.resource", IsBackboneType=true)]
     public partial class ResourceComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "CapabilityStatement#Resource"; } }
+      public override string TypeName { get { return "CapabilityStatement.rest.resource"; } }
 
       /// <summary>
       /// A resource type that is supported
@@ -2228,14 +2223,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CapabilityStatement#ResourceInteraction")]
-    [BackboneType("CapabilityStatement.rest.resource.interaction")]
+    [FhirType("CapabilityStatement.rest.resource.interaction", IsBackboneType=true)]
     public partial class ResourceInteractionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "CapabilityStatement#ResourceInteraction"; } }
+      public override string TypeName { get { return "CapabilityStatement.rest.resource.interaction"; } }
 
       /// <summary>
       /// read | vread | update | patch | delete | history-instance | history-type | create | search-type
@@ -2419,14 +2413,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CapabilityStatement#SearchParam")]
-    [BackboneType("CapabilityStatement.rest.resource.searchParam")]
+    [FhirType("CapabilityStatement.rest.resource.searchParam", IsBackboneType=true)]
     public partial class SearchParamComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "CapabilityStatement#SearchParam"; } }
+      public override string TypeName { get { return "CapabilityStatement.rest.resource.searchParam"; } }
 
       /// <summary>
       /// Name for parameter in search url
@@ -2698,14 +2691,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CapabilityStatement#Operation")]
-    [BackboneType("CapabilityStatement.rest.resource.operation")]
+    [FhirType("CapabilityStatement.rest.resource.operation", IsBackboneType=true)]
     public partial class OperationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "CapabilityStatement#Operation"; } }
+      public override string TypeName { get { return "CapabilityStatement.rest.resource.operation"; } }
 
       /// <summary>
       /// Name by which the operation/query is invoked
@@ -2930,14 +2922,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CapabilityStatement#SystemInteraction")]
-    [BackboneType("CapabilityStatement.rest.interaction")]
+    [FhirType("CapabilityStatement.rest.interaction", IsBackboneType=true)]
     public partial class SystemInteractionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "CapabilityStatement#SystemInteraction"; } }
+      public override string TypeName { get { return "CapabilityStatement.rest.interaction"; } }
 
       /// <summary>
       /// transaction | batch | search-system | history-system
@@ -3121,14 +3112,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CapabilityStatement#Messaging")]
-    [BackboneType("CapabilityStatement.messaging")]
+    [FhirType("CapabilityStatement.messaging", IsBackboneType=true)]
     public partial class MessagingComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "CapabilityStatement#Messaging"; } }
+      public override string TypeName { get { return "CapabilityStatement.messaging"; } }
 
       /// <summary>
       /// Where messages should be sent
@@ -3360,14 +3350,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CapabilityStatement#Endpoint")]
-    [BackboneType("CapabilityStatement.messaging.endpoint")]
+    [FhirType("CapabilityStatement.messaging.endpoint", IsBackboneType=true)]
     public partial class EndpointComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "CapabilityStatement#Endpoint"; } }
+      public override string TypeName { get { return "CapabilityStatement.messaging.endpoint"; } }
 
       /// <summary>
       /// http | ftp | mllp +
@@ -3533,14 +3522,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CapabilityStatement#SupportedMessage")]
-    [BackboneType("CapabilityStatement.messaging.supportedMessage")]
+    [FhirType("CapabilityStatement.messaging.supportedMessage", IsBackboneType=true)]
     public partial class SupportedMessageComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "CapabilityStatement#SupportedMessage"; } }
+      public override string TypeName { get { return "CapabilityStatement.messaging.supportedMessage"; } }
 
       /// <summary>
       /// sender | receiver
@@ -3724,14 +3712,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CapabilityStatement#Document")]
-    [BackboneType("CapabilityStatement.document")]
+    [FhirType("CapabilityStatement.document", IsBackboneType=true)]
     public partial class DocumentComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "CapabilityStatement#Document"; } }
+      public override string TypeName { get { return "CapabilityStatement.document"; } }
 
       /// <summary>
       /// producer | consumer
diff --git a/src/Hl7.Fhir.Conformance/Model/Generated/CodeSystem.cs b/src/Hl7.Fhir.Conformance/Model/Generated/CodeSystem.cs
index 1459dfd501..6c4761bdf8 100644
--- a/src/Hl7.Fhir.Conformance/Model/Generated/CodeSystem.cs
+++ b/src/Hl7.Fhir.Conformance/Model/Generated/CodeSystem.cs
@@ -154,14 +154,13 @@ public enum PropertyType
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CodeSystem#Filter")]
-    [BackboneType("CodeSystem.filter")]
+    [FhirType("CodeSystem.filter", IsBackboneType=true)]
     public partial class FilterComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "CodeSystem#Filter"; } }
+      public override string TypeName { get { return "CodeSystem.filter"; } }
 
       /// <summary>
       /// Code that identifies the filter
@@ -433,14 +432,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CodeSystem#Property")]
-    [BackboneType("CodeSystem.property")]
+    [FhirType("CodeSystem.property", IsBackboneType=true)]
     public partial class PropertyComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "CodeSystem#Property"; } }
+      public override string TypeName { get { return "CodeSystem.property"; } }
 
       /// <summary>
       /// Identifies the property on the concepts, and when referred to in operations
@@ -711,14 +709,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CodeSystem#ConceptDefinition")]
-    [BackboneType("CodeSystem.concept")]
+    [FhirType("CodeSystem.concept", IsBackboneType=true)]
     public partial class ConceptDefinitionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "CodeSystem#ConceptDefinition"; } }
+      public override string TypeName { get { return "CodeSystem.concept"; } }
 
       /// <summary>
       /// Code that identifies concept
@@ -1021,14 +1018,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CodeSystem#Designation")]
-    [BackboneType("CodeSystem.concept.designation")]
+    [FhirType("CodeSystem.concept.designation", IsBackboneType=true)]
     public partial class DesignationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "CodeSystem#Designation"; } }
+      public override string TypeName { get { return "CodeSystem.concept.designation"; } }
 
       /// <summary>
       /// Human language of the designation
@@ -1263,14 +1259,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CodeSystem#ConceptProperty")]
-    [BackboneType("CodeSystem.concept.property")]
+    [FhirType("CodeSystem.concept.property", IsBackboneType=true)]
     public partial class ConceptPropertyComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "CodeSystem#ConceptProperty"; } }
+      public override string TypeName { get { return "CodeSystem.concept.property"; } }
 
       /// <summary>
       /// Reference to CodeSystem.property.code
diff --git a/src/Hl7.Fhir.Conformance/Model/Generated/ElementDefinition.cs b/src/Hl7.Fhir.Conformance/Model/Generated/ElementDefinition.cs
index 51ffa7f172..07c4c86a1a 100644
--- a/src/Hl7.Fhir.Conformance/Model/Generated/ElementDefinition.cs
+++ b/src/Hl7.Fhir.Conformance/Model/Generated/ElementDefinition.cs
@@ -309,14 +309,13 @@ public enum AdditionalBindingPurposeVS
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ElementDefinition#Slicing")]
-    [BackboneType("ElementDefinition.slicing")]
+    [FhirType("ElementDefinition.slicing", IsBackboneType=true)]
     public partial class SlicingComponent : Hl7.Fhir.Model.Element
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ElementDefinition#Slicing"; } }
+      public override string TypeName { get { return "ElementDefinition.slicing"; } }
 
       /// <summary>
       /// Element values that are used to distinguish the slices
@@ -569,14 +568,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ElementDefinition#Discriminator")]
-    [BackboneType("ElementDefinition.slicing.discriminator")]
+    [FhirType("ElementDefinition.slicing.discriminator", IsBackboneType=true)]
     public partial class DiscriminatorComponent : Hl7.Fhir.Model.Element
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ElementDefinition#Discriminator"; } }
+      public override string TypeName { get { return "ElementDefinition.slicing.discriminator"; } }
 
       /// <summary>
       /// value | exists | type | profile | position
@@ -761,14 +759,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ElementDefinition#Base")]
-    [BackboneType("ElementDefinition.base")]
+    [FhirType("ElementDefinition.base", IsBackboneType=true)]
     public partial class BaseComponent : Hl7.Fhir.Model.Element
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ElementDefinition#Base"; } }
+      public override string TypeName { get { return "ElementDefinition.base"; } }
 
       /// <summary>
       /// Path that identifies the base element
@@ -995,14 +992,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ElementDefinition#TypeRef")]
-    [BackboneType("ElementDefinition.type")]
+    [FhirType("ElementDefinition.type", IsBackboneType=true)]
     public partial class TypeRefComponent : Hl7.Fhir.Model.Element
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ElementDefinition#TypeRef"; } }
+      public override string TypeName { get { return "ElementDefinition.type"; } }
 
       /// <summary>
       /// Data type or Resource (reference to definition)
@@ -1321,14 +1317,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ElementDefinition#Example")]
-    [BackboneType("ElementDefinition.example")]
+    [FhirType("ElementDefinition.example", IsBackboneType=true)]
     public partial class ExampleComponent : Hl7.Fhir.Model.Element
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ElementDefinition#Example"; } }
+      public override string TypeName { get { return "ElementDefinition.example"; } }
 
       /// <summary>
       /// Describes the purpose of this example
@@ -1493,14 +1488,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ElementDefinition#Constraint")]
-    [BackboneType("ElementDefinition.constraint")]
+    [FhirType("ElementDefinition.constraint", IsBackboneType=true)]
     public partial class ConstraintComponent : Hl7.Fhir.Model.Element
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ElementDefinition#Constraint"; } }
+      public override string TypeName { get { return "ElementDefinition.constraint"; } }
 
       /// <summary>
       /// Target of 'condition' reference above
@@ -1947,14 +1941,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ElementDefinition#ElementDefinitionBinding")]
-    [BackboneType("ElementDefinition.binding")]
+    [FhirType("ElementDefinition.binding", IsBackboneType=true)]
     public partial class ElementDefinitionBindingComponent : Hl7.Fhir.Model.Element
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ElementDefinition#ElementDefinitionBinding"; } }
+      public override string TypeName { get { return "ElementDefinition.binding"; } }
 
       /// <summary>
       /// required | extensible | preferred | example
@@ -2208,14 +2201,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ElementDefinition#Additional")]
-    [BackboneType("ElementDefinition.binding.additional")]
+    [FhirType("ElementDefinition.binding.additional", IsBackboneType=true)]
     public partial class AdditionalComponent : Hl7.Fhir.Model.Element
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ElementDefinition#Additional"; } }
+      public override string TypeName { get { return "ElementDefinition.binding.additional"; } }
 
       /// <summary>
       /// maximum | minimum | required | extensible | candidate | current | preferred | ui | starter | component. Note: Element was introduced in R5, do not use when working with older releases.
@@ -2555,14 +2547,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ElementDefinition#Mapping")]
-    [BackboneType("ElementDefinition.mapping")]
+    [FhirType("ElementDefinition.mapping", IsBackboneType=true)]
     public partial class MappingComponent : Hl7.Fhir.Model.Element
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ElementDefinition#Mapping"; } }
+      public override string TypeName { get { return "ElementDefinition.mapping"; } }
 
       /// <summary>
       /// Reference to mapping declaration
diff --git a/src/Hl7.Fhir.Conformance/Model/Generated/StructureDefinition.cs b/src/Hl7.Fhir.Conformance/Model/Generated/StructureDefinition.cs
index e14ea68be0..2f82e963ee 100644
--- a/src/Hl7.Fhir.Conformance/Model/Generated/StructureDefinition.cs
+++ b/src/Hl7.Fhir.Conformance/Model/Generated/StructureDefinition.cs
@@ -151,14 +151,13 @@ public enum ExtensionContextType
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("StructureDefinition#Mapping")]
-    [BackboneType("StructureDefinition.mapping")]
+    [FhirType("StructureDefinition.mapping", IsBackboneType=true)]
     public partial class MappingComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "StructureDefinition#Mapping"; } }
+      public override string TypeName { get { return "StructureDefinition.mapping"; } }
 
       /// <summary>
       /// Internal id when this mapping is used
@@ -425,14 +424,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("StructureDefinition#Context")]
-    [BackboneType("StructureDefinition.context")]
+    [FhirType("StructureDefinition.context", IsBackboneType=true)]
     public partial class ContextComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "StructureDefinition#Context"; } }
+      public override string TypeName { get { return "StructureDefinition.context"; } }
 
       /// <summary>
       /// fhirpath | element | extension
@@ -616,14 +614,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("StructureDefinition#Snapshot")]
-    [BackboneType("StructureDefinition.snapshot")]
+    [FhirType("StructureDefinition.snapshot", IsBackboneType=true)]
     public partial class SnapshotComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "StructureDefinition#Snapshot"; } }
+      public override string TypeName { get { return "StructureDefinition.snapshot"; } }
 
       /// <summary>
       /// Definition of elements in the resource (if no StructureDefinition)
@@ -743,14 +740,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("StructureDefinition#Differential")]
-    [BackboneType("StructureDefinition.differential")]
+    [FhirType("StructureDefinition.differential", IsBackboneType=true)]
     public partial class DifferentialComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "StructureDefinition#Differential"; } }
+      public override string TypeName { get { return "StructureDefinition.differential"; } }
 
       /// <summary>
       /// Definition of elements in the resource (if no StructureDefinition)
diff --git a/src/Hl7.Fhir.Conformance/Model/Generated/ValueSet.cs b/src/Hl7.Fhir.Conformance/Model/Generated/ValueSet.cs
index 795abde72a..ffb38af3f8 100644
--- a/src/Hl7.Fhir.Conformance/Model/Generated/ValueSet.cs
+++ b/src/Hl7.Fhir.Conformance/Model/Generated/ValueSet.cs
@@ -67,14 +67,13 @@ public partial class ValueSet : Hl7.Fhir.Model.DomainResource, IIdentifiable<Lis
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ValueSet#Compose")]
-    [BackboneType("ValueSet.compose")]
+    [FhirType("ValueSet.compose", IsBackboneType=true)]
     public partial class ComposeComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ValueSet#Compose"; } }
+      public override string TypeName { get { return "ValueSet.compose"; } }
 
       /// <summary>
       /// Fixed date for references with no specified version (transitive)
@@ -350,14 +349,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ValueSet#ConceptSet")]
-    [BackboneType("ValueSet.compose.include")]
+    [FhirType("ValueSet.compose.include", IsBackboneType=true)]
     public partial class ConceptSetComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ValueSet#ConceptSet"; } }
+      public override string TypeName { get { return "ValueSet.compose.include"; } }
 
       /// <summary>
       /// The system the codes come from
@@ -677,14 +675,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ValueSet#ConceptReference")]
-    [BackboneType("ValueSet.compose.include.concept")]
+    [FhirType("ValueSet.compose.include.concept", IsBackboneType=true)]
     public partial class ConceptReferenceComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ValueSet#ConceptReference"; } }
+      public override string TypeName { get { return "ValueSet.compose.include.concept"; } }
 
       /// <summary>
       /// Code or expression from system
@@ -892,14 +889,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ValueSet#Designation")]
-    [BackboneType("ValueSet.compose.include.concept.designation")]
+    [FhirType("ValueSet.compose.include.concept.designation", IsBackboneType=true)]
     public partial class DesignationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ValueSet#Designation"; } }
+      public override string TypeName { get { return "ValueSet.compose.include.concept.designation"; } }
 
       /// <summary>
       /// Human language of the designation
@@ -1135,14 +1131,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ValueSet#Filter")]
-    [BackboneType("ValueSet.compose.include.filter")]
+    [FhirType("ValueSet.compose.include.filter", IsBackboneType=true)]
     public partial class FilterComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ValueSet#Filter"; } }
+      public override string TypeName { get { return "ValueSet.compose.include.filter"; } }
 
       /// <summary>
       /// A property/filter defined by the code system
@@ -1372,14 +1367,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ValueSet#Expansion")]
-    [BackboneType("ValueSet.expansion")]
+    [FhirType("ValueSet.expansion", IsBackboneType=true)]
     public partial class ExpansionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ValueSet#Expansion"; } }
+      public override string TypeName { get { return "ValueSet.expansion"; } }
 
       /// <summary>
       /// Identifies the value set expansion (business identifier)
@@ -1768,14 +1762,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ValueSet#Parameter")]
-    [BackboneType("ValueSet.expansion.parameter")]
+    [FhirType("ValueSet.expansion.parameter", IsBackboneType=true)]
     public partial class ParameterComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ValueSet#Parameter"; } }
+      public override string TypeName { get { return "ValueSet.expansion.parameter"; } }
 
       /// <summary>
       /// Name as assigned by the client or server
@@ -1940,14 +1933,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ValueSet#Property")]
-    [BackboneType("ValueSet.expansion.property")]
+    [FhirType("ValueSet.expansion.property", IsBackboneType=true)]
     public partial class PropertyComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ValueSet#Property"; } }
+      public override string TypeName { get { return "ValueSet.expansion.property"; } }
 
       /// <summary>
       /// Identifies the property on the concepts, and when referred to in operations
@@ -2128,14 +2120,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ValueSet#Contains")]
-    [BackboneType("ValueSet.expansion.contains")]
+    [FhirType("ValueSet.expansion.contains", IsBackboneType=true)]
     public partial class ContainsComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ValueSet#Contains"; } }
+      public override string TypeName { get { return "ValueSet.expansion.contains"; } }
 
       /// <summary>
       /// System value for the code
@@ -2565,14 +2556,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ValueSet#ConceptProperty")]
-    [BackboneType("ValueSet.expansion.contains.property")]
+    [FhirType("ValueSet.expansion.contains.property", IsBackboneType=true)]
     public partial class ConceptPropertyComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ValueSet#ConceptProperty"; } }
+      public override string TypeName { get { return "ValueSet.expansion.contains.property"; } }
 
       /// <summary>
       /// Reference to ValueSet.expansion.property.code
@@ -2764,14 +2754,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ValueSet#ConceptSubProperty")]
-    [BackboneType("ValueSet.expansion.contains.property.subProperty")]
+    [FhirType("ValueSet.expansion.contains.property.subProperty", IsBackboneType=true)]
     public partial class ConceptSubPropertyComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ValueSet#ConceptSubProperty"; } }
+      public override string TypeName { get { return "ValueSet.expansion.contains.property.subProperty"; } }
 
       /// <summary>
       /// Reference to ValueSet.expansion.property.code. Note: Element was introduced in R5, do not use when working with older releases.
@@ -2934,14 +2923,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("ValueSet#Scope")]
-    [BackboneType("ValueSet.scope")]
+    [FhirType("ValueSet.scope", IsBackboneType=true)]
     public partial class ScopeComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ValueSet#Scope"; } }
+      public override string TypeName { get { return "ValueSet.scope"; } }
 
       /// <summary>
       /// Criteria describing which concepts or codes should be included and why
diff --git a/src/Hl7.Fhir.R4/Model/Generated/Account.cs b/src/Hl7.Fhir.R4/Model/Generated/Account.cs
index 1c31eb6190..030c5e3bb2 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/Account.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/Account.cs
@@ -109,14 +109,13 @@ public enum AccountStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Account#Coverage")]
-    [BackboneType("Account.coverage")]
+    [FhirType("Account.coverage", IsBackboneType=true)]
     public partial class CoverageComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Account#Coverage"; } }
+      public override string TypeName { get { return "Account.coverage"; } }
 
       /// <summary>
       /// The party(s), such as insurances, that may contribute to the payment of this account
@@ -281,14 +280,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Account#Guarantor")]
-    [BackboneType("Account.guarantor")]
+    [FhirType("Account.guarantor", IsBackboneType=true)]
     public partial class GuarantorComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Account#Guarantor"; } }
+      public override string TypeName { get { return "Account.guarantor"; } }
 
       /// <summary>
       /// Responsible entity
diff --git a/src/Hl7.Fhir.R4/Model/Generated/ActivityDefinition.cs b/src/Hl7.Fhir.R4/Model/Generated/ActivityDefinition.cs
index 3557852d14..4b30543734 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/ActivityDefinition.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/ActivityDefinition.cs
@@ -167,14 +167,13 @@ public enum RequestResourceType
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ActivityDefinition#Participant")]
-    [BackboneType("ActivityDefinition.participant")]
+    [FhirType("ActivityDefinition.participant", IsBackboneType=true)]
     public partial class ParticipantComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ActivityDefinition#Participant"; } }
+      public override string TypeName { get { return "ActivityDefinition.participant"; } }
 
       /// <summary>
       /// patient | practitioner | related-person | device
@@ -341,14 +340,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ActivityDefinition#DynamicValue")]
-    [BackboneType("ActivityDefinition.dynamicValue")]
+    [FhirType("ActivityDefinition.dynamicValue", IsBackboneType=true)]
     public partial class DynamicValueComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ActivityDefinition#DynamicValue"; } }
+      public override string TypeName { get { return "ActivityDefinition.dynamicValue"; } }
 
       /// <summary>
       /// The path to the element to be set dynamically
diff --git a/src/Hl7.Fhir.R4/Model/Generated/AdverseEvent.cs b/src/Hl7.Fhir.R4/Model/Generated/AdverseEvent.cs
index 7ca183a3c5..99cd32e82d 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/AdverseEvent.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/AdverseEvent.cs
@@ -163,14 +163,13 @@ public enum AdverseEventOutcome
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("AdverseEvent#SuspectEntity")]
-    [BackboneType("AdverseEvent.suspectEntity")]
+    [FhirType("AdverseEvent.suspectEntity", IsBackboneType=true)]
     public partial class SuspectEntityComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "AdverseEvent#SuspectEntity"; } }
+      public override string TypeName { get { return "AdverseEvent.suspectEntity"; } }
 
       /// <summary>
       /// Refers to the specific entity that caused the adverse event
@@ -315,14 +314,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("AdverseEvent#Causality")]
-    [BackboneType("AdverseEvent.suspectEntity.causality")]
+    [FhirType("AdverseEvent.suspectEntity.causality", IsBackboneType=true)]
     public partial class CausalityComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "AdverseEvent#Causality"; } }
+      public override string TypeName { get { return "AdverseEvent.suspectEntity.causality"; } }
 
       /// <summary>
       /// Assessment of if the entity caused the event
diff --git a/src/Hl7.Fhir.R4/Model/Generated/AllergyIntolerance.cs b/src/Hl7.Fhir.R4/Model/Generated/AllergyIntolerance.cs
index d1c0385d20..8e4a9a4760 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/AllergyIntolerance.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/AllergyIntolerance.cs
@@ -242,14 +242,13 @@ public enum AllergyIntoleranceSeverity
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("AllergyIntolerance#Reaction")]
-    [BackboneType("AllergyIntolerance.reaction")]
+    [FhirType("AllergyIntolerance.reaction", IsBackboneType=true)]
     public partial class ReactionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "AllergyIntolerance#Reaction"; } }
+      public override string TypeName { get { return "AllergyIntolerance.reaction"; } }
 
       /// <summary>
       /// Specific substance or pharmaceutical product considered to be responsible for event
diff --git a/src/Hl7.Fhir.R4/Model/Generated/Appointment.cs b/src/Hl7.Fhir.R4/Model/Generated/Appointment.cs
index 08a82801f4..cdac934dd7 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/Appointment.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/Appointment.cs
@@ -162,14 +162,13 @@ public enum ParticipantRequired
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Appointment#Participant")]
-    [BackboneType("Appointment.participant")]
+    [FhirType("Appointment.participant", IsBackboneType=true)]
     public partial class ParticipantComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Appointment#Participant"; } }
+      public override string TypeName { get { return "Appointment.participant"; } }
 
       /// <summary>
       /// Role of participant in the appointment
diff --git a/src/Hl7.Fhir.R4/Model/Generated/AuditEvent.cs b/src/Hl7.Fhir.R4/Model/Generated/AuditEvent.cs
index f725c2647b..a2d01919bf 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/AuditEvent.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/AuditEvent.cs
@@ -184,14 +184,13 @@ public enum AuditEventAgentNetworkType
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("AuditEvent#Agent")]
-    [BackboneType("AuditEvent.agent")]
+    [FhirType("AuditEvent.agent", IsBackboneType=true)]
     public partial class AgentComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "AuditEvent#Agent"; } }
+      public override string TypeName { get { return "AuditEvent.agent"; } }
 
       /// <summary>
       /// How agent participated
@@ -644,14 +643,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("AuditEvent#Network")]
-    [BackboneType("AuditEvent.agent.network")]
+    [FhirType("AuditEvent.agent.network", IsBackboneType=true)]
     public partial class NetworkComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "AuditEvent#Network"; } }
+      public override string TypeName { get { return "AuditEvent.agent.network"; } }
 
       /// <summary>
       /// Identifier for the network access point of the user device
@@ -834,14 +832,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("AuditEvent#Source")]
-    [BackboneType("AuditEvent.source")]
+    [FhirType("AuditEvent.source", IsBackboneType=true)]
     public partial class SourceComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "AuditEvent#Source"; } }
+      public override string TypeName { get { return "AuditEvent.source"; } }
 
       /// <summary>
       /// Logical source location within the enterprise
@@ -1034,14 +1031,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("AuditEvent#Entity")]
-    [BackboneType("AuditEvent.entity")]
+    [FhirType("AuditEvent.entity", IsBackboneType=true)]
     public partial class EntityComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "AuditEvent#Entity"; } }
+      public override string TypeName { get { return "AuditEvent.entity"; } }
 
       /// <summary>
       /// Specific instance of resource
@@ -1422,14 +1418,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("AuditEvent#Detail")]
-    [BackboneType("AuditEvent.entity.detail")]
+    [FhirType("AuditEvent.entity.detail", IsBackboneType=true)]
     public partial class DetailComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "AuditEvent#Detail"; } }
+      public override string TypeName { get { return "AuditEvent.entity.detail"; } }
 
       /// <summary>
       /// Name of the property
diff --git a/src/Hl7.Fhir.R4/Model/Generated/BiologicallyDerivedProduct.cs b/src/Hl7.Fhir.R4/Model/Generated/BiologicallyDerivedProduct.cs
index a377a89fcd..41ec2d9cc9 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/BiologicallyDerivedProduct.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/BiologicallyDerivedProduct.cs
@@ -156,14 +156,13 @@ public enum BiologicallyDerivedProductStorageScale
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("BiologicallyDerivedProduct#Collection")]
-    [BackboneType("BiologicallyDerivedProduct.collection")]
+    [FhirType("BiologicallyDerivedProduct.collection", IsBackboneType=true)]
     public partial class CollectionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "BiologicallyDerivedProduct#Collection"; } }
+      public override string TypeName { get { return "BiologicallyDerivedProduct.collection"; } }
 
       /// <summary>
       /// Individual performing collection
@@ -338,14 +337,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("BiologicallyDerivedProduct#Processing")]
-    [BackboneType("BiologicallyDerivedProduct.processing")]
+    [FhirType("BiologicallyDerivedProduct.processing", IsBackboneType=true)]
     public partial class ProcessingComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "BiologicallyDerivedProduct#Processing"; } }
+      public override string TypeName { get { return "BiologicallyDerivedProduct.processing"; } }
 
       /// <summary>
       /// Description of of processing
@@ -562,14 +560,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("BiologicallyDerivedProduct#Manipulation")]
-    [BackboneType("BiologicallyDerivedProduct.manipulation")]
+    [FhirType("BiologicallyDerivedProduct.manipulation", IsBackboneType=true)]
     public partial class ManipulationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "BiologicallyDerivedProduct#Manipulation"; } }
+      public override string TypeName { get { return "BiologicallyDerivedProduct.manipulation"; } }
 
       /// <summary>
       /// Description of manipulation
@@ -730,14 +727,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("BiologicallyDerivedProduct#Storage")]
-    [BackboneType("BiologicallyDerivedProduct.storage")]
+    [FhirType("BiologicallyDerivedProduct.storage", IsBackboneType=true)]
     public partial class StorageComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "BiologicallyDerivedProduct#Storage"; } }
+      public override string TypeName { get { return "BiologicallyDerivedProduct.storage"; } }
 
       /// <summary>
       /// Description of storage
diff --git a/src/Hl7.Fhir.R4/Model/Generated/CarePlan.cs b/src/Hl7.Fhir.R4/Model/Generated/CarePlan.cs
index 3c5ac680c4..adb4d5e6d9 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/CarePlan.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/CarePlan.cs
@@ -223,14 +223,13 @@ public enum CarePlanActivityStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CarePlan#Activity")]
-    [BackboneType("CarePlan.activity")]
+    [FhirType("CarePlan.activity", IsBackboneType=true)]
     public partial class ActivityComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "CarePlan#Activity"; } }
+      public override string TypeName { get { return "CarePlan.activity"; } }
 
       /// <summary>
       /// Results of the activity
@@ -457,14 +456,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CarePlan#Detail")]
-    [BackboneType("CarePlan.activity.detail")]
+    [FhirType("CarePlan.activity.detail", IsBackboneType=true)]
     public partial class DetailComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "CarePlan#Detail"; } }
+      public override string TypeName { get { return "CarePlan.activity.detail"; } }
 
       /// <summary>
       /// Appointment | CommunicationRequest | DeviceRequest | MedicationRequest | NutritionOrder | Task | ServiceRequest | VisionPrescription
diff --git a/src/Hl7.Fhir.R4/Model/Generated/CareTeam.cs b/src/Hl7.Fhir.R4/Model/Generated/CareTeam.cs
index 956742dd12..d4b7e9a029 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/CareTeam.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/CareTeam.cs
@@ -107,14 +107,13 @@ public enum CareTeamStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CareTeam#Participant")]
-    [BackboneType("CareTeam.participant")]
+    [FhirType("CareTeam.participant", IsBackboneType=true)]
     public partial class ParticipantComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "CareTeam#Participant"; } }
+      public override string TypeName { get { return "CareTeam.participant"; } }
 
       /// <summary>
       /// Type of involvement
diff --git a/src/Hl7.Fhir.R4/Model/Generated/CatalogEntry.cs b/src/Hl7.Fhir.R4/Model/Generated/CatalogEntry.cs
index 8c9596dc87..54b82e1551 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/CatalogEntry.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/CatalogEntry.cs
@@ -89,14 +89,13 @@ public enum CatalogEntryRelationType
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CatalogEntry#RelatedEntry")]
-    [BackboneType("CatalogEntry.relatedEntry")]
+    [FhirType("CatalogEntry.relatedEntry", IsBackboneType=true)]
     public partial class RelatedEntryComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "CatalogEntry#RelatedEntry"; } }
+      public override string TypeName { get { return "CatalogEntry.relatedEntry"; } }
 
       /// <summary>
       /// triggers | is-replaced-by
diff --git a/src/Hl7.Fhir.R4/Model/Generated/ChargeItem.cs b/src/Hl7.Fhir.R4/Model/Generated/ChargeItem.cs
index dc2f868c1c..3f22ad1d99 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/ChargeItem.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/ChargeItem.cs
@@ -119,14 +119,13 @@ public enum ChargeItemStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ChargeItem#Performer")]
-    [BackboneType("ChargeItem.performer")]
+    [FhirType("ChargeItem.performer", IsBackboneType=true)]
     public partial class PerformerComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ChargeItem#Performer"; } }
+      public override string TypeName { get { return "ChargeItem.performer"; } }
 
       /// <summary>
       /// What type of performance was done
diff --git a/src/Hl7.Fhir.R4/Model/Generated/ChargeItemDefinition.cs b/src/Hl7.Fhir.R4/Model/Generated/ChargeItemDefinition.cs
index d13a37e2e0..7f3b7771f9 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/ChargeItemDefinition.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/ChargeItemDefinition.cs
@@ -68,14 +68,13 @@ public partial class ChargeItemDefinition : Hl7.Fhir.Model.DomainResource, IIden
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ChargeItemDefinition#Applicability")]
-    [BackboneType("ChargeItemDefinition.applicability")]
+    [FhirType("ChargeItemDefinition.applicability", IsBackboneType=true)]
     public partial class ApplicabilityComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ChargeItemDefinition#Applicability"; } }
+      public override string TypeName { get { return "ChargeItemDefinition.applicability"; } }
 
       /// <summary>
       /// Natural language description of the condition
@@ -298,14 +297,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ChargeItemDefinition#PropertyGroup")]
-    [BackboneType("ChargeItemDefinition.propertyGroup")]
+    [FhirType("ChargeItemDefinition.propertyGroup", IsBackboneType=true)]
     public partial class PropertyGroupComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ChargeItemDefinition#PropertyGroup"; } }
+      public override string TypeName { get { return "ChargeItemDefinition.propertyGroup"; } }
 
       /// <summary>
       /// Conditions under which the priceComponent is applicable
@@ -451,14 +449,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ChargeItemDefinition#PriceComponent")]
-    [BackboneType("ChargeItemDefinition.propertyGroup.priceComponent")]
+    [FhirType("ChargeItemDefinition.propertyGroup.priceComponent", IsBackboneType=true)]
     public partial class PriceComponentComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ChargeItemDefinition#PriceComponent"; } }
+      public override string TypeName { get { return "ChargeItemDefinition.propertyGroup.priceComponent"; } }
 
       /// <summary>
       /// base | surcharge | deduction | discount | tax | informational
diff --git a/src/Hl7.Fhir.R4/Model/Generated/Claim.cs b/src/Hl7.Fhir.R4/Model/Generated/Claim.cs
index d67e587a7d..032ac84108 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/Claim.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/Claim.cs
@@ -69,14 +69,13 @@ public partial class Claim : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<I
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Claim#RelatedClaim")]
-    [BackboneType("Claim.related")]
+    [FhirType("Claim.related", IsBackboneType=true)]
     public partial class RelatedClaimComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Claim#RelatedClaim"; } }
+      public override string TypeName { get { return "Claim.related"; } }
 
       /// <summary>
       /// Reference to the related claim
@@ -249,14 +248,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Claim#Payee")]
-    [BackboneType("Claim.payee")]
+    [FhirType("Claim.payee", IsBackboneType=true)]
     public partial class PayeeComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Claim#Payee"; } }
+      public override string TypeName { get { return "Claim.payee"; } }
 
       /// <summary>
       /// Category of recipient
@@ -404,14 +402,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Claim#CareTeam")]
-    [BackboneType("Claim.careTeam")]
+    [FhirType("Claim.careTeam", IsBackboneType=true)]
     public partial class CareTeamComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Claim#CareTeam"; } }
+      public override string TypeName { get { return "Claim.careTeam"; } }
 
       /// <summary>
       /// Order of care team
@@ -673,14 +670,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Claim#SupportingInformation")]
-    [BackboneType("Claim.supportingInfo")]
+    [FhirType("Claim.supportingInfo", IsBackboneType=true)]
     public partial class SupportingInformationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Claim#SupportingInformation"; } }
+      public override string TypeName { get { return "Claim.supportingInfo"; } }
 
       /// <summary>
       /// Information instance identifier
@@ -952,14 +948,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Claim#Diagnosis")]
-    [BackboneType("Claim.diagnosis")]
+    [FhirType("Claim.diagnosis", IsBackboneType=true)]
     public partial class DiagnosisComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Claim#Diagnosis"; } }
+      public override string TypeName { get { return "Claim.diagnosis"; } }
 
       /// <summary>
       /// Diagnosis instance identifier
@@ -1206,14 +1201,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Claim#Procedure")]
-    [BackboneType("Claim.procedure")]
+    [FhirType("Claim.procedure", IsBackboneType=true)]
     public partial class ProcedureComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Claim#Procedure"; } }
+      public override string TypeName { get { return "Claim.procedure"; } }
 
       /// <summary>
       /// Procedure instance identifier
@@ -1480,14 +1474,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Claim#Insurance")]
-    [BackboneType("Claim.insurance")]
+    [FhirType("Claim.insurance", IsBackboneType=true)]
     public partial class InsuranceComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Claim#Insurance"; } }
+      public override string TypeName { get { return "Claim.insurance"; } }
 
       /// <summary>
       /// Insurance instance identifier
@@ -1836,14 +1829,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Claim#Accident")]
-    [BackboneType("Claim.accident")]
+    [FhirType("Claim.accident", IsBackboneType=true)]
     public partial class AccidentComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Claim#Accident"; } }
+      public override string TypeName { get { return "Claim.accident"; } }
 
       /// <summary>
       /// When the incident occurred
@@ -2035,14 +2027,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Claim#Item")]
-    [BackboneType("Claim.item")]
+    [FhirType("Claim.item", IsBackboneType=true)]
     public partial class ItemComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Claim#Item"; } }
+      public override string TypeName { get { return "Claim.item"; } }
 
       /// <summary>
       /// Item instance identifier
@@ -2798,14 +2789,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Claim#Detail")]
-    [BackboneType("Claim.item.detail")]
+    [FhirType("Claim.item.detail", IsBackboneType=true)]
     public partial class DetailComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Claim#Detail"; } }
+      public override string TypeName { get { return "Claim.item.detail"; } }
 
       /// <summary>
       /// Item instance identifier
@@ -3248,14 +3238,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Claim#SubDetail")]
-    [BackboneType("Claim.item.detail.subDetail")]
+    [FhirType("Claim.item.detail.subDetail", IsBackboneType=true)]
     public partial class SubDetailComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Claim#SubDetail"; } }
+      public override string TypeName { get { return "Claim.item.detail.subDetail"; } }
 
       /// <summary>
       /// Item instance identifier
diff --git a/src/Hl7.Fhir.R4/Model/Generated/ClaimResponse.cs b/src/Hl7.Fhir.R4/Model/Generated/ClaimResponse.cs
index 7227e1e6e5..b8949d427b 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/ClaimResponse.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/ClaimResponse.cs
@@ -67,14 +67,13 @@ public partial class ClaimResponse : Hl7.Fhir.Model.DomainResource, IIdentifiabl
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ClaimResponse#Item")]
-    [BackboneType("ClaimResponse.item")]
+    [FhirType("ClaimResponse.item", IsBackboneType=true)]
     public partial class ItemComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ClaimResponse#Item"; } }
+      public override string TypeName { get { return "ClaimResponse.item"; } }
 
       /// <summary>
       /// Claim item instance identifier
@@ -308,14 +307,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ClaimResponse#Adjudication")]
-    [BackboneType("ClaimResponse.item.adjudication")]
+    [FhirType("ClaimResponse.item.adjudication", IsBackboneType=true)]
     public partial class AdjudicationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ClaimResponse#Adjudication"; } }
+      public override string TypeName { get { return "ClaimResponse.item.adjudication"; } }
 
       /// <summary>
       /// Type of adjudication information
@@ -530,14 +528,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ClaimResponse#ItemDetail")]
-    [BackboneType("ClaimResponse.item.detail")]
+    [FhirType("ClaimResponse.item.detail", IsBackboneType=true)]
     public partial class ItemDetailComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ClaimResponse#ItemDetail"; } }
+      public override string TypeName { get { return "ClaimResponse.item.detail"; } }
 
       /// <summary>
       /// Claim detail instance identifier
@@ -771,14 +768,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ClaimResponse#SubDetail")]
-    [BackboneType("ClaimResponse.item.detail.subDetail")]
+    [FhirType("ClaimResponse.item.detail.subDetail", IsBackboneType=true)]
     public partial class SubDetailComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ClaimResponse#SubDetail"; } }
+      public override string TypeName { get { return "ClaimResponse.item.detail.subDetail"; } }
 
       /// <summary>
       /// Claim sub-detail instance identifier
@@ -986,14 +982,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ClaimResponse#AddedItem")]
-    [BackboneType("ClaimResponse.addItem")]
+    [FhirType("ClaimResponse.addItem", IsBackboneType=true)]
     public partial class AddedItemComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ClaimResponse#AddedItem"; } }
+      public override string TypeName { get { return "ClaimResponse.addItem"; } }
 
       /// <summary>
       /// Item sequence number
@@ -1651,14 +1646,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ClaimResponse#AddedItemDetail")]
-    [BackboneType("ClaimResponse.addItem.detail")]
+    [FhirType("ClaimResponse.addItem.detail", IsBackboneType=true)]
     public partial class AddedItemDetailComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ClaimResponse#AddedItemDetail"; } }
+      public override string TypeName { get { return "ClaimResponse.addItem.detail"; } }
 
       /// <summary>
       /// Billing, service, product, or drug code
@@ -2020,14 +2014,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ClaimResponse#AddedItemSubDetail")]
-    [BackboneType("ClaimResponse.addItem.detail.subDetail")]
+    [FhirType("ClaimResponse.addItem.detail.subDetail", IsBackboneType=true)]
     public partial class AddedItemSubDetailComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ClaimResponse#AddedItemSubDetail"; } }
+      public override string TypeName { get { return "ClaimResponse.addItem.detail.subDetail"; } }
 
       /// <summary>
       /// Billing, service, product, or drug code
@@ -2364,14 +2357,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ClaimResponse#Total")]
-    [BackboneType("ClaimResponse.total")]
+    [FhirType("ClaimResponse.total", IsBackboneType=true)]
     public partial class TotalComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ClaimResponse#Total"; } }
+      public override string TypeName { get { return "ClaimResponse.total"; } }
 
       /// <summary>
       /// Type of adjudication information
@@ -2518,14 +2510,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ClaimResponse#Payment")]
-    [BackboneType("ClaimResponse.payment")]
+    [FhirType("ClaimResponse.payment", IsBackboneType=true)]
     public partial class PaymentComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ClaimResponse#Payment"; } }
+      public override string TypeName { get { return "ClaimResponse.payment"; } }
 
       /// <summary>
       /// Partial or complete payment
@@ -2791,14 +2782,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ClaimResponse#Note")]
-    [BackboneType("ClaimResponse.processNote")]
+    [FhirType("ClaimResponse.processNote", IsBackboneType=true)]
     public partial class NoteComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ClaimResponse#Note"; } }
+      public override string TypeName { get { return "ClaimResponse.processNote"; } }
 
       /// <summary>
       /// Note instance identifier
@@ -3051,14 +3041,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ClaimResponse#Insurance")]
-    [BackboneType("ClaimResponse.insurance")]
+    [FhirType("ClaimResponse.insurance", IsBackboneType=true)]
     public partial class InsuranceComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ClaimResponse#Insurance"; } }
+      public override string TypeName { get { return "ClaimResponse.insurance"; } }
 
       /// <summary>
       /// Insurance instance identifier
@@ -3339,14 +3328,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ClaimResponse#Error")]
-    [BackboneType("ClaimResponse.error")]
+    [FhirType("ClaimResponse.error", IsBackboneType=true)]
     public partial class ErrorComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ClaimResponse#Error"; } }
+      public override string TypeName { get { return "ClaimResponse.error"; } }
 
       /// <summary>
       /// Item sequence number
diff --git a/src/Hl7.Fhir.R4/Model/Generated/ClinicalImpression.cs b/src/Hl7.Fhir.R4/Model/Generated/ClinicalImpression.cs
index b5debbfe14..149567b762 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/ClinicalImpression.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/ClinicalImpression.cs
@@ -95,14 +95,13 @@ public enum ClinicalImpressionStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ClinicalImpression#Investigation")]
-    [BackboneType("ClinicalImpression.investigation")]
+    [FhirType("ClinicalImpression.investigation", IsBackboneType=true)]
     public partial class InvestigationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ClinicalImpression#Investigation"; } }
+      public override string TypeName { get { return "ClinicalImpression.investigation"; } }
 
       /// <summary>
       /// A name/code for the set
@@ -251,14 +250,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ClinicalImpression#Finding")]
-    [BackboneType("ClinicalImpression.finding")]
+    [FhirType("ClinicalImpression.finding", IsBackboneType=true)]
     public partial class FindingComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ClinicalImpression#Finding"; } }
+      public override string TypeName { get { return "ClinicalImpression.finding"; } }
 
       /// <summary>
       /// What was found
diff --git a/src/Hl7.Fhir.R4/Model/Generated/Communication.cs b/src/Hl7.Fhir.R4/Model/Generated/Communication.cs
index 5384c72942..162987fd35 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/Communication.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/Communication.cs
@@ -67,14 +67,13 @@ public partial class Communication : Hl7.Fhir.Model.DomainResource, IIdentifiabl
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Communication#Payload")]
-    [BackboneType("Communication.payload")]
+    [FhirType("Communication.payload", IsBackboneType=true)]
     public partial class PayloadComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Communication#Payload"; } }
+      public override string TypeName { get { return "Communication.payload"; } }
 
       /// <summary>
       /// Message part content
diff --git a/src/Hl7.Fhir.R4/Model/Generated/CommunicationRequest.cs b/src/Hl7.Fhir.R4/Model/Generated/CommunicationRequest.cs
index 65e0a9aa0a..9f7484eedd 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/CommunicationRequest.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/CommunicationRequest.cs
@@ -67,14 +67,13 @@ public partial class CommunicationRequest : Hl7.Fhir.Model.DomainResource, IIden
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CommunicationRequest#Payload")]
-    [BackboneType("CommunicationRequest.payload")]
+    [FhirType("CommunicationRequest.payload", IsBackboneType=true)]
     public partial class PayloadComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "CommunicationRequest#Payload"; } }
+      public override string TypeName { get { return "CommunicationRequest.payload"; } }
 
       /// <summary>
       /// Message part content
diff --git a/src/Hl7.Fhir.R4/Model/Generated/CompartmentDefinition.cs b/src/Hl7.Fhir.R4/Model/Generated/CompartmentDefinition.cs
index cbf166ee02..a784aa575f 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/CompartmentDefinition.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/CompartmentDefinition.cs
@@ -68,14 +68,13 @@ public partial class CompartmentDefinition : Hl7.Fhir.Model.DomainResource
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CompartmentDefinition#Resource")]
-    [BackboneType("CompartmentDefinition.resource")]
+    [FhirType("CompartmentDefinition.resource", IsBackboneType=true)]
     public partial class ResourceComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "CompartmentDefinition#Resource"; } }
+      public override string TypeName { get { return "CompartmentDefinition.resource"; } }
 
       /// <summary>
       /// Name of resource type
diff --git a/src/Hl7.Fhir.R4/Model/Generated/Composition.cs b/src/Hl7.Fhir.R4/Model/Generated/Composition.cs
index 2f1433d3e2..e0b6677acb 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/Composition.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/Composition.cs
@@ -166,14 +166,13 @@ public enum CompositionAttestationMode
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Composition#Attester")]
-    [BackboneType("Composition.attester")]
+    [FhirType("Composition.attester", IsBackboneType=true)]
     public partial class AttesterComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Composition#Attester"; } }
+      public override string TypeName { get { return "Composition.attester"; } }
 
       /// <summary>
       /// personal | professional | legal | official
@@ -384,14 +383,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Composition#RelatesTo")]
-    [BackboneType("Composition.relatesTo")]
+    [FhirType("Composition.relatesTo", IsBackboneType=true)]
     public partial class RelatesToComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Composition#RelatesTo"; } }
+      public override string TypeName { get { return "Composition.relatesTo"; } }
 
       /// <summary>
       /// replaces | transforms | signs | appends
@@ -561,14 +559,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Composition#Event")]
-    [BackboneType("Composition.event")]
+    [FhirType("Composition.event", IsBackboneType=true)]
     public partial class EventComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Composition#Event"; } }
+      public override string TypeName { get { return "Composition.event"; } }
 
       /// <summary>
       /// Code(s) that apply to the event being documented
@@ -742,14 +739,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Composition#Section")]
-    [BackboneType("Composition.section")]
+    [FhirType("Composition.section", IsBackboneType=true)]
     public partial class SectionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Composition#Section"; } }
+      public override string TypeName { get { return "Composition.section"; } }
 
       /// <summary>
       /// Label for section (e.g. for ToC)
diff --git a/src/Hl7.Fhir.R4/Model/Generated/ConceptMap.cs b/src/Hl7.Fhir.R4/Model/Generated/ConceptMap.cs
index 9043c2fc65..63521c4022 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/ConceptMap.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/ConceptMap.cs
@@ -95,14 +95,13 @@ public enum ConceptMapGroupUnmappedMode
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ConceptMap#Group")]
-    [BackboneType("ConceptMap.group")]
+    [FhirType("ConceptMap.group", IsBackboneType=true)]
     public partial class GroupComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ConceptMap#Group"; } }
+      public override string TypeName { get { return "ConceptMap.group"; } }
 
       /// <summary>
       /// Source system where concepts to be mapped are defined
@@ -420,14 +419,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ConceptMap#SourceElement")]
-    [BackboneType("ConceptMap.group.element")]
+    [FhirType("ConceptMap.group.element", IsBackboneType=true)]
     public partial class SourceElementComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ConceptMap#SourceElement"; } }
+      public override string TypeName { get { return "ConceptMap.group.element"; } }
 
       /// <summary>
       /// Identifies element being mapped
@@ -634,14 +632,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ConceptMap#TargetElement")]
-    [BackboneType("ConceptMap.group.element.target")]
+    [FhirType("ConceptMap.group.element.target", IsBackboneType=true)]
     public partial class TargetElementComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ConceptMap#TargetElement"; } }
+      public override string TypeName { get { return "ConceptMap.group.element.target"; } }
 
       /// <summary>
       /// Code that identifies the target element
@@ -962,14 +959,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ConceptMap#OtherElement")]
-    [BackboneType("ConceptMap.group.element.target.dependsOn")]
+    [FhirType("ConceptMap.group.element.target.dependsOn", IsBackboneType=true)]
     public partial class OtherElementComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ConceptMap#OtherElement"; } }
+      public override string TypeName { get { return "ConceptMap.group.element.target.dependsOn"; } }
 
       /// <summary>
       /// Reference to property mapping depends on
@@ -1238,14 +1234,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ConceptMap#Unmapped")]
-    [BackboneType("ConceptMap.group.unmapped")]
+    [FhirType("ConceptMap.group.unmapped", IsBackboneType=true)]
     public partial class UnmappedComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ConceptMap#Unmapped"; } }
+      public override string TypeName { get { return "ConceptMap.group.unmapped"; } }
 
       /// <summary>
       /// provided | fixed | other-map
diff --git a/src/Hl7.Fhir.R4/Model/Generated/Condition.cs b/src/Hl7.Fhir.R4/Model/Generated/Condition.cs
index 551c40f1d0..f4cceb9eaf 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/Condition.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/Condition.cs
@@ -159,14 +159,13 @@ public enum ConditionVerificationStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Condition#Stage")]
-    [BackboneType("Condition.stage")]
+    [FhirType("Condition.stage", IsBackboneType=true)]
     public partial class StageComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Condition#Stage"; } }
+      public override string TypeName { get { return "Condition.stage"; } }
 
       /// <summary>
       /// Simple summary (disease specific)
@@ -341,14 +340,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Condition#Evidence")]
-    [BackboneType("Condition.evidence")]
+    [FhirType("Condition.evidence", IsBackboneType=true)]
     public partial class EvidenceComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Condition#Evidence"; } }
+      public override string TypeName { get { return "Condition.evidence"; } }
 
       /// <summary>
       /// Manifestation/symptom
diff --git a/src/Hl7.Fhir.R4/Model/Generated/Consent.cs b/src/Hl7.Fhir.R4/Model/Generated/Consent.cs
index 5dc92b8616..c59c727a4c 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/Consent.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/Consent.cs
@@ -170,14 +170,13 @@ public enum ConsentDataMeaning
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Consent#Policy")]
-    [BackboneType("Consent.policy")]
+    [FhirType("Consent.policy", IsBackboneType=true)]
     public partial class PolicyComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Consent#Policy"; } }
+      public override string TypeName { get { return "Consent.policy"; } }
 
       /// <summary>
       /// Enforcement source for policy
@@ -357,14 +356,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Consent#Verification")]
-    [BackboneType("Consent.verification")]
+    [FhirType("Consent.verification", IsBackboneType=true)]
     public partial class VerificationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Consent#Verification"; } }
+      public override string TypeName { get { return "Consent.verification"; } }
 
       /// <summary>
       /// Has been verified
@@ -572,14 +570,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Consent#provision")]
-    [BackboneType("Consent.provision")]
+    [FhirType("Consent.provision", IsBackboneType=true)]
     public partial class provisionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Consent#provision"; } }
+      public override string TypeName { get { return "Consent.provision"; } }
 
       /// <summary>
       /// deny | permit
@@ -981,14 +978,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Consent#provisionActor")]
-    [BackboneType("Consent.provision.actor")]
+    [FhirType("Consent.provision.actor", IsBackboneType=true)]
     public partial class provisionActorComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Consent#provisionActor"; } }
+      public override string TypeName { get { return "Consent.provision.actor"; } }
 
       /// <summary>
       /// How the actor is involved
@@ -1137,14 +1133,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Consent#provisionData")]
-    [BackboneType("Consent.provision.data")]
+    [FhirType("Consent.provision.data", IsBackboneType=true)]
     public partial class provisionDataComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Consent#provisionData"; } }
+      public override string TypeName { get { return "Consent.provision.data"; } }
 
       /// <summary>
       /// instance | related | dependents | authoredby
diff --git a/src/Hl7.Fhir.R4/Model/Generated/Contract.cs b/src/Hl7.Fhir.R4/Model/Generated/Contract.cs
index 8b2b67cb32..9655948aff 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/Contract.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/Contract.cs
@@ -267,14 +267,13 @@ public enum ContractResourcePublicationStatusCodes
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Contract#ContentDefinition")]
-    [BackboneType("Contract.contentDefinition")]
+    [FhirType("Contract.contentDefinition", IsBackboneType=true)]
     public partial class ContentDefinitionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Contract#ContentDefinition"; } }
+      public override string TypeName { get { return "Contract.contentDefinition"; } }
 
       /// <summary>
       /// Content structure and use
@@ -580,14 +579,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Contract#Term")]
-    [BackboneType("Contract.term")]
+    [FhirType("Contract.term", IsBackboneType=true)]
     public partial class TermComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Contract#Term"; } }
+      public override string TypeName { get { return "Contract.term"; } }
 
       /// <summary>
       /// Contract Term Number
@@ -1027,14 +1025,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Contract#SecurityLabel")]
-    [BackboneType("Contract.term.securityLabel")]
+    [FhirType("Contract.term.securityLabel", IsBackboneType=true)]
     public partial class SecurityLabelComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Contract#SecurityLabel"; } }
+      public override string TypeName { get { return "Contract.term.securityLabel"; } }
 
       /// <summary>
       /// Link to Security Labels
@@ -1253,14 +1250,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Contract#ContractOffer")]
-    [BackboneType("Contract.term.offer")]
+    [FhirType("Contract.term.offer", IsBackboneType=true)]
     public partial class ContractOfferComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Contract#ContractOffer"; } }
+      public override string TypeName { get { return "Contract.term.offer"; } }
 
       /// <summary>
       /// Offer business ID
@@ -1666,14 +1662,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Contract#ContractParty")]
-    [BackboneType("Contract.term.offer.party")]
+    [FhirType("Contract.term.offer.party", IsBackboneType=true)]
     public partial class ContractPartyComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Contract#ContractParty"; } }
+      public override string TypeName { get { return "Contract.term.offer.party"; } }
 
       /// <summary>
       /// Referenced entity
@@ -1819,14 +1814,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Contract#Answer")]
-    [BackboneType("Contract.term.offer.answer")]
+    [FhirType("Contract.term.offer.answer", IsBackboneType=true)]
     public partial class AnswerComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Contract#Answer"; } }
+      public override string TypeName { get { return "Contract.term.offer.answer"; } }
 
       /// <summary>
       /// The actual answer response
@@ -1946,14 +1940,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Contract#ContractAsset")]
-    [BackboneType("Contract.term.asset")]
+    [FhirType("Contract.term.asset", IsBackboneType=true)]
     public partial class ContractAssetComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Contract#ContractAsset"; } }
+      public override string TypeName { get { return "Contract.term.asset"; } }
 
       /// <summary>
       /// Range of asset
@@ -2509,14 +2502,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Contract#AssetContext")]
-    [BackboneType("Contract.term.asset.context")]
+    [FhirType("Contract.term.asset.context", IsBackboneType=true)]
     public partial class AssetContextComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Contract#AssetContext"; } }
+      public override string TypeName { get { return "Contract.term.asset.context"; } }
 
       /// <summary>
       /// Creator,custodian or owner
@@ -2704,14 +2696,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Contract#ValuedItem")]
-    [BackboneType("Contract.term.asset.valuedItem")]
+    [FhirType("Contract.term.asset.valuedItem", IsBackboneType=true)]
     public partial class ValuedItemComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Contract#ValuedItem"; } }
+      public override string TypeName { get { return "Contract.term.asset.valuedItem"; } }
 
       /// <summary>
       /// Contract Valued Item Type
@@ -3292,14 +3283,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Contract#Action")]
-    [BackboneType("Contract.term.action")]
+    [FhirType("Contract.term.action", IsBackboneType=true)]
     public partial class ActionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Contract#Action"; } }
+      public override string TypeName { get { return "Contract.term.action"; } }
 
       /// <summary>
       /// True if the term prohibits the  action
@@ -4091,14 +4081,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Contract#ActionSubject")]
-    [BackboneType("Contract.term.action.subject")]
+    [FhirType("Contract.term.action.subject", IsBackboneType=true)]
     public partial class ActionSubjectComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Contract#ActionSubject"; } }
+      public override string TypeName { get { return "Contract.term.action.subject"; } }
 
       /// <summary>
       /// Entity of the action
@@ -4248,14 +4237,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Contract#Signatory")]
-    [BackboneType("Contract.signer")]
+    [FhirType("Contract.signer", IsBackboneType=true)]
     public partial class SignatoryComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Contract#Signatory"; } }
+      public override string TypeName { get { return "Contract.signer"; } }
 
       /// <summary>
       /// Contract Signatory Role
@@ -4430,14 +4418,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Contract#FriendlyLanguage")]
-    [BackboneType("Contract.friendly")]
+    [FhirType("Contract.friendly", IsBackboneType=true)]
     public partial class FriendlyLanguageComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Contract#FriendlyLanguage"; } }
+      public override string TypeName { get { return "Contract.friendly"; } }
 
       /// <summary>
       /// Easily comprehended representation of this Contract
@@ -4560,14 +4547,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Contract#LegalLanguage")]
-    [BackboneType("Contract.legal")]
+    [FhirType("Contract.legal", IsBackboneType=true)]
     public partial class LegalLanguageComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Contract#LegalLanguage"; } }
+      public override string TypeName { get { return "Contract.legal"; } }
 
       /// <summary>
       /// Contract Legal Text
@@ -4690,14 +4676,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Contract#ComputableLanguage")]
-    [BackboneType("Contract.rule")]
+    [FhirType("Contract.rule", IsBackboneType=true)]
     public partial class ComputableLanguageComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Contract#ComputableLanguage"; } }
+      public override string TypeName { get { return "Contract.rule"; } }
 
       /// <summary>
       /// Computable Contract Rules
diff --git a/src/Hl7.Fhir.R4/Model/Generated/Coverage.cs b/src/Hl7.Fhir.R4/Model/Generated/Coverage.cs
index 82d1fcbd02..35a5028c7c 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/Coverage.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/Coverage.cs
@@ -69,14 +69,13 @@ public partial class Coverage : Hl7.Fhir.Model.DomainResource, IIdentifiable<Lis
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Coverage#Class")]
-    [BackboneType("Coverage.class")]
+    [FhirType("Coverage.class", IsBackboneType=true)]
     public partial class ClassComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Coverage#Class"; } }
+      public override string TypeName { get { return "Coverage.class"; } }
 
       /// <summary>
       /// Type of class such as 'group' or 'plan'
@@ -285,14 +284,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Coverage#CostToBeneficiary")]
-    [BackboneType("Coverage.costToBeneficiary")]
+    [FhirType("Coverage.costToBeneficiary", IsBackboneType=true)]
     public partial class CostToBeneficiaryComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Coverage#CostToBeneficiary"; } }
+      public override string TypeName { get { return "Coverage.costToBeneficiary"; } }
 
       /// <summary>
       /// Cost category
@@ -466,14 +464,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Coverage#Exemption")]
-    [BackboneType("Coverage.costToBeneficiary.exception")]
+    [FhirType("Coverage.costToBeneficiary.exception", IsBackboneType=true)]
     public partial class ExemptionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Coverage#Exemption"; } }
+      public override string TypeName { get { return "Coverage.costToBeneficiary.exception"; } }
 
       /// <summary>
       /// Exception category
diff --git a/src/Hl7.Fhir.R4/Model/Generated/CoverageEligibilityRequest.cs b/src/Hl7.Fhir.R4/Model/Generated/CoverageEligibilityRequest.cs
index 83191a0c9a..97280be900 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/CoverageEligibilityRequest.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/CoverageEligibilityRequest.cs
@@ -102,14 +102,13 @@ public enum EligibilityRequestPurpose
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CoverageEligibilityRequest#SupportingInformation")]
-    [BackboneType("CoverageEligibilityRequest.supportingInfo")]
+    [FhirType("CoverageEligibilityRequest.supportingInfo", IsBackboneType=true)]
     public partial class SupportingInformationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "CoverageEligibilityRequest#SupportingInformation"; } }
+      public override string TypeName { get { return "CoverageEligibilityRequest.supportingInfo"; } }
 
       /// <summary>
       /// Information instance identifier
@@ -319,14 +318,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CoverageEligibilityRequest#Insurance")]
-    [BackboneType("CoverageEligibilityRequest.insurance")]
+    [FhirType("CoverageEligibilityRequest.insurance", IsBackboneType=true)]
     public partial class InsuranceComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "CoverageEligibilityRequest#Insurance"; } }
+      public override string TypeName { get { return "CoverageEligibilityRequest.insurance"; } }
 
       /// <summary>
       /// Applicable coverage
@@ -534,14 +532,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CoverageEligibilityRequest#Details")]
-    [BackboneType("CoverageEligibilityRequest.item")]
+    [FhirType("CoverageEligibilityRequest.item", IsBackboneType=true)]
     public partial class DetailsComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "CoverageEligibilityRequest#Details"; } }
+      public override string TypeName { get { return "CoverageEligibilityRequest.item"; } }
 
       /// <summary>
       /// Applicable exception or supporting information
@@ -916,14 +913,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CoverageEligibilityRequest#Diagnosis")]
-    [BackboneType("CoverageEligibilityRequest.item.diagnosis")]
+    [FhirType("CoverageEligibilityRequest.item.diagnosis", IsBackboneType=true)]
     public partial class DiagnosisComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "CoverageEligibilityRequest#Diagnosis"; } }
+      public override string TypeName { get { return "CoverageEligibilityRequest.item.diagnosis"; } }
 
       /// <summary>
       /// Nature of illness or problem
diff --git a/src/Hl7.Fhir.R4/Model/Generated/CoverageEligibilityResponse.cs b/src/Hl7.Fhir.R4/Model/Generated/CoverageEligibilityResponse.cs
index d035b8b468..c0e40913ae 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/CoverageEligibilityResponse.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/CoverageEligibilityResponse.cs
@@ -102,14 +102,13 @@ public enum EligibilityResponsePurpose
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CoverageEligibilityResponse#Insurance")]
-    [BackboneType("CoverageEligibilityResponse.insurance")]
+    [FhirType("CoverageEligibilityResponse.insurance", IsBackboneType=true)]
     public partial class InsuranceComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "CoverageEligibilityResponse#Insurance"; } }
+      public override string TypeName { get { return "CoverageEligibilityResponse.insurance"; } }
 
       /// <summary>
       /// Insurance information
@@ -325,14 +324,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CoverageEligibilityResponse#Items")]
-    [BackboneType("CoverageEligibilityResponse.insurance.item")]
+    [FhirType("CoverageEligibilityResponse.insurance.item", IsBackboneType=true)]
     public partial class ItemsComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "CoverageEligibilityResponse#Items"; } }
+      public override string TypeName { get { return "CoverageEligibilityResponse.insurance.item"; } }
 
       /// <summary>
       /// Benefit classification
@@ -878,14 +876,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CoverageEligibilityResponse#Benefit")]
-    [BackboneType("CoverageEligibilityResponse.insurance.item.benefit")]
+    [FhirType("CoverageEligibilityResponse.insurance.item.benefit", IsBackboneType=true)]
     public partial class BenefitComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "CoverageEligibilityResponse#Benefit"; } }
+      public override string TypeName { get { return "CoverageEligibilityResponse.insurance.item.benefit"; } }
 
       /// <summary>
       /// Benefit classification
@@ -1060,14 +1057,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CoverageEligibilityResponse#Errors")]
-    [BackboneType("CoverageEligibilityResponse.error")]
+    [FhirType("CoverageEligibilityResponse.error", IsBackboneType=true)]
     public partial class ErrorsComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "CoverageEligibilityResponse#Errors"; } }
+      public override string TypeName { get { return "CoverageEligibilityResponse.error"; } }
 
       /// <summary>
       /// Error code detailing processing issues
diff --git a/src/Hl7.Fhir.R4/Model/Generated/DataRequirement.cs b/src/Hl7.Fhir.R4/Model/Generated/DataRequirement.cs
index e6bb13a650..488766bc2e 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/DataRequirement.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/DataRequirement.cs
@@ -89,14 +89,13 @@ public enum SortDirection
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("DataRequirement#CodeFilter")]
-    [BackboneType("DataRequirement.codeFilter")]
+    [FhirType("DataRequirement.codeFilter", IsBackboneType=true)]
     public partial class CodeFilterComponent : Hl7.Fhir.Model.Element
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "DataRequirement#CodeFilter"; } }
+      public override string TypeName { get { return "DataRequirement.codeFilter"; } }
 
       /// <summary>
       /// A code-valued attribute to filter on
@@ -345,14 +344,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("DataRequirement#DateFilter")]
-    [BackboneType("DataRequirement.dateFilter")]
+    [FhirType("DataRequirement.dateFilter", IsBackboneType=true)]
     public partial class DateFilterComponent : Hl7.Fhir.Model.Element
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "DataRequirement#DateFilter"; } }
+      public override string TypeName { get { return "DataRequirement.dateFilter"; } }
 
       /// <summary>
       /// A date-valued attribute to filter on
@@ -560,14 +558,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("DataRequirement#Sort")]
-    [BackboneType("DataRequirement.sort")]
+    [FhirType("DataRequirement.sort", IsBackboneType=true)]
     public partial class SortComponent : Hl7.Fhir.Model.Element
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "DataRequirement#Sort"; } }
+      public override string TypeName { get { return "DataRequirement.sort"; } }
 
       /// <summary>
       /// The name of the attribute to perform the sort
diff --git a/src/Hl7.Fhir.R4/Model/Generated/DetectedIssue.cs b/src/Hl7.Fhir.R4/Model/Generated/DetectedIssue.cs
index 6fd516b2f2..195bff0dc6 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/DetectedIssue.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/DetectedIssue.cs
@@ -95,14 +95,13 @@ public enum DetectedIssueSeverity
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("DetectedIssue#Evidence")]
-    [BackboneType("DetectedIssue.evidence")]
+    [FhirType("DetectedIssue.evidence", IsBackboneType=true)]
     public partial class EvidenceComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "DetectedIssue#Evidence"; } }
+      public override string TypeName { get { return "DetectedIssue.evidence"; } }
 
       /// <summary>
       /// Manifestation
@@ -251,14 +250,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("DetectedIssue#Mitigation")]
-    [BackboneType("DetectedIssue.mitigation")]
+    [FhirType("DetectedIssue.mitigation", IsBackboneType=true)]
     public partial class MitigationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "DetectedIssue#Mitigation"; } }
+      public override string TypeName { get { return "DetectedIssue.mitigation"; } }
 
       /// <summary>
       /// What mitigation?
diff --git a/src/Hl7.Fhir.R4/Model/Generated/Device.cs b/src/Hl7.Fhir.R4/Model/Generated/Device.cs
index 4abe9db83d..7d779f69e1 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/Device.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/Device.cs
@@ -148,14 +148,13 @@ public enum UDIEntryType
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Device#UdiCarrier")]
-    [BackboneType("Device.udiCarrier")]
+    [FhirType("Device.udiCarrier", IsBackboneType=true)]
     public partial class UdiCarrierComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Device#UdiCarrier"; } }
+      public override string TypeName { get { return "Device.udiCarrier"; } }
 
       /// <summary>
       /// Mandatory fixed portion of UDI
@@ -509,14 +508,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Device#DeviceName")]
-    [BackboneType("Device.deviceName")]
+    [FhirType("Device.deviceName", IsBackboneType=true)]
     public partial class DeviceNameComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Device#DeviceName"; } }
+      public override string TypeName { get { return "Device.deviceName"; } }
 
       /// <summary>
       /// The name of the device
@@ -697,14 +695,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Device#Specialization")]
-    [BackboneType("Device.specialization")]
+    [FhirType("Device.specialization", IsBackboneType=true)]
     public partial class SpecializationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Device#Specialization"; } }
+      public override string TypeName { get { return "Device.specialization"; } }
 
       /// <summary>
       /// The standard that is used to operate and communicate
@@ -864,14 +861,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Device#Version")]
-    [BackboneType("Device.version")]
+    [FhirType("Device.version", IsBackboneType=true)]
     public partial class VersionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Device#Version"; } }
+      public override string TypeName { get { return "Device.version"; } }
 
       /// <summary>
       /// The type of the device version
@@ -1056,14 +1052,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Device#Property")]
-    [BackboneType("Device.property")]
+    [FhirType("Device.property", IsBackboneType=true)]
     public partial class PropertyComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Device#Property"; } }
+      public override string TypeName { get { return "Device.property"; } }
 
       /// <summary>
       /// Code that specifies the property DeviceDefinitionPropetyCode (Extensible)
diff --git a/src/Hl7.Fhir.R4/Model/Generated/DeviceDefinition.cs b/src/Hl7.Fhir.R4/Model/Generated/DeviceDefinition.cs
index 2892044efd..0c488f75b8 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/DeviceDefinition.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/DeviceDefinition.cs
@@ -68,14 +68,13 @@ public partial class DeviceDefinition : Hl7.Fhir.Model.DomainResource, IIdentifi
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("DeviceDefinition#UdiDeviceIdentifier")]
-    [BackboneType("DeviceDefinition.udiDeviceIdentifier")]
+    [FhirType("DeviceDefinition.udiDeviceIdentifier", IsBackboneType=true)]
     public partial class UdiDeviceIdentifierComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "DeviceDefinition#UdiDeviceIdentifier"; } }
+      public override string TypeName { get { return "DeviceDefinition.udiDeviceIdentifier"; } }
 
       /// <summary>
       /// The identifier that is to be associated with every Device that references this DeviceDefintiion for the issuer and jurisdication porvided in the DeviceDefinition.udiDeviceIdentifier
@@ -298,14 +297,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("DeviceDefinition#DeviceName")]
-    [BackboneType("DeviceDefinition.deviceName")]
+    [FhirType("DeviceDefinition.deviceName", IsBackboneType=true)]
     public partial class DeviceNameComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "DeviceDefinition#DeviceName"; } }
+      public override string TypeName { get { return "DeviceDefinition.deviceName"; } }
 
       /// <summary>
       /// The name of the device
@@ -486,14 +484,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("DeviceDefinition#Specialization")]
-    [BackboneType("DeviceDefinition.specialization")]
+    [FhirType("DeviceDefinition.specialization", IsBackboneType=true)]
     public partial class SpecializationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "DeviceDefinition#Specialization"; } }
+      public override string TypeName { get { return "DeviceDefinition.specialization"; } }
 
       /// <summary>
       /// The standard that is used to operate and communicate
@@ -671,14 +668,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("DeviceDefinition#Capability")]
-    [BackboneType("DeviceDefinition.capability")]
+    [FhirType("DeviceDefinition.capability", IsBackboneType=true)]
     public partial class CapabilityComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "DeviceDefinition#Capability"; } }
+      public override string TypeName { get { return "DeviceDefinition.capability"; } }
 
       /// <summary>
       /// Type of capability
@@ -821,14 +817,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("DeviceDefinition#Property")]
-    [BackboneType("DeviceDefinition.property")]
+    [FhirType("DeviceDefinition.property", IsBackboneType=true)]
     public partial class PropertyComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "DeviceDefinition#Property"; } }
+      public override string TypeName { get { return "DeviceDefinition.property"; } }
 
       /// <summary>
       /// Code that specifies the property DeviceDefinitionPropetyCode (Extensible)
@@ -997,14 +992,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("DeviceDefinition#Material")]
-    [BackboneType("DeviceDefinition.material")]
+    [FhirType("DeviceDefinition.material", IsBackboneType=true)]
     public partial class MaterialComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "DeviceDefinition#Material"; } }
+      public override string TypeName { get { return "DeviceDefinition.material"; } }
 
       /// <summary>
       /// The substance
diff --git a/src/Hl7.Fhir.R4/Model/Generated/DeviceMetric.cs b/src/Hl7.Fhir.R4/Model/Generated/DeviceMetric.cs
index ed077a4de8..add986262e 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/DeviceMetric.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/DeviceMetric.cs
@@ -259,14 +259,13 @@ public enum DeviceMetricCalibrationState
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("DeviceMetric#Calibration")]
-    [BackboneType("DeviceMetric.calibration")]
+    [FhirType("DeviceMetric.calibration", IsBackboneType=true)]
     public partial class CalibrationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "DeviceMetric#Calibration"; } }
+      public override string TypeName { get { return "DeviceMetric.calibration"; } }
 
       /// <summary>
       /// unspecified | offset | gain | two-point
diff --git a/src/Hl7.Fhir.R4/Model/Generated/DeviceRequest.cs b/src/Hl7.Fhir.R4/Model/Generated/DeviceRequest.cs
index 564a312535..5a0564e469 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/DeviceRequest.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/DeviceRequest.cs
@@ -67,14 +67,13 @@ public partial class DeviceRequest : Hl7.Fhir.Model.DomainResource, IIdentifiabl
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("DeviceRequest#Parameter")]
-    [BackboneType("DeviceRequest.parameter")]
+    [FhirType("DeviceRequest.parameter", IsBackboneType=true)]
     public partial class ParameterComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "DeviceRequest#Parameter"; } }
+      public override string TypeName { get { return "DeviceRequest.parameter"; } }
 
       /// <summary>
       /// Device detail
diff --git a/src/Hl7.Fhir.R4/Model/Generated/DiagnosticReport.cs b/src/Hl7.Fhir.R4/Model/Generated/DiagnosticReport.cs
index a5bd3749b3..24d9b305a5 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/DiagnosticReport.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/DiagnosticReport.cs
@@ -138,14 +138,13 @@ public enum DiagnosticReportStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("DiagnosticReport#Media")]
-    [BackboneType("DiagnosticReport.media")]
+    [FhirType("DiagnosticReport.media", IsBackboneType=true)]
     public partial class MediaComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "DiagnosticReport#Media"; } }
+      public override string TypeName { get { return "DiagnosticReport.media"; } }
 
       /// <summary>
       /// Comment about the image (e.g. explanation)
diff --git a/src/Hl7.Fhir.R4/Model/Generated/DocumentManifest.cs b/src/Hl7.Fhir.R4/Model/Generated/DocumentManifest.cs
index 6f8fbe9ec6..716dd2142f 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/DocumentManifest.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/DocumentManifest.cs
@@ -68,14 +68,13 @@ public partial class DocumentManifest : Hl7.Fhir.Model.DomainResource, IIdentifi
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("DocumentManifest#Related")]
-    [BackboneType("DocumentManifest.related")]
+    [FhirType("DocumentManifest.related", IsBackboneType=true)]
     public partial class RelatedComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "DocumentManifest#Related"; } }
+      public override string TypeName { get { return "DocumentManifest.related"; } }
 
       /// <summary>
       /// Identifiers of things that are related
diff --git a/src/Hl7.Fhir.R4/Model/Generated/DocumentReference.cs b/src/Hl7.Fhir.R4/Model/Generated/DocumentReference.cs
index b2e9752f9c..5295dbe8c3 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/DocumentReference.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/DocumentReference.cs
@@ -69,14 +69,13 @@ public partial class DocumentReference : Hl7.Fhir.Model.DomainResource, IIdentif
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("DocumentReference#RelatesTo")]
-    [BackboneType("DocumentReference.relatesTo")]
+    [FhirType("DocumentReference.relatesTo", IsBackboneType=true)]
     public partial class RelatesToComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "DocumentReference#RelatesTo"; } }
+      public override string TypeName { get { return "DocumentReference.relatesTo"; } }
 
       /// <summary>
       /// replaces | transforms | signs | appends
@@ -244,14 +243,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("DocumentReference#Content")]
-    [BackboneType("DocumentReference.content")]
+    [FhirType("DocumentReference.content", IsBackboneType=true)]
     public partial class ContentComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "DocumentReference#Content"; } }
+      public override string TypeName { get { return "DocumentReference.content"; } }
 
       /// <summary>
       /// Where to access the document
@@ -398,14 +396,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("DocumentReference#Context")]
-    [BackboneType("DocumentReference.context")]
+    [FhirType("DocumentReference.context", IsBackboneType=true)]
     public partial class ContextComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "DocumentReference#Context"; } }
+      public override string TypeName { get { return "DocumentReference.context"; } }
 
       /// <summary>
       /// Context of the document  content
diff --git a/src/Hl7.Fhir.R4/Model/Generated/Dosage.cs b/src/Hl7.Fhir.R4/Model/Generated/Dosage.cs
index 29045dd164..1fa2a2a362 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/Dosage.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/Dosage.cs
@@ -67,14 +67,13 @@ public partial class Dosage : Hl7.Fhir.Model.BackboneType
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Dosage#DoseAndRate")]
-    [BackboneType("Dosage.doseAndRate")]
+    [FhirType("Dosage.doseAndRate", IsBackboneType=true)]
     public partial class DoseAndRateComponent : Hl7.Fhir.Model.Element
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Dosage#DoseAndRate"; } }
+      public override string TypeName { get { return "Dosage.doseAndRate"; } }
 
       /// <summary>
       /// The kind of dose or rate specified
diff --git a/src/Hl7.Fhir.R4/Model/Generated/EffectEvidenceSynthesis.cs b/src/Hl7.Fhir.R4/Model/Generated/EffectEvidenceSynthesis.cs
index 701a7f42ad..1ca8ff4820 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/EffectEvidenceSynthesis.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/EffectEvidenceSynthesis.cs
@@ -89,14 +89,13 @@ public enum ExposureStateCode
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("EffectEvidenceSynthesis#SampleSize")]
-    [BackboneType("EffectEvidenceSynthesis.sampleSize")]
+    [FhirType("EffectEvidenceSynthesis.sampleSize", IsBackboneType=true)]
     public partial class SampleSizeComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "EffectEvidenceSynthesis#SampleSize"; } }
+      public override string TypeName { get { return "EffectEvidenceSynthesis.sampleSize"; } }
 
       /// <summary>
       /// Description of sample size
@@ -319,14 +318,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("EffectEvidenceSynthesis#ResultsByExposure")]
-    [BackboneType("EffectEvidenceSynthesis.resultsByExposure")]
+    [FhirType("EffectEvidenceSynthesis.resultsByExposure", IsBackboneType=true)]
     public partial class ResultsByExposureComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "EffectEvidenceSynthesis#ResultsByExposure"; } }
+      public override string TypeName { get { return "EffectEvidenceSynthesis.resultsByExposure"; } }
 
       /// <summary>
       /// Description of results by exposure
@@ -562,14 +560,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("EffectEvidenceSynthesis#EffectEstimate")]
-    [BackboneType("EffectEvidenceSynthesis.effectEstimate")]
+    [FhirType("EffectEvidenceSynthesis.effectEstimate", IsBackboneType=true)]
     public partial class EffectEstimateComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "EffectEvidenceSynthesis#EffectEstimate"; } }
+      public override string TypeName { get { return "EffectEvidenceSynthesis.effectEstimate"; } }
 
       /// <summary>
       /// Description of effect estimate
@@ -853,14 +850,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("EffectEvidenceSynthesis#PrecisionEstimate")]
-    [BackboneType("EffectEvidenceSynthesis.effectEstimate.precisionEstimate")]
+    [FhirType("EffectEvidenceSynthesis.effectEstimate.precisionEstimate", IsBackboneType=true)]
     public partial class PrecisionEstimateComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "EffectEvidenceSynthesis#PrecisionEstimate"; } }
+      public override string TypeName { get { return "EffectEvidenceSynthesis.effectEstimate.precisionEstimate"; } }
 
       /// <summary>
       /// Type of precision estimate
@@ -1109,14 +1105,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("EffectEvidenceSynthesis#Certainty")]
-    [BackboneType("EffectEvidenceSynthesis.certainty")]
+    [FhirType("EffectEvidenceSynthesis.certainty", IsBackboneType=true)]
     public partial class CertaintyComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "EffectEvidenceSynthesis#Certainty"; } }
+      public override string TypeName { get { return "EffectEvidenceSynthesis.certainty"; } }
 
       /// <summary>
       /// Certainty rating
@@ -1289,14 +1284,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("EffectEvidenceSynthesis#CertaintySubcomponent")]
-    [BackboneType("EffectEvidenceSynthesis.certainty.certaintySubcomponent")]
+    [FhirType("EffectEvidenceSynthesis.certainty.certaintySubcomponent", IsBackboneType=true)]
     public partial class CertaintySubcomponentComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "EffectEvidenceSynthesis#CertaintySubcomponent"; } }
+      public override string TypeName { get { return "EffectEvidenceSynthesis.certainty.certaintySubcomponent"; } }
 
       /// <summary>
       /// Type of subcomponent of certainty rating
diff --git a/src/Hl7.Fhir.R4/Model/Generated/Encounter.cs b/src/Hl7.Fhir.R4/Model/Generated/Encounter.cs
index 14bc74da82..07d61b0613 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/Encounter.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/Encounter.cs
@@ -168,14 +168,13 @@ public enum EncounterLocationStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Encounter#StatusHistory")]
-    [BackboneType("Encounter.statusHistory")]
+    [FhirType("Encounter.statusHistory", IsBackboneType=true)]
     public partial class StatusHistoryComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Encounter#StatusHistory"; } }
+      public override string TypeName { get { return "Encounter.statusHistory"; } }
 
       /// <summary>
       /// planned | arrived | triaged | in-progress | onleave | finished | cancelled +
@@ -341,14 +340,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Encounter#ClassHistory")]
-    [BackboneType("Encounter.classHistory")]
+    [FhirType("Encounter.classHistory", IsBackboneType=true)]
     public partial class ClassHistoryComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Encounter#ClassHistory"; } }
+      public override string TypeName { get { return "Encounter.classHistory"; } }
 
       /// <summary>
       /// inpatient | outpatient | ambulatory | emergency +
@@ -495,14 +493,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Encounter#Participant")]
-    [BackboneType("Encounter.participant")]
+    [FhirType("Encounter.participant", IsBackboneType=true)]
     public partial class ParticipantComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Encounter#Participant"; } }
+      public override string TypeName { get { return "Encounter.participant"; } }
 
       /// <summary>
       /// Role of participant in encounter
@@ -672,14 +669,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Encounter#Diagnosis")]
-    [BackboneType("Encounter.diagnosis")]
+    [FhirType("Encounter.diagnosis", IsBackboneType=true)]
     public partial class DiagnosisComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Encounter#Diagnosis"; } }
+      public override string TypeName { get { return "Encounter.diagnosis"; } }
 
       /// <summary>
       /// The diagnosis or procedure relevant to the encounter
@@ -871,14 +867,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Encounter#Hospitalization")]
-    [BackboneType("Encounter.hospitalization")]
+    [FhirType("Encounter.hospitalization", IsBackboneType=true)]
     public partial class HospitalizationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Encounter#Hospitalization"; } }
+      public override string TypeName { get { return "Encounter.hospitalization"; } }
 
       /// <summary>
       /// Pre-admission identifier
@@ -1211,14 +1206,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Encounter#Location")]
-    [BackboneType("Encounter.location")]
+    [FhirType("Encounter.location", IsBackboneType=true)]
     public partial class LocationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Encounter#Location"; } }
+      public override string TypeName { get { return "Encounter.location"; } }
 
       /// <summary>
       /// Location the encounter takes place
diff --git a/src/Hl7.Fhir.R4/Model/Generated/EpisodeOfCare.cs b/src/Hl7.Fhir.R4/Model/Generated/EpisodeOfCare.cs
index 81bcfbaa98..fb6146368e 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/EpisodeOfCare.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/EpisodeOfCare.cs
@@ -119,14 +119,13 @@ public enum EpisodeOfCareStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("EpisodeOfCare#StatusHistory")]
-    [BackboneType("EpisodeOfCare.statusHistory")]
+    [FhirType("EpisodeOfCare.statusHistory", IsBackboneType=true)]
     public partial class StatusHistoryComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "EpisodeOfCare#StatusHistory"; } }
+      public override string TypeName { get { return "EpisodeOfCare.statusHistory"; } }
 
       /// <summary>
       /// planned | waitlist | active | onhold | finished | cancelled | entered-in-error
@@ -289,14 +288,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("EpisodeOfCare#Diagnosis")]
-    [BackboneType("EpisodeOfCare.diagnosis")]
+    [FhirType("EpisodeOfCare.diagnosis", IsBackboneType=true)]
     public partial class DiagnosisComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "EpisodeOfCare#Diagnosis"; } }
+      public override string TypeName { get { return "EpisodeOfCare.diagnosis"; } }
 
       /// <summary>
       /// Conditions/problems/diagnoses this episode of care is for
diff --git a/src/Hl7.Fhir.R4/Model/Generated/EvidenceVariable.cs b/src/Hl7.Fhir.R4/Model/Generated/EvidenceVariable.cs
index e441b7bd9f..40e9c9800a 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/EvidenceVariable.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/EvidenceVariable.cs
@@ -69,14 +69,13 @@ public partial class EvidenceVariable : Hl7.Fhir.Model.DomainResource, IIdentifi
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("EvidenceVariable#Characteristic")]
-    [BackboneType("EvidenceVariable.characteristic")]
+    [FhirType("EvidenceVariable.characteristic", IsBackboneType=true)]
     public partial class CharacteristicComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "EvidenceVariable#Characteristic"; } }
+      public override string TypeName { get { return "EvidenceVariable.characteristic"; } }
 
       /// <summary>
       /// Natural language description of the characteristic
diff --git a/src/Hl7.Fhir.R4/Model/Generated/ExampleScenario.cs b/src/Hl7.Fhir.R4/Model/Generated/ExampleScenario.cs
index 275e097149..5d6938b8be 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/ExampleScenario.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/ExampleScenario.cs
@@ -83,14 +83,13 @@ public enum ExampleScenarioActorType
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("ExampleScenario#Actor")]
-    [BackboneType("ExampleScenario.actor")]
+    [FhirType("ExampleScenario.actor", IsBackboneType=true)]
     public partial class ActorComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ExampleScenario#Actor"; } }
+      public override string TypeName { get { return "ExampleScenario.actor"; } }
 
       /// <summary>
       /// ID or acronym of the actor
@@ -357,14 +356,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("ExampleScenario#Instance")]
-    [BackboneType("ExampleScenario.instance")]
+    [FhirType("ExampleScenario.instance", IsBackboneType=true)]
     public partial class InstanceComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ExampleScenario#Instance"; } }
+      public override string TypeName { get { return "ExampleScenario.instance"; } }
 
       /// <summary>
       /// The id of the resource for referencing
@@ -683,14 +681,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("ExampleScenario#Version")]
-    [BackboneType("ExampleScenario.instance.version")]
+    [FhirType("ExampleScenario.instance.version", IsBackboneType=true)]
     public partial class VersionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ExampleScenario#Version"; } }
+      public override string TypeName { get { return "ExampleScenario.instance.version"; } }
 
       /// <summary>
       /// The identifier of a specific version of a resource
@@ -872,14 +869,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExampleScenario#ContainedInstance")]
-    [BackboneType("ExampleScenario.instance.containedInstance")]
+    [FhirType("ExampleScenario.instance.containedInstance", IsBackboneType=true)]
     public partial class ContainedInstanceComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ExampleScenario#ContainedInstance"; } }
+      public override string TypeName { get { return "ExampleScenario.instance.containedInstance"; } }
 
       /// <summary>
       /// Each resource contained in the instance
@@ -1057,14 +1053,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("ExampleScenario#Process")]
-    [BackboneType("ExampleScenario.process")]
+    [FhirType("ExampleScenario.process", IsBackboneType=true)]
     public partial class ProcessComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ExampleScenario#Process"; } }
+      public override string TypeName { get { return "ExampleScenario.process"; } }
 
       /// <summary>
       /// The diagram title of the group of operations
@@ -1354,14 +1349,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("ExampleScenario#Step")]
-    [BackboneType("ExampleScenario.process.step")]
+    [FhirType("ExampleScenario.process.step", IsBackboneType=true)]
     public partial class StepComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ExampleScenario#Step"; } }
+      public override string TypeName { get { return "ExampleScenario.process.step"; } }
 
       /// <summary>
       /// Nested process
@@ -1572,14 +1566,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("ExampleScenario#Operation")]
-    [BackboneType("ExampleScenario.process.step.operation")]
+    [FhirType("ExampleScenario.process.step.operation", IsBackboneType=true)]
     public partial class OperationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ExampleScenario#Operation"; } }
+      public override string TypeName { get { return "ExampleScenario.process.step.operation"; } }
 
       /// <summary>
       /// The sequential number of the interaction
@@ -2068,14 +2061,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExampleScenario#Alternative")]
-    [BackboneType("ExampleScenario.process.step.alternative")]
+    [FhirType("ExampleScenario.process.step.alternative", IsBackboneType=true)]
     public partial class AlternativeComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ExampleScenario#Alternative"; } }
+      public override string TypeName { get { return "ExampleScenario.process.step.alternative"; } }
 
       /// <summary>
       /// Label for alternative
diff --git a/src/Hl7.Fhir.R4/Model/Generated/ExplanationOfBenefit.cs b/src/Hl7.Fhir.R4/Model/Generated/ExplanationOfBenefit.cs
index 2c6a124eb6..bb99511a78 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/ExplanationOfBenefit.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/ExplanationOfBenefit.cs
@@ -102,14 +102,13 @@ public enum ExplanationOfBenefitStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#RelatedClaim")]
-    [BackboneType("ExplanationOfBenefit.related")]
+    [FhirType("ExplanationOfBenefit.related", IsBackboneType=true)]
     public partial class RelatedClaimComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ExplanationOfBenefit#RelatedClaim"; } }
+      public override string TypeName { get { return "ExplanationOfBenefit.related"; } }
 
       /// <summary>
       /// Reference to the related claim
@@ -282,14 +281,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#Payee")]
-    [BackboneType("ExplanationOfBenefit.payee")]
+    [FhirType("ExplanationOfBenefit.payee", IsBackboneType=true)]
     public partial class PayeeComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ExplanationOfBenefit#Payee"; } }
+      public override string TypeName { get { return "ExplanationOfBenefit.payee"; } }
 
       /// <summary>
       /// Category of recipient
@@ -436,14 +434,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#CareTeam")]
-    [BackboneType("ExplanationOfBenefit.careTeam")]
+    [FhirType("ExplanationOfBenefit.careTeam", IsBackboneType=true)]
     public partial class CareTeamComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ExplanationOfBenefit#CareTeam"; } }
+      public override string TypeName { get { return "ExplanationOfBenefit.careTeam"; } }
 
       /// <summary>
       /// Order of care team
@@ -705,14 +702,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#SupportingInformation")]
-    [BackboneType("ExplanationOfBenefit.supportingInfo")]
+    [FhirType("ExplanationOfBenefit.supportingInfo", IsBackboneType=true)]
     public partial class SupportingInformationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ExplanationOfBenefit#SupportingInformation"; } }
+      public override string TypeName { get { return "ExplanationOfBenefit.supportingInfo"; } }
 
       /// <summary>
       /// Information instance identifier
@@ -984,14 +980,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#Diagnosis")]
-    [BackboneType("ExplanationOfBenefit.diagnosis")]
+    [FhirType("ExplanationOfBenefit.diagnosis", IsBackboneType=true)]
     public partial class DiagnosisComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ExplanationOfBenefit#Diagnosis"; } }
+      public override string TypeName { get { return "ExplanationOfBenefit.diagnosis"; } }
 
       /// <summary>
       /// Diagnosis instance identifier
@@ -1238,14 +1233,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#Procedure")]
-    [BackboneType("ExplanationOfBenefit.procedure")]
+    [FhirType("ExplanationOfBenefit.procedure", IsBackboneType=true)]
     public partial class ProcedureComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ExplanationOfBenefit#Procedure"; } }
+      public override string TypeName { get { return "ExplanationOfBenefit.procedure"; } }
 
       /// <summary>
       /// Procedure instance identifier
@@ -1512,14 +1506,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#Insurance")]
-    [BackboneType("ExplanationOfBenefit.insurance")]
+    [FhirType("ExplanationOfBenefit.insurance", IsBackboneType=true)]
     public partial class InsuranceComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ExplanationOfBenefit#Insurance"; } }
+      public override string TypeName { get { return "ExplanationOfBenefit.insurance"; } }
 
       /// <summary>
       /// Coverage to be used for adjudication
@@ -1729,14 +1722,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#Accident")]
-    [BackboneType("ExplanationOfBenefit.accident")]
+    [FhirType("ExplanationOfBenefit.accident", IsBackboneType=true)]
     public partial class AccidentComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ExplanationOfBenefit#Accident"; } }
+      public override string TypeName { get { return "ExplanationOfBenefit.accident"; } }
 
       /// <summary>
       /// When the incident occurred
@@ -1927,14 +1919,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#Item")]
-    [BackboneType("ExplanationOfBenefit.item")]
+    [FhirType("ExplanationOfBenefit.item", IsBackboneType=true)]
     public partial class ItemComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ExplanationOfBenefit#Item"; } }
+      public override string TypeName { get { return "ExplanationOfBenefit.item"; } }
 
       /// <summary>
       /// Item instance identifier
@@ -2760,14 +2751,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#Adjudication")]
-    [BackboneType("ExplanationOfBenefit.item.adjudication")]
+    [FhirType("ExplanationOfBenefit.item.adjudication", IsBackboneType=true)]
     public partial class AdjudicationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ExplanationOfBenefit#Adjudication"; } }
+      public override string TypeName { get { return "ExplanationOfBenefit.item.adjudication"; } }
 
       /// <summary>
       /// Type of adjudication information
@@ -2982,14 +2972,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#Detail")]
-    [BackboneType("ExplanationOfBenefit.item.detail")]
+    [FhirType("ExplanationOfBenefit.item.detail", IsBackboneType=true)]
     public partial class DetailComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ExplanationOfBenefit#Detail"; } }
+      public override string TypeName { get { return "ExplanationOfBenefit.item.detail"; } }
 
       /// <summary>
       /// Product or service provided
@@ -3502,14 +3491,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#SubDetail")]
-    [BackboneType("ExplanationOfBenefit.item.detail.subDetail")]
+    [FhirType("ExplanationOfBenefit.item.detail.subDetail", IsBackboneType=true)]
     public partial class SubDetailComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ExplanationOfBenefit#SubDetail"; } }
+      public override string TypeName { get { return "ExplanationOfBenefit.item.detail.subDetail"; } }
 
       /// <summary>
       /// Product or service provided
@@ -3996,14 +3984,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#AddedItem")]
-    [BackboneType("ExplanationOfBenefit.addItem")]
+    [FhirType("ExplanationOfBenefit.addItem", IsBackboneType=true)]
     public partial class AddedItemComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ExplanationOfBenefit#AddedItem"; } }
+      public override string TypeName { get { return "ExplanationOfBenefit.addItem"; } }
 
       /// <summary>
       /// Item sequence number
@@ -4661,14 +4648,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#AddedItemDetail")]
-    [BackboneType("ExplanationOfBenefit.addItem.detail")]
+    [FhirType("ExplanationOfBenefit.addItem.detail", IsBackboneType=true)]
     public partial class AddedItemDetailComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ExplanationOfBenefit#AddedItemDetail"; } }
+      public override string TypeName { get { return "ExplanationOfBenefit.addItem.detail"; } }
 
       /// <summary>
       /// Billing, service, product, or drug code
@@ -5030,14 +5016,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#AddedItemDetailSubDetail")]
-    [BackboneType("ExplanationOfBenefit.addItem.detail.subDetail")]
+    [FhirType("ExplanationOfBenefit.addItem.detail.subDetail", IsBackboneType=true)]
     public partial class AddedItemDetailSubDetailComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ExplanationOfBenefit#AddedItemDetailSubDetail"; } }
+      public override string TypeName { get { return "ExplanationOfBenefit.addItem.detail.subDetail"; } }
 
       /// <summary>
       /// Billing, service, product, or drug code
@@ -5374,14 +5359,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#Total")]
-    [BackboneType("ExplanationOfBenefit.total")]
+    [FhirType("ExplanationOfBenefit.total", IsBackboneType=true)]
     public partial class TotalComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ExplanationOfBenefit#Total"; } }
+      public override string TypeName { get { return "ExplanationOfBenefit.total"; } }
 
       /// <summary>
       /// Type of adjudication information
@@ -5528,14 +5512,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#Payment")]
-    [BackboneType("ExplanationOfBenefit.payment")]
+    [FhirType("ExplanationOfBenefit.payment", IsBackboneType=true)]
     public partial class PaymentComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ExplanationOfBenefit#Payment"; } }
+      public override string TypeName { get { return "ExplanationOfBenefit.payment"; } }
 
       /// <summary>
       /// Partial or complete payment
@@ -5799,14 +5782,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#Note")]
-    [BackboneType("ExplanationOfBenefit.processNote")]
+    [FhirType("ExplanationOfBenefit.processNote", IsBackboneType=true)]
     public partial class NoteComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ExplanationOfBenefit#Note"; } }
+      public override string TypeName { get { return "ExplanationOfBenefit.processNote"; } }
 
       /// <summary>
       /// Note instance identifier
@@ -6054,14 +6036,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#BenefitBalance")]
-    [BackboneType("ExplanationOfBenefit.benefitBalance")]
+    [FhirType("ExplanationOfBenefit.benefitBalance", IsBackboneType=true)]
     public partial class BenefitBalanceComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ExplanationOfBenefit#BenefitBalance"; } }
+      public override string TypeName { get { return "ExplanationOfBenefit.benefitBalance"; } }
 
       /// <summary>
       /// Benefit classification
@@ -6415,14 +6396,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#Benefit")]
-    [BackboneType("ExplanationOfBenefit.benefitBalance.financial")]
+    [FhirType("ExplanationOfBenefit.benefitBalance.financial", IsBackboneType=true)]
     public partial class BenefitComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ExplanationOfBenefit#Benefit"; } }
+      public override string TypeName { get { return "ExplanationOfBenefit.benefitBalance.financial"; } }
 
       /// <summary>
       /// Benefit classification
diff --git a/src/Hl7.Fhir.R4/Model/Generated/FamilyMemberHistory.cs b/src/Hl7.Fhir.R4/Model/Generated/FamilyMemberHistory.cs
index befbf3ba8b..1465722277 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/FamilyMemberHistory.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/FamilyMemberHistory.cs
@@ -101,14 +101,13 @@ public enum FamilyHistoryStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("FamilyMemberHistory#Condition")]
-    [BackboneType("FamilyMemberHistory.condition")]
+    [FhirType("FamilyMemberHistory.condition", IsBackboneType=true)]
     public partial class ConditionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "FamilyMemberHistory#Condition"; } }
+      public override string TypeName { get { return "FamilyMemberHistory.condition"; } }
 
       /// <summary>
       /// Condition suffered by relation
diff --git a/src/Hl7.Fhir.R4/Model/Generated/Goal.cs b/src/Hl7.Fhir.R4/Model/Generated/Goal.cs
index e0e133d69e..dd52e810b2 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/Goal.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/Goal.cs
@@ -133,14 +133,13 @@ public enum GoalLifecycleStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Goal#Target")]
-    [BackboneType("Goal.target")]
+    [FhirType("Goal.target", IsBackboneType=true)]
     public partial class TargetComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Goal#Target"; } }
+      public override string TypeName { get { return "Goal.target"; } }
 
       /// <summary>
       /// The parameter whose value is being tracked
diff --git a/src/Hl7.Fhir.R4/Model/Generated/GraphDefinition.cs b/src/Hl7.Fhir.R4/Model/Generated/GraphDefinition.cs
index e788b05daf..32b9e513e7 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/GraphDefinition.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/GraphDefinition.cs
@@ -120,14 +120,13 @@ public enum GraphCompartmentRule
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("GraphDefinition#Link")]
-    [BackboneType("GraphDefinition.link")]
+    [FhirType("GraphDefinition.link", IsBackboneType=true)]
     public partial class LinkComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "GraphDefinition#Link"; } }
+      public override string TypeName { get { return "GraphDefinition.link"; } }
 
       /// <summary>
       /// Path in the resource that contains the link
@@ -459,14 +458,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("GraphDefinition#Target")]
-    [BackboneType("GraphDefinition.link.target")]
+    [FhirType("GraphDefinition.link.target", IsBackboneType=true)]
     public partial class TargetComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "GraphDefinition#Target"; } }
+      public override string TypeName { get { return "GraphDefinition.link.target"; } }
 
       /// <summary>
       /// Type of resource this link refers to
@@ -741,14 +739,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("GraphDefinition#Compartment")]
-    [BackboneType("GraphDefinition.link.target.compartment")]
+    [FhirType("GraphDefinition.link.target.compartment", IsBackboneType=true)]
     public partial class CompartmentComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "GraphDefinition#Compartment"; } }
+      public override string TypeName { get { return "GraphDefinition.link.target.compartment"; } }
 
       /// <summary>
       /// condition | requirement
diff --git a/src/Hl7.Fhir.R4/Model/Generated/Group.cs b/src/Hl7.Fhir.R4/Model/Generated/Group.cs
index 90a61ddc0f..ce0ae6507b 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/Group.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/Group.cs
@@ -115,14 +115,13 @@ public enum GroupType
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Group#Characteristic")]
-    [BackboneType("Group.characteristic")]
+    [FhirType("Group.characteristic", IsBackboneType=true)]
     public partial class CharacteristicComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Group#Characteristic"; } }
+      public override string TypeName { get { return "Group.characteristic"; } }
 
       /// <summary>
       /// Kind of characteristic
@@ -341,14 +340,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Group#Member")]
-    [BackboneType("Group.member")]
+    [FhirType("Group.member", IsBackboneType=true)]
     public partial class MemberComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Group#Member"; } }
+      public override string TypeName { get { return "Group.member"; } }
 
       /// <summary>
       /// Reference to the group member
diff --git a/src/Hl7.Fhir.R4/Model/Generated/HealthcareService.cs b/src/Hl7.Fhir.R4/Model/Generated/HealthcareService.cs
index cbc7c1fec5..acf9174e67 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/HealthcareService.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/HealthcareService.cs
@@ -64,14 +64,13 @@ public partial class HealthcareService : Hl7.Fhir.Model.DomainResource, IIdentif
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("HealthcareService#Eligibility")]
-    [BackboneType("HealthcareService.eligibility")]
+    [FhirType("HealthcareService.eligibility", IsBackboneType=true)]
     public partial class EligibilityComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "HealthcareService#Eligibility"; } }
+      public override string TypeName { get { return "HealthcareService.eligibility"; } }
 
       /// <summary>
       /// Coded value for the eligibility
@@ -235,14 +234,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("HealthcareService#AvailableTime")]
-    [BackboneType("HealthcareService.availableTime")]
+    [FhirType("HealthcareService.availableTime", IsBackboneType=true)]
     public partial class AvailableTimeComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "HealthcareService#AvailableTime"; } }
+      public override string TypeName { get { return "HealthcareService.availableTime"; } }
 
       /// <summary>
       /// mon | tue | wed | thu | fri | sat | sun
@@ -511,14 +509,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("HealthcareService#NotAvailable")]
-    [BackboneType("HealthcareService.notAvailable")]
+    [FhirType("HealthcareService.notAvailable", IsBackboneType=true)]
     public partial class NotAvailableComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "HealthcareService#NotAvailable"; } }
+      public override string TypeName { get { return "HealthcareService.notAvailable"; } }
 
       /// <summary>
       /// Reason presented to the user explaining why time not available
diff --git a/src/Hl7.Fhir.R4/Model/Generated/ImagingStudy.cs b/src/Hl7.Fhir.R4/Model/Generated/ImagingStudy.cs
index 33677be99a..2c8a128605 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/ImagingStudy.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/ImagingStudy.cs
@@ -107,14 +107,13 @@ public enum ImagingStudyStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ImagingStudy#Series")]
-    [BackboneType("ImagingStudy.series")]
+    [FhirType("ImagingStudy.series", IsBackboneType=true)]
     public partial class SeriesComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ImagingStudy#Series"; } }
+      public override string TypeName { get { return "ImagingStudy.series"; } }
 
       /// <summary>
       /// DICOM Series Instance UID for the series
@@ -612,14 +611,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ImagingStudy#Performer")]
-    [BackboneType("ImagingStudy.series.performer")]
+    [FhirType("ImagingStudy.series.performer", IsBackboneType=true)]
     public partial class PerformerComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ImagingStudy#Performer"; } }
+      public override string TypeName { get { return "ImagingStudy.series.performer"; } }
 
       /// <summary>
       /// Type of performance
@@ -767,14 +765,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ImagingStudy#Instance")]
-    [BackboneType("ImagingStudy.series.instance")]
+    [FhirType("ImagingStudy.series.instance", IsBackboneType=true)]
     public partial class InstanceComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ImagingStudy#Instance"; } }
+      public override string TypeName { get { return "ImagingStudy.series.instance"; } }
 
       /// <summary>
       /// DICOM SOP Instance UID
diff --git a/src/Hl7.Fhir.R4/Model/Generated/Immunization.cs b/src/Hl7.Fhir.R4/Model/Generated/Immunization.cs
index b6328572e8..64a5a50bcd 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/Immunization.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/Immunization.cs
@@ -95,14 +95,13 @@ public enum ImmunizationStatusCodes
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Immunization#Performer")]
-    [BackboneType("Immunization.performer")]
+    [FhirType("Immunization.performer", IsBackboneType=true)]
     public partial class PerformerComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Immunization#Performer"; } }
+      public override string TypeName { get { return "Immunization.performer"; } }
 
       /// <summary>
       /// What type of performance was done
@@ -250,14 +249,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Immunization#Education")]
-    [BackboneType("Immunization.education")]
+    [FhirType("Immunization.education", IsBackboneType=true)]
     public partial class EducationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Immunization#Education"; } }
+      public override string TypeName { get { return "Immunization.education"; } }
 
       /// <summary>
       /// Educational material document identifier
@@ -524,14 +522,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Immunization#Reaction")]
-    [BackboneType("Immunization.reaction")]
+    [FhirType("Immunization.reaction", IsBackboneType=true)]
     public partial class ReactionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Immunization#Reaction"; } }
+      public override string TypeName { get { return "Immunization.reaction"; } }
 
       /// <summary>
       /// When reaction started
@@ -738,14 +735,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Immunization#ProtocolApplied")]
-    [BackboneType("Immunization.protocolApplied")]
+    [FhirType("Immunization.protocolApplied", IsBackboneType=true)]
     public partial class ProtocolAppliedComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Immunization#ProtocolApplied"; } }
+      public override string TypeName { get { return "Immunization.protocolApplied"; } }
 
       /// <summary>
       /// Name of vaccine series
diff --git a/src/Hl7.Fhir.R4/Model/Generated/ImmunizationRecommendation.cs b/src/Hl7.Fhir.R4/Model/Generated/ImmunizationRecommendation.cs
index 8dd4c2f7f4..cdd30c27d8 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/ImmunizationRecommendation.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/ImmunizationRecommendation.cs
@@ -64,14 +64,13 @@ public partial class ImmunizationRecommendation : Hl7.Fhir.Model.DomainResource,
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("ImmunizationRecommendation#Recommendation")]
-    [BackboneType("ImmunizationRecommendation.recommendation")]
+    [FhirType("ImmunizationRecommendation.recommendation", IsBackboneType=true)]
     public partial class RecommendationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ImmunizationRecommendation#Recommendation"; } }
+      public override string TypeName { get { return "ImmunizationRecommendation.recommendation"; } }
 
       /// <summary>
       /// Vaccine  or vaccine group recommendation applies to
@@ -521,14 +520,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ImmunizationRecommendation#DateCriterion")]
-    [BackboneType("ImmunizationRecommendation.recommendation.dateCriterion")]
+    [FhirType("ImmunizationRecommendation.recommendation.dateCriterion", IsBackboneType=true)]
     public partial class DateCriterionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ImmunizationRecommendation#DateCriterion"; } }
+      public override string TypeName { get { return "ImmunizationRecommendation.recommendation.dateCriterion"; } }
 
       /// <summary>
       /// Type of date
diff --git a/src/Hl7.Fhir.R4/Model/Generated/ImplementationGuide.cs b/src/Hl7.Fhir.R4/Model/Generated/ImplementationGuide.cs
index 4cbac583f7..076d9c3fbc 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/ImplementationGuide.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/ImplementationGuide.cs
@@ -2257,14 +2257,13 @@ public enum GuideParameterCode
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ImplementationGuide#DependsOn")]
-    [BackboneType("ImplementationGuide.dependsOn")]
+    [FhirType("ImplementationGuide.dependsOn", IsBackboneType=true)]
     public partial class DependsOnComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ImplementationGuide#DependsOn"; } }
+      public override string TypeName { get { return "ImplementationGuide.dependsOn"; } }
 
       /// <summary>
       /// Identity of the IG that this depends on
@@ -2489,14 +2488,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ImplementationGuide#Global")]
-    [BackboneType("ImplementationGuide.global")]
+    [FhirType("ImplementationGuide.global", IsBackboneType=true)]
     public partial class GlobalComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ImplementationGuide#Global"; } }
+      public override string TypeName { get { return "ImplementationGuide.global"; } }
 
       /// <summary>
       /// Type this profile applies to
@@ -2681,14 +2679,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ImplementationGuide#Definition")]
-    [BackboneType("ImplementationGuide.definition")]
+    [FhirType("ImplementationGuide.definition", IsBackboneType=true)]
     public partial class DefinitionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ImplementationGuide#Definition"; } }
+      public override string TypeName { get { return "ImplementationGuide.definition"; } }
 
       /// <summary>
       /// Grouping used to present related resources in the IG
@@ -2912,14 +2909,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ImplementationGuide#Grouping")]
-    [BackboneType("ImplementationGuide.definition.grouping")]
+    [FhirType("ImplementationGuide.definition.grouping", IsBackboneType=true)]
     public partial class GroupingComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ImplementationGuide#Grouping"; } }
+      public override string TypeName { get { return "ImplementationGuide.definition.grouping"; } }
 
       /// <summary>
       /// Descriptive name for the package
@@ -3100,14 +3096,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ImplementationGuide#Resource")]
-    [BackboneType("ImplementationGuide.definition.resource")]
+    [FhirType("ImplementationGuide.definition.resource", IsBackboneType=true)]
     public partial class ResourceComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ImplementationGuide#Resource"; } }
+      public override string TypeName { get { return "ImplementationGuide.definition.resource"; } }
 
       /// <summary>
       /// Location of the resource
@@ -3432,14 +3427,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ImplementationGuide#Page")]
-    [BackboneType("ImplementationGuide.definition.page")]
+    [FhirType("ImplementationGuide.definition.page", IsBackboneType=true)]
     public partial class PageComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ImplementationGuide#Page"; } }
+      public override string TypeName { get { return "ImplementationGuide.definition.page"; } }
 
       /// <summary>
       /// Where to find that page
@@ -3675,14 +3669,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("ImplementationGuide#Parameter")]
-    [BackboneType("ImplementationGuide.definition.parameter")]
+    [FhirType("ImplementationGuide.definition.parameter", IsBackboneType=true)]
     public partial class ParameterComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ImplementationGuide#Parameter"; } }
+      public override string TypeName { get { return "ImplementationGuide.definition.parameter"; } }
 
       /// <summary>
       /// apply | path-resource | path-pages | path-tx-cache | expansion-parameter | rule-broken-links | generate-xml | generate-json | generate-turtle | html-template
@@ -3863,14 +3856,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("ImplementationGuide#Template")]
-    [BackboneType("ImplementationGuide.definition.template")]
+    [FhirType("ImplementationGuide.definition.template", IsBackboneType=true)]
     public partial class TemplateComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ImplementationGuide#Template"; } }
+      public override string TypeName { get { return "ImplementationGuide.definition.template"; } }
 
       /// <summary>
       /// Type of template specified
@@ -4095,14 +4087,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ImplementationGuide#Manifest")]
-    [BackboneType("ImplementationGuide.manifest")]
+    [FhirType("ImplementationGuide.manifest", IsBackboneType=true)]
     public partial class ManifestComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ImplementationGuide#Manifest"; } }
+      public override string TypeName { get { return "ImplementationGuide.manifest"; } }
 
       /// <summary>
       /// Location of rendered implementation guide
@@ -4379,14 +4370,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ImplementationGuide#ManifestResource")]
-    [BackboneType("ImplementationGuide.manifest.resource")]
+    [FhirType("ImplementationGuide.manifest.resource", IsBackboneType=true)]
     public partial class ManifestResourceComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ImplementationGuide#ManifestResource"; } }
+      public override string TypeName { get { return "ImplementationGuide.manifest.resource"; } }
 
       /// <summary>
       /// Location of the resource
@@ -4578,14 +4568,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ImplementationGuide#ManifestPage")]
-    [BackboneType("ImplementationGuide.manifest.page")]
+    [FhirType("ImplementationGuide.manifest.page", IsBackboneType=true)]
     public partial class ManifestPageComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ImplementationGuide#ManifestPage"; } }
+      public override string TypeName { get { return "ImplementationGuide.manifest.page"; } }
 
       /// <summary>
       /// HTML page name
diff --git a/src/Hl7.Fhir.R4/Model/Generated/InsurancePlan.cs b/src/Hl7.Fhir.R4/Model/Generated/InsurancePlan.cs
index 7c6c974e84..41d944d24a 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/InsurancePlan.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/InsurancePlan.cs
@@ -93,14 +93,13 @@ public enum BenefitCostApplicability
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("InsurancePlan#Contact")]
-    [BackboneType("InsurancePlan.contact")]
+    [FhirType("InsurancePlan.contact", IsBackboneType=true)]
     public partial class ContactComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "InsurancePlan#Contact"; } }
+      public override string TypeName { get { return "InsurancePlan.contact"; } }
 
       /// <summary>
       /// The type of contact
@@ -296,14 +295,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("InsurancePlan#Coverage")]
-    [BackboneType("InsurancePlan.coverage")]
+    [FhirType("InsurancePlan.coverage", IsBackboneType=true)]
     public partial class CoverageComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "InsurancePlan#Coverage"; } }
+      public override string TypeName { get { return "InsurancePlan.coverage"; } }
 
       /// <summary>
       /// Type of coverage
@@ -477,14 +475,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("InsurancePlan#CoverageBenefit")]
-    [BackboneType("InsurancePlan.coverage.benefit")]
+    [FhirType("InsurancePlan.coverage.benefit", IsBackboneType=true)]
     public partial class CoverageBenefitComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "InsurancePlan#CoverageBenefit"; } }
+      public override string TypeName { get { return "InsurancePlan.coverage.benefit"; } }
 
       /// <summary>
       /// Type of benefit
@@ -673,14 +670,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("InsurancePlan#Limit")]
-    [BackboneType("InsurancePlan.coverage.benefit.limit")]
+    [FhirType("InsurancePlan.coverage.benefit.limit", IsBackboneType=true)]
     public partial class LimitComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "InsurancePlan#Limit"; } }
+      public override string TypeName { get { return "InsurancePlan.coverage.benefit.limit"; } }
 
       /// <summary>
       /// Maximum value allowed
@@ -824,14 +820,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("InsurancePlan#Plan")]
-    [BackboneType("InsurancePlan.plan")]
+    [FhirType("InsurancePlan.plan", IsBackboneType=true)]
     public partial class PlanComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "InsurancePlan#Plan"; } }
+      public override string TypeName { get { return "InsurancePlan.plan"; } }
 
       /// <summary>
       /// Business Identifier for Product
@@ -1084,14 +1079,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("InsurancePlan#GeneralCost")]
-    [BackboneType("InsurancePlan.plan.generalCost")]
+    [FhirType("InsurancePlan.plan.generalCost", IsBackboneType=true)]
     public partial class GeneralCostComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "InsurancePlan#GeneralCost"; } }
+      public override string TypeName { get { return "InsurancePlan.plan.generalCost"; } }
 
       /// <summary>
       /// Type of cost
@@ -1321,14 +1315,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("InsurancePlan#SpecificCost")]
-    [BackboneType("InsurancePlan.plan.specificCost")]
+    [FhirType("InsurancePlan.plan.specificCost", IsBackboneType=true)]
     public partial class SpecificCostComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "InsurancePlan#SpecificCost"; } }
+      public override string TypeName { get { return "InsurancePlan.plan.specificCost"; } }
 
       /// <summary>
       /// General category of benefit
@@ -1474,14 +1467,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("InsurancePlan#PlanBenefit")]
-    [BackboneType("InsurancePlan.plan.specificCost.benefit")]
+    [FhirType("InsurancePlan.plan.specificCost.benefit", IsBackboneType=true)]
     public partial class PlanBenefitComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "InsurancePlan#PlanBenefit"; } }
+      public override string TypeName { get { return "InsurancePlan.plan.specificCost.benefit"; } }
 
       /// <summary>
       /// Type of specific benefit
@@ -1627,14 +1619,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("InsurancePlan#Cost")]
-    [BackboneType("InsurancePlan.plan.specificCost.benefit.cost")]
+    [FhirType("InsurancePlan.plan.specificCost.benefit.cost", IsBackboneType=true)]
     public partial class CostComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "InsurancePlan#Cost"; } }
+      public override string TypeName { get { return "InsurancePlan.plan.specificCost.benefit.cost"; } }
 
       /// <summary>
       /// Type of cost
diff --git a/src/Hl7.Fhir.R4/Model/Generated/Invoice.cs b/src/Hl7.Fhir.R4/Model/Generated/Invoice.cs
index 4fa02a68f3..c1de7c0093 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/Invoice.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/Invoice.cs
@@ -107,14 +107,13 @@ public enum InvoiceStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Invoice#Participant")]
-    [BackboneType("Invoice.participant")]
+    [FhirType("Invoice.participant", IsBackboneType=true)]
     public partial class ParticipantComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Invoice#Participant"; } }
+      public override string TypeName { get { return "Invoice.participant"; } }
 
       /// <summary>
       /// Type of involvement in creation of this Invoice
@@ -261,14 +260,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Invoice#LineItem")]
-    [BackboneType("Invoice.lineItem")]
+    [FhirType("Invoice.lineItem", IsBackboneType=true)]
     public partial class LineItemComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Invoice#LineItem"; } }
+      public override string TypeName { get { return "Invoice.lineItem"; } }
 
       /// <summary>
       /// Sequence number of line item
@@ -460,14 +458,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Invoice#PriceComponent")]
-    [BackboneType("Invoice.lineItem.priceComponent")]
+    [FhirType("Invoice.lineItem.priceComponent", IsBackboneType=true)]
     public partial class PriceComponentComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Invoice#PriceComponent"; } }
+      public override string TypeName { get { return "Invoice.lineItem.priceComponent"; } }
 
       /// <summary>
       /// base | surcharge | deduction | discount | tax | informational
diff --git a/src/Hl7.Fhir.R4/Model/Generated/Linkage.cs b/src/Hl7.Fhir.R4/Model/Generated/Linkage.cs
index 747b4b55a1..91fd395b19 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/Linkage.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/Linkage.cs
@@ -95,14 +95,13 @@ public enum LinkageType
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Linkage#Item")]
-    [BackboneType("Linkage.item")]
+    [FhirType("Linkage.item", IsBackboneType=true)]
     public partial class ItemComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Linkage#Item"; } }
+      public override string TypeName { get { return "Linkage.item"; } }
 
       /// <summary>
       /// source | alternate | historical
diff --git a/src/Hl7.Fhir.R4/Model/Generated/List.cs b/src/Hl7.Fhir.R4/Model/Generated/List.cs
index 5ed1616ec8..e94fde4525 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/List.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/List.cs
@@ -93,14 +93,13 @@ public enum ListStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("List#Entry")]
-    [BackboneType("List.entry")]
+    [FhirType("List.entry", IsBackboneType=true)]
     public partial class EntryComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "List#Entry"; } }
+      public override string TypeName { get { return "List.entry"; } }
 
       /// <summary>
       /// Status/Workflow information about this item
diff --git a/src/Hl7.Fhir.R4/Model/Generated/Location.cs b/src/Hl7.Fhir.R4/Model/Generated/Location.cs
index 8d82e59642..c5453f90aa 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/Location.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/Location.cs
@@ -117,14 +117,13 @@ public enum LocationMode
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Location#Position")]
-    [BackboneType("Location.position")]
+    [FhirType("Location.position", IsBackboneType=true)]
     public partial class PositionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Location#Position"; } }
+      public override string TypeName { get { return "Location.position"; } }
 
       /// <summary>
       /// Longitude with WGS84 datum
@@ -350,14 +349,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Location#HoursOfOperation")]
-    [BackboneType("Location.hoursOfOperation")]
+    [FhirType("Location.hoursOfOperation", IsBackboneType=true)]
     public partial class HoursOfOperationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Location#HoursOfOperation"; } }
+      public override string TypeName { get { return "Location.hoursOfOperation"; } }
 
       /// <summary>
       /// mon | tue | wed | thu | fri | sat | sun
diff --git a/src/Hl7.Fhir.R4/Model/Generated/Measure.cs b/src/Hl7.Fhir.R4/Model/Generated/Measure.cs
index 2735be1e7d..3dfc3e8897 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/Measure.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/Measure.cs
@@ -67,14 +67,13 @@ public partial class Measure : Hl7.Fhir.Model.DomainResource, IIdentifiable<List
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Measure#Group")]
-    [BackboneType("Measure.group")]
+    [FhirType("Measure.group", IsBackboneType=true)]
     public partial class GroupComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Measure#Group"; } }
+      public override string TypeName { get { return "Measure.group"; } }
 
       /// <summary>
       /// Meaning of the group
@@ -288,14 +287,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Measure#Population")]
-    [BackboneType("Measure.group.population")]
+    [FhirType("Measure.group.population", IsBackboneType=true)]
     public partial class PopulationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Measure#Population"; } }
+      public override string TypeName { get { return "Measure.group.population"; } }
 
       /// <summary>
       /// initial-population | numerator | numerator-exclusion | denominator | denominator-exclusion | denominator-exception | measure-population | measure-population-exclusion | measure-observation
@@ -484,14 +482,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Measure#Stratifier")]
-    [BackboneType("Measure.group.stratifier")]
+    [FhirType("Measure.group.stratifier", IsBackboneType=true)]
     public partial class StratifierComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Measure#Stratifier"; } }
+      public override string TypeName { get { return "Measure.group.stratifier"; } }
 
       /// <summary>
       /// Meaning of the stratifier
@@ -705,14 +702,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Measure#Component")]
-    [BackboneType("Measure.group.stratifier.component")]
+    [FhirType("Measure.group.stratifier.component", IsBackboneType=true)]
     public partial class ComponentComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Measure#Component"; } }
+      public override string TypeName { get { return "Measure.group.stratifier.component"; } }
 
       /// <summary>
       /// Meaning of the stratifier component
@@ -901,14 +897,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Measure#SupplementalData")]
-    [BackboneType("Measure.supplementalData")]
+    [FhirType("Measure.supplementalData", IsBackboneType=true)]
     public partial class SupplementalDataComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Measure#SupplementalData"; } }
+      public override string TypeName { get { return "Measure.supplementalData"; } }
 
       /// <summary>
       /// Meaning of the supplemental data
diff --git a/src/Hl7.Fhir.R4/Model/Generated/MeasureReport.cs b/src/Hl7.Fhir.R4/Model/Generated/MeasureReport.cs
index cecbe3c358..425dac26f3 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/MeasureReport.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/MeasureReport.cs
@@ -129,14 +129,13 @@ public enum MeasureReportType
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MeasureReport#Group")]
-    [BackboneType("MeasureReport.group")]
+    [FhirType("MeasureReport.group", IsBackboneType=true)]
     public partial class GroupComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MeasureReport#Group"; } }
+      public override string TypeName { get { return "MeasureReport.group"; } }
 
       /// <summary>
       /// Meaning of the group
@@ -332,14 +331,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MeasureReport#Population")]
-    [BackboneType("MeasureReport.group.population")]
+    [FhirType("MeasureReport.group.population", IsBackboneType=true)]
     public partial class PopulationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MeasureReport#Population"; } }
+      public override string TypeName { get { return "MeasureReport.group.population"; } }
 
       /// <summary>
       /// initial-population | numerator | numerator-exclusion | denominator | denominator-exclusion | denominator-exception | measure-population | measure-population-exclusion | measure-observation
@@ -529,14 +527,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MeasureReport#Stratifier")]
-    [BackboneType("MeasureReport.group.stratifier")]
+    [FhirType("MeasureReport.group.stratifier", IsBackboneType=true)]
     public partial class StratifierComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MeasureReport#Stratifier"; } }
+      public override string TypeName { get { return "MeasureReport.group.stratifier"; } }
 
       /// <summary>
       /// What stratifier of the group
@@ -682,14 +679,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MeasureReport#StratifierGroup")]
-    [BackboneType("MeasureReport.group.stratifier.stratum")]
+    [FhirType("MeasureReport.group.stratifier.stratum", IsBackboneType=true)]
     public partial class StratifierGroupComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MeasureReport#StratifierGroup"; } }
+      public override string TypeName { get { return "MeasureReport.group.stratifier.stratum"; } }
 
       /// <summary>
       /// The stratum value, e.g. male
@@ -885,14 +881,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MeasureReport#Component")]
-    [BackboneType("MeasureReport.group.stratifier.stratum.component")]
+    [FhirType("MeasureReport.group.stratifier.stratum.component", IsBackboneType=true)]
     public partial class ComponentComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MeasureReport#Component"; } }
+      public override string TypeName { get { return "MeasureReport.group.stratifier.stratum.component"; } }
 
       /// <summary>
       /// What stratifier component of the group
@@ -1038,14 +1033,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MeasureReport#StratifierGroupPopulation")]
-    [BackboneType("MeasureReport.group.stratifier.stratum.population")]
+    [FhirType("MeasureReport.group.stratifier.stratum.population", IsBackboneType=true)]
     public partial class StratifierGroupPopulationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MeasureReport#StratifierGroupPopulation"; } }
+      public override string TypeName { get { return "MeasureReport.group.stratifier.stratum.population"; } }
 
       /// <summary>
       /// initial-population | numerator | numerator-exclusion | denominator | denominator-exclusion | denominator-exception | measure-population | measure-population-exclusion | measure-observation
diff --git a/src/Hl7.Fhir.R4/Model/Generated/Medication.cs b/src/Hl7.Fhir.R4/Model/Generated/Medication.cs
index 1d29886cd9..38d6b8fc0c 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/Medication.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/Medication.cs
@@ -96,14 +96,13 @@ public enum MedicationStatusCodes
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Medication#Ingredient")]
-    [BackboneType("Medication.ingredient")]
+    [FhirType("Medication.ingredient", IsBackboneType=true)]
     public partial class IngredientComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Medication#Ingredient"; } }
+      public override string TypeName { get { return "Medication.ingredient"; } }
 
       /// <summary>
       /// The actual ingredient or content
@@ -294,14 +293,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Medication#Batch")]
-    [BackboneType("Medication.batch")]
+    [FhirType("Medication.batch", IsBackboneType=true)]
     public partial class BatchComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Medication#Batch"; } }
+      public override string TypeName { get { return "Medication.batch"; } }
 
       /// <summary>
       /// Identifier assigned to batch
diff --git a/src/Hl7.Fhir.R4/Model/Generated/MedicationAdministration.cs b/src/Hl7.Fhir.R4/Model/Generated/MedicationAdministration.cs
index 1253b49735..eb304c6d72 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/MedicationAdministration.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/MedicationAdministration.cs
@@ -119,14 +119,13 @@ public enum MedicationAdministrationStatusCodes
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationAdministration#Performer")]
-    [BackboneType("MedicationAdministration.performer")]
+    [FhirType("MedicationAdministration.performer", IsBackboneType=true)]
     public partial class PerformerComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MedicationAdministration#Performer"; } }
+      public override string TypeName { get { return "MedicationAdministration.performer"; } }
 
       /// <summary>
       /// Type of performance
@@ -274,14 +273,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationAdministration#Dosage")]
-    [BackboneType("MedicationAdministration.dosage")]
+    [FhirType("MedicationAdministration.dosage", IsBackboneType=true)]
     public partial class DosageComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MedicationAdministration#Dosage"; } }
+      public override string TypeName { get { return "MedicationAdministration.dosage"; } }
 
       /// <summary>
       /// Free text dosage instructions e.g. SIG
diff --git a/src/Hl7.Fhir.R4/Model/Generated/MedicationDispense.cs b/src/Hl7.Fhir.R4/Model/Generated/MedicationDispense.cs
index 346b6e649d..f674642ba5 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/MedicationDispense.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/MedicationDispense.cs
@@ -131,14 +131,13 @@ public enum MedicationDispenseStatusCodes
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationDispense#Performer")]
-    [BackboneType("MedicationDispense.performer")]
+    [FhirType("MedicationDispense.performer", IsBackboneType=true)]
     public partial class PerformerComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MedicationDispense#Performer"; } }
+      public override string TypeName { get { return "MedicationDispense.performer"; } }
 
       /// <summary>
       /// Who performed the dispense and what they did
@@ -286,14 +285,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationDispense#Substitution")]
-    [BackboneType("MedicationDispense.substitution")]
+    [FhirType("MedicationDispense.substitution", IsBackboneType=true)]
     public partial class SubstitutionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MedicationDispense#Substitution"; } }
+      public override string TypeName { get { return "MedicationDispense.substitution"; } }
 
       /// <summary>
       /// Whether a substitution was or was not performed on the dispense
diff --git a/src/Hl7.Fhir.R4/Model/Generated/MedicationKnowledge.cs b/src/Hl7.Fhir.R4/Model/Generated/MedicationKnowledge.cs
index 05c95ee9ec..62d7f1cbf8 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/MedicationKnowledge.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/MedicationKnowledge.cs
@@ -95,14 +95,13 @@ public enum MedicationKnowledgeStatusCodes
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationKnowledge#RelatedMedicationKnowledge")]
-    [BackboneType("MedicationKnowledge.relatedMedicationKnowledge")]
+    [FhirType("MedicationKnowledge.relatedMedicationKnowledge", IsBackboneType=true)]
     public partial class RelatedMedicationKnowledgeComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MedicationKnowledge#RelatedMedicationKnowledge"; } }
+      public override string TypeName { get { return "MedicationKnowledge.relatedMedicationKnowledge"; } }
 
       /// <summary>
       /// Category of medicationKnowledge
@@ -247,14 +246,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationKnowledge#Monograph")]
-    [BackboneType("MedicationKnowledge.monograph")]
+    [FhirType("MedicationKnowledge.monograph", IsBackboneType=true)]
     public partial class MonographComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MedicationKnowledge#Monograph"; } }
+      public override string TypeName { get { return "MedicationKnowledge.monograph"; } }
 
       /// <summary>
       /// The category of medication document
@@ -400,14 +398,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationKnowledge#Ingredient")]
-    [BackboneType("MedicationKnowledge.ingredient")]
+    [FhirType("MedicationKnowledge.ingredient", IsBackboneType=true)]
     public partial class IngredientComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MedicationKnowledge#Ingredient"; } }
+      public override string TypeName { get { return "MedicationKnowledge.ingredient"; } }
 
       /// <summary>
       /// Medication(s) or substance(s) contained in the medication
@@ -598,14 +595,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationKnowledge#Cost")]
-    [BackboneType("MedicationKnowledge.cost")]
+    [FhirType("MedicationKnowledge.cost", IsBackboneType=true)]
     public partial class CostComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MedicationKnowledge#Cost"; } }
+      public override string TypeName { get { return "MedicationKnowledge.cost"; } }
 
       /// <summary>
       /// The category of the cost information
@@ -794,14 +790,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationKnowledge#MonitoringProgram")]
-    [BackboneType("MedicationKnowledge.monitoringProgram")]
+    [FhirType("MedicationKnowledge.monitoringProgram", IsBackboneType=true)]
     public partial class MonitoringProgramComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MedicationKnowledge#MonitoringProgram"; } }
+      public override string TypeName { get { return "MedicationKnowledge.monitoringProgram"; } }
 
       /// <summary>
       /// Type of program under which the medication is monitored
@@ -963,14 +958,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationKnowledge#AdministrationGuidelines")]
-    [BackboneType("MedicationKnowledge.administrationGuidelines")]
+    [FhirType("MedicationKnowledge.administrationGuidelines", IsBackboneType=true)]
     public partial class AdministrationGuidelinesComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MedicationKnowledge#AdministrationGuidelines"; } }
+      public override string TypeName { get { return "MedicationKnowledge.administrationGuidelines"; } }
 
       /// <summary>
       /// Dosage for the medication for the specific guidelines
@@ -1141,14 +1135,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationKnowledge#Dosage")]
-    [BackboneType("MedicationKnowledge.administrationGuidelines.dosage")]
+    [FhirType("MedicationKnowledge.administrationGuidelines.dosage", IsBackboneType=true)]
     public partial class DosageComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MedicationKnowledge#Dosage"; } }
+      public override string TypeName { get { return "MedicationKnowledge.administrationGuidelines.dosage"; } }
 
       /// <summary>
       /// Type of dosage
@@ -1294,14 +1287,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationKnowledge#PatientCharacteristics")]
-    [BackboneType("MedicationKnowledge.administrationGuidelines.patientCharacteristics")]
+    [FhirType("MedicationKnowledge.administrationGuidelines.patientCharacteristics", IsBackboneType=true)]
     public partial class PatientCharacteristicsComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MedicationKnowledge#PatientCharacteristics"; } }
+      public override string TypeName { get { return "MedicationKnowledge.administrationGuidelines.patientCharacteristics"; } }
 
       /// <summary>
       /// Specific characteristic that is relevant to the administration guideline
@@ -1464,14 +1456,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationKnowledge#MedicineClassification")]
-    [BackboneType("MedicationKnowledge.medicineClassification")]
+    [FhirType("MedicationKnowledge.medicineClassification", IsBackboneType=true)]
     public partial class MedicineClassificationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MedicationKnowledge#MedicineClassification"; } }
+      public override string TypeName { get { return "MedicationKnowledge.medicineClassification"; } }
 
       /// <summary>
       /// The type of category for the medication (for example, therapeutic classification, therapeutic sub-classification)
@@ -1617,14 +1608,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationKnowledge#Packaging")]
-    [BackboneType("MedicationKnowledge.packaging")]
+    [FhirType("MedicationKnowledge.packaging", IsBackboneType=true)]
     public partial class PackagingComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MedicationKnowledge#Packaging"; } }
+      public override string TypeName { get { return "MedicationKnowledge.packaging"; } }
 
       /// <summary>
       /// A code that defines the specific type of packaging that the medication can be found in
@@ -1769,14 +1759,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationKnowledge#DrugCharacteristic")]
-    [BackboneType("MedicationKnowledge.drugCharacteristic")]
+    [FhirType("MedicationKnowledge.drugCharacteristic", IsBackboneType=true)]
     public partial class DrugCharacteristicComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MedicationKnowledge#DrugCharacteristic"; } }
+      public override string TypeName { get { return "MedicationKnowledge.drugCharacteristic"; } }
 
       /// <summary>
       /// Code specifying the type of characteristic of medication
@@ -1920,14 +1909,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationKnowledge#Regulatory")]
-    [BackboneType("MedicationKnowledge.regulatory")]
+    [FhirType("MedicationKnowledge.regulatory", IsBackboneType=true)]
     public partial class RegulatoryComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MedicationKnowledge#Regulatory"; } }
+      public override string TypeName { get { return "MedicationKnowledge.regulatory"; } }
 
       /// <summary>
       /// Specifies the authority of the regulation
@@ -2123,14 +2111,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationKnowledge#Substitution")]
-    [BackboneType("MedicationKnowledge.regulatory.substitution")]
+    [FhirType("MedicationKnowledge.regulatory.substitution", IsBackboneType=true)]
     public partial class SubstitutionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MedicationKnowledge#Substitution"; } }
+      public override string TypeName { get { return "MedicationKnowledge.regulatory.substitution"; } }
 
       /// <summary>
       /// Specifies the type of substitution allowed
@@ -2291,14 +2278,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationKnowledge#Schedule")]
-    [BackboneType("MedicationKnowledge.regulatory.schedule")]
+    [FhirType("MedicationKnowledge.regulatory.schedule", IsBackboneType=true)]
     public partial class ScheduleComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MedicationKnowledge#Schedule"; } }
+      public override string TypeName { get { return "MedicationKnowledge.regulatory.schedule"; } }
 
       /// <summary>
       /// Specifies the specific drug schedule
@@ -2415,14 +2401,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationKnowledge#MaxDispense")]
-    [BackboneType("MedicationKnowledge.regulatory.maxDispense")]
+    [FhirType("MedicationKnowledge.regulatory.maxDispense", IsBackboneType=true)]
     public partial class MaxDispenseComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MedicationKnowledge#MaxDispense"; } }
+      public override string TypeName { get { return "MedicationKnowledge.regulatory.maxDispense"; } }
 
       /// <summary>
       /// The maximum number of units of the medication that can be dispensed
@@ -2564,14 +2549,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationKnowledge#Kinetics")]
-    [BackboneType("MedicationKnowledge.kinetics")]
+    [FhirType("MedicationKnowledge.kinetics", IsBackboneType=true)]
     public partial class KineticsComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MedicationKnowledge#Kinetics"; } }
+      public override string TypeName { get { return "MedicationKnowledge.kinetics"; } }
 
       /// <summary>
       /// The drug concentration measured at certain discrete points in time
diff --git a/src/Hl7.Fhir.R4/Model/Generated/MedicationRequest.cs b/src/Hl7.Fhir.R4/Model/Generated/MedicationRequest.cs
index f5b80a1ad8..d86c52ec56 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/MedicationRequest.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/MedicationRequest.cs
@@ -183,14 +183,13 @@ public enum MedicationRequestIntent
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationRequest#DispenseRequest")]
-    [BackboneType("MedicationRequest.dispenseRequest")]
+    [FhirType("MedicationRequest.dispenseRequest", IsBackboneType=true)]
     public partial class DispenseRequestComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MedicationRequest#DispenseRequest"; } }
+      public override string TypeName { get { return "MedicationRequest.dispenseRequest"; } }
 
       /// <summary>
       /// First fill details
@@ -480,14 +479,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationRequest#InitialFill")]
-    [BackboneType("MedicationRequest.dispenseRequest.initialFill")]
+    [FhirType("MedicationRequest.dispenseRequest.initialFill", IsBackboneType=true)]
     public partial class InitialFillComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MedicationRequest#InitialFill"; } }
+      public override string TypeName { get { return "MedicationRequest.dispenseRequest.initialFill"; } }
 
       /// <summary>
       /// First fill quantity
@@ -631,14 +629,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationRequest#Substitution")]
-    [BackboneType("MedicationRequest.substitution")]
+    [FhirType("MedicationRequest.substitution", IsBackboneType=true)]
     public partial class SubstitutionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MedicationRequest#Substitution"; } }
+      public override string TypeName { get { return "MedicationRequest.substitution"; } }
 
       /// <summary>
       /// Whether substitution is allowed or not
diff --git a/src/Hl7.Fhir.R4/Model/Generated/MedicinalProduct.cs b/src/Hl7.Fhir.R4/Model/Generated/MedicinalProduct.cs
index 17d3a5db28..fdbd9e569a 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/MedicinalProduct.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/MedicinalProduct.cs
@@ -61,14 +61,13 @@ public partial class MedicinalProduct : Hl7.Fhir.Model.DomainResource, IIdentifi
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("MedicinalProduct#Name")]
-    [BackboneType("MedicinalProduct.name")]
+    [FhirType("MedicinalProduct.name", IsBackboneType=true)]
     public partial class NameComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MedicinalProduct#Name"; } }
+      public override string TypeName { get { return "MedicinalProduct.name"; } }
 
       /// <summary>
       /// The full product name
@@ -255,14 +254,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("MedicinalProduct#NamePart")]
-    [BackboneType("MedicinalProduct.name.namePart")]
+    [FhirType("MedicinalProduct.name.namePart", IsBackboneType=true)]
     public partial class NamePartComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MedicinalProduct#NamePart"; } }
+      public override string TypeName { get { return "MedicinalProduct.name.namePart"; } }
 
       /// <summary>
       /// A fragment of a product name
@@ -423,14 +421,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("MedicinalProduct#CountryLanguage")]
-    [BackboneType("MedicinalProduct.name.countryLanguage")]
+    [FhirType("MedicinalProduct.name.countryLanguage", IsBackboneType=true)]
     public partial class CountryLanguageComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MedicinalProduct#CountryLanguage"; } }
+      public override string TypeName { get { return "MedicinalProduct.name.countryLanguage"; } }
 
       /// <summary>
       /// Country code for where this name applies
@@ -598,14 +595,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("MedicinalProduct#ManufacturingBusinessOperation")]
-    [BackboneType("MedicinalProduct.manufacturingBusinessOperation")]
+    [FhirType("MedicinalProduct.manufacturingBusinessOperation", IsBackboneType=true)]
     public partial class ManufacturingBusinessOperationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MedicinalProduct#ManufacturingBusinessOperation"; } }
+      public override string TypeName { get { return "MedicinalProduct.manufacturingBusinessOperation"; } }
 
       /// <summary>
       /// The type of manufacturing operation
@@ -869,14 +865,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("MedicinalProduct#SpecialDesignation")]
-    [BackboneType("MedicinalProduct.specialDesignation")]
+    [FhirType("MedicinalProduct.specialDesignation", IsBackboneType=true)]
     public partial class SpecialDesignationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MedicinalProduct#SpecialDesignation"; } }
+      public override string TypeName { get { return "MedicinalProduct.specialDesignation"; } }
 
       /// <summary>
       /// Identifier for the designation, or procedure number
diff --git a/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductAuthorization.cs b/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductAuthorization.cs
index f5f7b20b72..e1eae3fd09 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductAuthorization.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductAuthorization.cs
@@ -61,14 +61,13 @@ public partial class MedicinalProductAuthorization : Hl7.Fhir.Model.DomainResour
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("MedicinalProductAuthorization#JurisdictionalAuthorization")]
-    [BackboneType("MedicinalProductAuthorization.jurisdictionalAuthorization")]
+    [FhirType("MedicinalProductAuthorization.jurisdictionalAuthorization", IsBackboneType=true)]
     public partial class JurisdictionalAuthorizationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MedicinalProductAuthorization#JurisdictionalAuthorization"; } }
+      public override string TypeName { get { return "MedicinalProductAuthorization.jurisdictionalAuthorization"; } }
 
       /// <summary>
       /// The assigned number for the marketing authorization
@@ -286,14 +285,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("MedicinalProductAuthorization#Procedure")]
-    [BackboneType("MedicinalProductAuthorization.procedure")]
+    [FhirType("MedicinalProductAuthorization.procedure", IsBackboneType=true)]
     public partial class ProcedureComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MedicinalProductAuthorization#Procedure"; } }
+      public override string TypeName { get { return "MedicinalProductAuthorization.procedure"; } }
 
       /// <summary>
       /// Identifier for this procedure
diff --git a/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductContraindication.cs b/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductContraindication.cs
index 3f74197a91..a88e03ec7a 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductContraindication.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductContraindication.cs
@@ -64,14 +64,13 @@ public partial class MedicinalProductContraindication : Hl7.Fhir.Model.DomainRes
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("MedicinalProductContraindication#OtherTherapy")]
-    [BackboneType("MedicinalProductContraindication.otherTherapy")]
+    [FhirType("MedicinalProductContraindication.otherTherapy", IsBackboneType=true)]
     public partial class OtherTherapyComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MedicinalProductContraindication#OtherTherapy"; } }
+      public override string TypeName { get { return "MedicinalProductContraindication.otherTherapy"; } }
 
       /// <summary>
       /// The type of relationship between the medicinal product indication or contraindication and another therapy
diff --git a/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductIndication.cs b/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductIndication.cs
index cbb8fd9927..7e58250f70 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductIndication.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductIndication.cs
@@ -64,14 +64,13 @@ public partial class MedicinalProductIndication : Hl7.Fhir.Model.DomainResource
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("MedicinalProductIndication#OtherTherapy")]
-    [BackboneType("MedicinalProductIndication.otherTherapy")]
+    [FhirType("MedicinalProductIndication.otherTherapy", IsBackboneType=true)]
     public partial class OtherTherapyComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MedicinalProductIndication#OtherTherapy"; } }
+      public override string TypeName { get { return "MedicinalProductIndication.otherTherapy"; } }
 
       /// <summary>
       /// The type of relationship between the medicinal product indication or contraindication and another therapy
diff --git a/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductIngredient.cs b/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductIngredient.cs
index a0984fd4df..7dd2f43bce 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductIngredient.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductIngredient.cs
@@ -61,14 +61,13 @@ public partial class MedicinalProductIngredient : Hl7.Fhir.Model.DomainResource,
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("MedicinalProductIngredient#SpecifiedSubstance")]
-    [BackboneType("MedicinalProductIngredient.specifiedSubstance")]
+    [FhirType("MedicinalProductIngredient.specifiedSubstance", IsBackboneType=true)]
     public partial class SpecifiedSubstanceComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MedicinalProductIngredient#SpecifiedSubstance"; } }
+      public override string TypeName { get { return "MedicinalProductIngredient.specifiedSubstance"; } }
 
       /// <summary>
       /// The specified substance
@@ -262,14 +261,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("MedicinalProductIngredient#Strength")]
-    [BackboneType("MedicinalProductIngredient.specifiedSubstance.strength")]
+    [FhirType("MedicinalProductIngredient.specifiedSubstance.strength", IsBackboneType=true)]
     public partial class StrengthComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MedicinalProductIngredient#Strength"; } }
+      public override string TypeName { get { return "MedicinalProductIngredient.specifiedSubstance.strength"; } }
 
       /// <summary>
       /// The quantity of substance in the unit of presentation, or in the volume (or mass) of the single pharmaceutical product or manufactured item
@@ -556,14 +554,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("MedicinalProductIngredient#ReferenceStrength")]
-    [BackboneType("MedicinalProductIngredient.specifiedSubstance.strength.referenceStrength")]
+    [FhirType("MedicinalProductIngredient.specifiedSubstance.strength.referenceStrength", IsBackboneType=true)]
     public partial class ReferenceStrengthComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MedicinalProductIngredient#ReferenceStrength"; } }
+      public override string TypeName { get { return "MedicinalProductIngredient.specifiedSubstance.strength.referenceStrength"; } }
 
       /// <summary>
       /// Relevant reference substance
@@ -799,14 +796,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("MedicinalProductIngredient#Substance")]
-    [BackboneType("MedicinalProductIngredient.substance")]
+    [FhirType("MedicinalProductIngredient.substance", IsBackboneType=true)]
     public partial class SubstanceComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MedicinalProductIngredient#Substance"; } }
+      public override string TypeName { get { return "MedicinalProductIngredient.substance"; } }
 
       /// <summary>
       /// The ingredient substance
diff --git a/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductInteraction.cs b/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductInteraction.cs
index 2a77baea97..2274a26d20 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductInteraction.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductInteraction.cs
@@ -64,14 +64,13 @@ public partial class MedicinalProductInteraction : Hl7.Fhir.Model.DomainResource
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("MedicinalProductInteraction#Interactant")]
-    [BackboneType("MedicinalProductInteraction.interactant")]
+    [FhirType("MedicinalProductInteraction.interactant", IsBackboneType=true)]
     public partial class InteractantComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MedicinalProductInteraction#Interactant"; } }
+      public override string TypeName { get { return "MedicinalProductInteraction.interactant"; } }
 
       /// <summary>
       /// The specific medication, food or laboratory test that interacts
diff --git a/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductPackaged.cs b/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductPackaged.cs
index 48edce22a5..c3d4326e12 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductPackaged.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductPackaged.cs
@@ -61,14 +61,13 @@ public partial class MedicinalProductPackaged : Hl7.Fhir.Model.DomainResource, I
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("MedicinalProductPackaged#BatchIdentifier")]
-    [BackboneType("MedicinalProductPackaged.batchIdentifier")]
+    [FhirType("MedicinalProductPackaged.batchIdentifier", IsBackboneType=true)]
     public partial class BatchIdentifierComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MedicinalProductPackaged#BatchIdentifier"; } }
+      public override string TypeName { get { return "MedicinalProductPackaged.batchIdentifier"; } }
 
       /// <summary>
       /// A number appearing on the outer packaging of a specific batch
@@ -210,14 +209,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("MedicinalProductPackaged#PackageItem")]
-    [BackboneType("MedicinalProductPackaged.packageItem")]
+    [FhirType("MedicinalProductPackaged.packageItem", IsBackboneType=true)]
     public partial class PackageItemComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MedicinalProductPackaged#PackageItem"; } }
+      public override string TypeName { get { return "MedicinalProductPackaged.packageItem"; } }
 
       /// <summary>
       /// Including possibly Data Carrier Identifier
diff --git a/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductPharmaceutical.cs b/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductPharmaceutical.cs
index 4c170a2c02..8f78ce4a03 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductPharmaceutical.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductPharmaceutical.cs
@@ -61,14 +61,13 @@ public partial class MedicinalProductPharmaceutical : Hl7.Fhir.Model.DomainResou
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("MedicinalProductPharmaceutical#Characteristics")]
-    [BackboneType("MedicinalProductPharmaceutical.characteristics")]
+    [FhirType("MedicinalProductPharmaceutical.characteristics", IsBackboneType=true)]
     public partial class CharacteristicsComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MedicinalProductPharmaceutical#Characteristics"; } }
+      public override string TypeName { get { return "MedicinalProductPharmaceutical.characteristics"; } }
 
       /// <summary>
       /// A coded characteristic
@@ -210,14 +209,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("MedicinalProductPharmaceutical#RouteOfAdministration")]
-    [BackboneType("MedicinalProductPharmaceutical.routeOfAdministration")]
+    [FhirType("MedicinalProductPharmaceutical.routeOfAdministration", IsBackboneType=true)]
     public partial class RouteOfAdministrationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MedicinalProductPharmaceutical#RouteOfAdministration"; } }
+      public override string TypeName { get { return "MedicinalProductPharmaceutical.routeOfAdministration"; } }
 
       /// <summary>
       /// Coded expression for the route
@@ -485,14 +483,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("MedicinalProductPharmaceutical#TargetSpecies")]
-    [BackboneType("MedicinalProductPharmaceutical.routeOfAdministration.targetSpecies")]
+    [FhirType("MedicinalProductPharmaceutical.routeOfAdministration.targetSpecies", IsBackboneType=true)]
     public partial class TargetSpeciesComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MedicinalProductPharmaceutical#TargetSpecies"; } }
+      public override string TypeName { get { return "MedicinalProductPharmaceutical.routeOfAdministration.targetSpecies"; } }
 
       /// <summary>
       /// Coded expression for the species
@@ -635,14 +632,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("MedicinalProductPharmaceutical#WithdrawalPeriod")]
-    [BackboneType("MedicinalProductPharmaceutical.routeOfAdministration.targetSpecies.withdrawalPeriod")]
+    [FhirType("MedicinalProductPharmaceutical.routeOfAdministration.targetSpecies.withdrawalPeriod", IsBackboneType=true)]
     public partial class WithdrawalPeriodComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MedicinalProductPharmaceutical#WithdrawalPeriod"; } }
+      public override string TypeName { get { return "MedicinalProductPharmaceutical.routeOfAdministration.targetSpecies.withdrawalPeriod"; } }
 
       /// <summary>
       /// Coded expression for the type of tissue for which the withdrawal period applues, e.g. meat, milk
diff --git a/src/Hl7.Fhir.R4/Model/Generated/MessageDefinition.cs b/src/Hl7.Fhir.R4/Model/Generated/MessageDefinition.cs
index ca7add61c7..19db4dcd29 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/MessageDefinition.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/MessageDefinition.cs
@@ -96,14 +96,13 @@ public enum MessageSignificanceCategory
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MessageDefinition#Focus")]
-    [BackboneType("MessageDefinition.focus")]
+    [FhirType("MessageDefinition.focus", IsBackboneType=true)]
     public partial class FocusComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MessageDefinition#Focus"; } }
+      public override string TypeName { get { return "MessageDefinition.focus"; } }
 
       /// <summary>
       /// Type of resource
@@ -374,14 +373,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MessageDefinition#AllowedResponse")]
-    [BackboneType("MessageDefinition.allowedResponse")]
+    [FhirType("MessageDefinition.allowedResponse", IsBackboneType=true)]
     public partial class AllowedResponseComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MessageDefinition#AllowedResponse"; } }
+      public override string TypeName { get { return "MessageDefinition.allowedResponse"; } }
 
       /// <summary>
       /// Reference to allowed message definition response
diff --git a/src/Hl7.Fhir.R4/Model/Generated/MessageHeader.cs b/src/Hl7.Fhir.R4/Model/Generated/MessageHeader.cs
index fe50c0f56e..7451ba1f97 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/MessageHeader.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/MessageHeader.cs
@@ -96,14 +96,13 @@ public enum ResponseType
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MessageHeader#MessageDestination")]
-    [BackboneType("MessageHeader.destination")]
+    [FhirType("MessageHeader.destination", IsBackboneType=true)]
     public partial class MessageDestinationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MessageHeader#MessageDestination"; } }
+      public override string TypeName { get { return "MessageHeader.destination"; } }
 
       /// <summary>
       /// Name of system
@@ -338,14 +337,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MessageHeader#MessageSource")]
-    [BackboneType("MessageHeader.source")]
+    [FhirType("MessageHeader.source", IsBackboneType=true)]
     public partial class MessageSourceComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MessageHeader#MessageSource"; } }
+      public override string TypeName { get { return "MessageHeader.source"; } }
 
       /// <summary>
       /// Name of system
@@ -637,14 +635,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MessageHeader#Response")]
-    [BackboneType("MessageHeader.response")]
+    [FhirType("MessageHeader.response", IsBackboneType=true)]
     public partial class ResponseComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MessageHeader#Response"; } }
+      public override string TypeName { get { return "MessageHeader.response"; } }
 
       /// <summary>
       /// Id of original message
diff --git a/src/Hl7.Fhir.R4/Model/Generated/MolecularSequence.cs b/src/Hl7.Fhir.R4/Model/Generated/MolecularSequence.cs
index d035566813..cdc3d3bb1d 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/MolecularSequence.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/MolecularSequence.cs
@@ -207,14 +207,13 @@ public enum RepositoryType
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MolecularSequence#ReferenceSeq")]
-    [BackboneType("MolecularSequence.referenceSeq")]
+    [FhirType("MolecularSequence.referenceSeq", IsBackboneType=true)]
     public partial class ReferenceSeqComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MolecularSequence#ReferenceSeq"; } }
+      public override string TypeName { get { return "MolecularSequence.referenceSeq"; } }
 
       /// <summary>
       /// Chromosome containing genetic finding
@@ -649,14 +648,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MolecularSequence#Variant")]
-    [BackboneType("MolecularSequence.variant")]
+    [FhirType("MolecularSequence.variant", IsBackboneType=true)]
     public partial class VariantComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MolecularSequence#Variant"; } }
+      public override string TypeName { get { return "MolecularSequence.variant"; } }
 
       /// <summary>
       /// Start position of the variant on the  reference sequence
@@ -992,14 +990,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MolecularSequence#Quality")]
-    [BackboneType("MolecularSequence.quality")]
+    [FhirType("MolecularSequence.quality", IsBackboneType=true)]
     public partial class QualityComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MolecularSequence#Quality"; } }
+      public override string TypeName { get { return "MolecularSequence.quality"; } }
 
       /// <summary>
       /// indel | snp | unknown
@@ -1671,14 +1668,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MolecularSequence#Roc")]
-    [BackboneType("MolecularSequence.quality.roc")]
+    [FhirType("MolecularSequence.quality.roc", IsBackboneType=true)]
     public partial class RocComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MolecularSequence#Roc"; } }
+      public override string TypeName { get { return "MolecularSequence.quality.roc"; } }
 
       /// <summary>
       /// Genotype quality score
@@ -2080,14 +2076,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MolecularSequence#Repository")]
-    [BackboneType("MolecularSequence.repository")]
+    [FhirType("MolecularSequence.repository", IsBackboneType=true)]
     public partial class RepositoryComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MolecularSequence#Repository"; } }
+      public override string TypeName { get { return "MolecularSequence.repository"; } }
 
       /// <summary>
       /// directlink | openapi | login | oauth | other
@@ -2442,14 +2437,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MolecularSequence#StructureVariant")]
-    [BackboneType("MolecularSequence.structureVariant")]
+    [FhirType("MolecularSequence.structureVariant", IsBackboneType=true)]
     public partial class StructureVariantComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MolecularSequence#StructureVariant"; } }
+      public override string TypeName { get { return "MolecularSequence.structureVariant"; } }
 
       /// <summary>
       /// Structural variant change type
@@ -2702,14 +2696,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("MolecularSequence#Outer")]
-    [BackboneType("MolecularSequence.structureVariant.outer")]
+    [FhirType("MolecularSequence.structureVariant.outer", IsBackboneType=true)]
     public partial class OuterComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MolecularSequence#Outer"; } }
+      public override string TypeName { get { return "MolecularSequence.structureVariant.outer"; } }
 
       /// <summary>
       /// Structural variant outer start
@@ -2886,14 +2879,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("MolecularSequence#Inner")]
-    [BackboneType("MolecularSequence.structureVariant.inner")]
+    [FhirType("MolecularSequence.structureVariant.inner", IsBackboneType=true)]
     public partial class InnerComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MolecularSequence#Inner"; } }
+      public override string TypeName { get { return "MolecularSequence.structureVariant.inner"; } }
 
       /// <summary>
       /// Structural variant inner start
diff --git a/src/Hl7.Fhir.R4/Model/Generated/NamingSystem.cs b/src/Hl7.Fhir.R4/Model/Generated/NamingSystem.cs
index 86520c23ca..a150932f34 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/NamingSystem.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/NamingSystem.cs
@@ -130,14 +130,13 @@ public enum NamingSystemIdentifierType
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("NamingSystem#UniqueId")]
-    [BackboneType("NamingSystem.uniqueId")]
+    [FhirType("NamingSystem.uniqueId", IsBackboneType=true)]
     public partial class UniqueIdComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "NamingSystem#UniqueId"; } }
+      public override string TypeName { get { return "NamingSystem.uniqueId"; } }
 
       /// <summary>
       /// oid | uuid | uri | other
diff --git a/src/Hl7.Fhir.R4/Model/Generated/NutritionOrder.cs b/src/Hl7.Fhir.R4/Model/Generated/NutritionOrder.cs
index a896ba5161..76479e521c 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/NutritionOrder.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/NutritionOrder.cs
@@ -68,14 +68,13 @@ public partial class NutritionOrder : Hl7.Fhir.Model.DomainResource, IIdentifiab
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("NutritionOrder#OralDiet")]
-    [BackboneType("NutritionOrder.oralDiet")]
+    [FhirType("NutritionOrder.oralDiet", IsBackboneType=true)]
     public partial class OralDietComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "NutritionOrder#OralDiet"; } }
+      public override string TypeName { get { return "NutritionOrder.oralDiet"; } }
 
       /// <summary>
       /// Type of oral diet or diet restrictions that describe what can be consumed orally
@@ -344,14 +343,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("NutritionOrder#Nutrient")]
-    [BackboneType("NutritionOrder.oralDiet.nutrient")]
+    [FhirType("NutritionOrder.oralDiet.nutrient", IsBackboneType=true)]
     public partial class NutrientComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "NutritionOrder#Nutrient"; } }
+      public override string TypeName { get { return "NutritionOrder.oralDiet.nutrient"; } }
 
       /// <summary>
       /// Type of nutrient that is being modified
@@ -496,14 +494,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("NutritionOrder#Texture")]
-    [BackboneType("NutritionOrder.oralDiet.texture")]
+    [FhirType("NutritionOrder.oralDiet.texture", IsBackboneType=true)]
     public partial class TextureComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "NutritionOrder#Texture"; } }
+      public override string TypeName { get { return "NutritionOrder.oralDiet.texture"; } }
 
       /// <summary>
       /// Code to indicate how to alter the texture of the foods, e.g. pureed
@@ -649,14 +646,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("NutritionOrder#Supplement")]
-    [BackboneType("NutritionOrder.supplement")]
+    [FhirType("NutritionOrder.supplement", IsBackboneType=true)]
     public partial class SupplementComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "NutritionOrder#Supplement"; } }
+      public override string TypeName { get { return "NutritionOrder.supplement"; } }
 
       /// <summary>
       /// Type of supplement product requested
@@ -913,14 +909,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("NutritionOrder#EnteralFormula")]
-    [BackboneType("NutritionOrder.enteralFormula")]
+    [FhirType("NutritionOrder.enteralFormula", IsBackboneType=true)]
     public partial class EnteralFormulaComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "NutritionOrder#EnteralFormula"; } }
+      public override string TypeName { get { return "NutritionOrder.enteralFormula"; } }
 
       /// <summary>
       /// Type of enteral or infant formula
@@ -1298,14 +1293,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("NutritionOrder#Administration")]
-    [BackboneType("NutritionOrder.enteralFormula.administration")]
+    [FhirType("NutritionOrder.enteralFormula.administration", IsBackboneType=true)]
     public partial class AdministrationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "NutritionOrder#Administration"; } }
+      public override string TypeName { get { return "NutritionOrder.enteralFormula.administration"; } }
 
       /// <summary>
       /// Scheduled frequency of enteral feeding
diff --git a/src/Hl7.Fhir.R4/Model/Generated/Observation.cs b/src/Hl7.Fhir.R4/Model/Generated/Observation.cs
index f6267094fd..05ece6b0f5 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/Observation.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/Observation.cs
@@ -69,14 +69,13 @@ public partial class Observation : Hl7.Fhir.Model.DomainResource, IIdentifiable<
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Observation#ReferenceRange")]
-    [BackboneType("Observation.referenceRange")]
+    [FhirType("Observation.referenceRange", IsBackboneType=true)]
     public partial class ReferenceRangeComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Observation#ReferenceRange"; } }
+      public override string TypeName { get { return "Observation.referenceRange"; } }
 
       /// <summary>
       /// Low Range, if relevant
@@ -342,14 +341,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Observation#Component")]
-    [BackboneType("Observation.component")]
+    [FhirType("Observation.component", IsBackboneType=true)]
     public partial class ComponentComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Observation#Component"; } }
+      public override string TypeName { get { return "Observation.component"; } }
 
       /// <summary>
       /// Type of component observation (code / type)
diff --git a/src/Hl7.Fhir.R4/Model/Generated/ObservationDefinition.cs b/src/Hl7.Fhir.R4/Model/Generated/ObservationDefinition.cs
index 13970c8bc5..d75cc7fee3 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/ObservationDefinition.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/ObservationDefinition.cs
@@ -172,14 +172,13 @@ public enum ObservationRangeCategory
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ObservationDefinition#QuantitativeDetails")]
-    [BackboneType("ObservationDefinition.quantitativeDetails")]
+    [FhirType("ObservationDefinition.quantitativeDetails", IsBackboneType=true)]
     public partial class QuantitativeDetailsComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ObservationDefinition#QuantitativeDetails"; } }
+      public override string TypeName { get { return "ObservationDefinition.quantitativeDetails"; } }
 
       /// <summary>
       /// Customary unit for quantitative results
@@ -411,14 +410,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ObservationDefinition#QualifiedInterval")]
-    [BackboneType("ObservationDefinition.qualifiedInterval")]
+    [FhirType("ObservationDefinition.qualifiedInterval", IsBackboneType=true)]
     public partial class QualifiedIntervalComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ObservationDefinition#QualifiedInterval"; } }
+      public override string TypeName { get { return "ObservationDefinition.qualifiedInterval"; } }
 
       /// <summary>
       /// reference | critical | absolute
diff --git a/src/Hl7.Fhir.R4/Model/Generated/OperationDefinition.cs b/src/Hl7.Fhir.R4/Model/Generated/OperationDefinition.cs
index 1e8d07a97f..ea0e94b3ef 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/OperationDefinition.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/OperationDefinition.cs
@@ -90,14 +90,13 @@ public enum OperationKind
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("OperationDefinition#Parameter")]
-    [BackboneType("OperationDefinition.parameter")]
+    [FhirType("OperationDefinition.parameter", IsBackboneType=true)]
     public partial class ParameterComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "OperationDefinition#Parameter"; } }
+      public override string TypeName { get { return "OperationDefinition.parameter"; } }
 
       /// <summary>
       /// Name in Parameters.parameter.name or in URL
@@ -623,14 +622,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("OperationDefinition#Binding")]
-    [BackboneType("OperationDefinition.parameter.binding")]
+    [FhirType("OperationDefinition.parameter.binding", IsBackboneType=true)]
     public partial class BindingComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "OperationDefinition#Binding"; } }
+      public override string TypeName { get { return "OperationDefinition.parameter.binding"; } }
 
       /// <summary>
       /// required | extensible | preferred | example
@@ -815,14 +813,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("OperationDefinition#ReferencedFrom")]
-    [BackboneType("OperationDefinition.parameter.referencedFrom")]
+    [FhirType("OperationDefinition.parameter.referencedFrom", IsBackboneType=true)]
     public partial class ReferencedFromComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "OperationDefinition#ReferencedFrom"; } }
+      public override string TypeName { get { return "OperationDefinition.parameter.referencedFrom"; } }
 
       /// <summary>
       /// Referencing parameter
@@ -1004,14 +1001,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("OperationDefinition#Overload")]
-    [BackboneType("OperationDefinition.overload")]
+    [FhirType("OperationDefinition.overload", IsBackboneType=true)]
     public partial class OverloadComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "OperationDefinition#Overload"; } }
+      public override string TypeName { get { return "OperationDefinition.overload"; } }
 
       /// <summary>
       /// Name of parameter to include in overload
diff --git a/src/Hl7.Fhir.R4/Model/Generated/Organization.cs b/src/Hl7.Fhir.R4/Model/Generated/Organization.cs
index 387f3d100d..c586a1263e 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/Organization.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/Organization.cs
@@ -67,14 +67,13 @@ public partial class Organization : Hl7.Fhir.Model.DomainResource, IIdentifiable
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Organization#Contact")]
-    [BackboneType("Organization.contact")]
+    [FhirType("Organization.contact", IsBackboneType=true)]
     public partial class ContactComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Organization#Contact"; } }
+      public override string TypeName { get { return "Organization.contact"; } }
 
       /// <summary>
       /// The type of contact
diff --git a/src/Hl7.Fhir.R4/Model/Generated/Patient.cs b/src/Hl7.Fhir.R4/Model/Generated/Patient.cs
index 33cdd8089c..0782340222 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/Patient.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/Patient.cs
@@ -101,14 +101,13 @@ public enum LinkType
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Patient#Contact")]
-    [BackboneType("Patient.contact")]
+    [FhirType("Patient.contact", IsBackboneType=true)]
     public partial class ContactComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Patient#Contact"; } }
+      public override string TypeName { get { return "Patient.contact"; } }
 
       /// <summary>
       /// The kind of relationship
@@ -402,14 +401,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Patient#Communication")]
-    [BackboneType("Patient.communication")]
+    [FhirType("Patient.communication", IsBackboneType=true)]
     public partial class CommunicationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Patient#Communication"; } }
+      public override string TypeName { get { return "Patient.communication"; } }
 
       /// <summary>
       /// The language which can be used to communicate with the patient about his or her health
@@ -574,14 +572,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Patient#Link")]
-    [BackboneType("Patient.link")]
+    [FhirType("Patient.link", IsBackboneType=true)]
     public partial class LinkComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Patient#Link"; } }
+      public override string TypeName { get { return "Patient.link"; } }
 
       /// <summary>
       /// The other patient or related person resource that the link refers to
diff --git a/src/Hl7.Fhir.R4/Model/Generated/PaymentReconciliation.cs b/src/Hl7.Fhir.R4/Model/Generated/PaymentReconciliation.cs
index 731dae275f..e90062ee63 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/PaymentReconciliation.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/PaymentReconciliation.cs
@@ -67,14 +67,13 @@ public partial class PaymentReconciliation : Hl7.Fhir.Model.DomainResource, IIde
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("PaymentReconciliation#Details")]
-    [BackboneType("PaymentReconciliation.detail")]
+    [FhirType("PaymentReconciliation.detail", IsBackboneType=true)]
     public partial class DetailsComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "PaymentReconciliation#Details"; } }
+      public override string TypeName { get { return "PaymentReconciliation.detail"; } }
 
       /// <summary>
       /// Business identifier of the payment detail
@@ -448,14 +447,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("PaymentReconciliation#Notes")]
-    [BackboneType("PaymentReconciliation.processNote")]
+    [FhirType("PaymentReconciliation.processNote", IsBackboneType=true)]
     public partial class NotesComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "PaymentReconciliation#Notes"; } }
+      public override string TypeName { get { return "PaymentReconciliation.processNote"; } }
 
       /// <summary>
       /// display | print | printoper
diff --git a/src/Hl7.Fhir.R4/Model/Generated/Person.cs b/src/Hl7.Fhir.R4/Model/Generated/Person.cs
index 76884ed298..5a0c081272 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/Person.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/Person.cs
@@ -99,14 +99,13 @@ public enum IdentityAssuranceLevel
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Person#Link")]
-    [BackboneType("Person.link")]
+    [FhirType("Person.link", IsBackboneType=true)]
     public partial class LinkComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Person#Link"; } }
+      public override string TypeName { get { return "Person.link"; } }
 
       /// <summary>
       /// The resource to which this actual person is associated
diff --git a/src/Hl7.Fhir.R4/Model/Generated/PlanDefinition.cs b/src/Hl7.Fhir.R4/Model/Generated/PlanDefinition.cs
index de3cbfb6c8..b5cb65a618 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/PlanDefinition.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/PlanDefinition.cs
@@ -67,14 +67,13 @@ public partial class PlanDefinition : Hl7.Fhir.Model.DomainResource, IIdentifiab
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("PlanDefinition#Goal")]
-    [BackboneType("PlanDefinition.goal")]
+    [FhirType("PlanDefinition.goal", IsBackboneType=true)]
     public partial class GoalComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "PlanDefinition#Goal"; } }
+      public override string TypeName { get { return "PlanDefinition.goal"; } }
 
       /// <summary>
       /// E.g. Treatment, dietary, behavioral
@@ -352,14 +351,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("PlanDefinition#Target")]
-    [BackboneType("PlanDefinition.goal.target")]
+    [FhirType("PlanDefinition.goal.target", IsBackboneType=true)]
     public partial class TargetComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "PlanDefinition#Target"; } }
+      public override string TypeName { get { return "PlanDefinition.goal.target"; } }
 
       /// <summary>
       /// The parameter whose value is to be tracked
@@ -532,14 +530,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("PlanDefinition#Action")]
-    [BackboneType("PlanDefinition.action")]
+    [FhirType("PlanDefinition.action", IsBackboneType=true)]
     public partial class ActionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "PlanDefinition#Action"; } }
+      public override string TypeName { get { return "PlanDefinition.action"; } }
 
       /// <summary>
       /// User-visible prefix for the action (e.g. 1. or A.)
@@ -1558,14 +1555,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("PlanDefinition#Condition")]
-    [BackboneType("PlanDefinition.action.condition")]
+    [FhirType("PlanDefinition.action.condition", IsBackboneType=true)]
     public partial class ConditionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "PlanDefinition#Condition"; } }
+      public override string TypeName { get { return "PlanDefinition.action.condition"; } }
 
       /// <summary>
       /// applicability | start | stop
@@ -1731,14 +1727,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("PlanDefinition#RelatedAction")]
-    [BackboneType("PlanDefinition.action.relatedAction")]
+    [FhirType("PlanDefinition.action.relatedAction", IsBackboneType=true)]
     public partial class RelatedActionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "PlanDefinition#RelatedAction"; } }
+      public override string TypeName { get { return "PlanDefinition.action.relatedAction"; } }
 
       /// <summary>
       /// What action is this related to
@@ -1949,14 +1944,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("PlanDefinition#Participant")]
-    [BackboneType("PlanDefinition.action.participant")]
+    [FhirType("PlanDefinition.action.participant", IsBackboneType=true)]
     public partial class ParticipantComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "PlanDefinition#Participant"; } }
+      public override string TypeName { get { return "PlanDefinition.action.participant"; } }
 
       /// <summary>
       /// patient | practitioner | related-person | device
@@ -2123,14 +2117,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("PlanDefinition#DynamicValue")]
-    [BackboneType("PlanDefinition.action.dynamicValue")]
+    [FhirType("PlanDefinition.action.dynamicValue", IsBackboneType=true)]
     public partial class DynamicValueComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "PlanDefinition#DynamicValue"; } }
+      public override string TypeName { get { return "PlanDefinition.action.dynamicValue"; } }
 
       /// <summary>
       /// The path to the element to be set dynamically
diff --git a/src/Hl7.Fhir.R4/Model/Generated/Practitioner.cs b/src/Hl7.Fhir.R4/Model/Generated/Practitioner.cs
index 9d1f92afb0..81bc21c532 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/Practitioner.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/Practitioner.cs
@@ -67,14 +67,13 @@ public partial class Practitioner : Hl7.Fhir.Model.DomainResource, IIdentifiable
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Practitioner#Qualification")]
-    [BackboneType("Practitioner.qualification")]
+    [FhirType("Practitioner.qualification", IsBackboneType=true)]
     public partial class QualificationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Practitioner#Qualification"; } }
+      public override string TypeName { get { return "Practitioner.qualification"; } }
 
       /// <summary>
       /// An identifier for this qualification for the practitioner
diff --git a/src/Hl7.Fhir.R4/Model/Generated/PractitionerRole.cs b/src/Hl7.Fhir.R4/Model/Generated/PractitionerRole.cs
index b13ac78eb2..c57f9b551f 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/PractitionerRole.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/PractitionerRole.cs
@@ -68,14 +68,13 @@ public partial class PractitionerRole : Hl7.Fhir.Model.DomainResource, IIdentifi
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("PractitionerRole#AvailableTime")]
-    [BackboneType("PractitionerRole.availableTime")]
+    [FhirType("PractitionerRole.availableTime", IsBackboneType=true)]
     public partial class AvailableTimeComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "PractitionerRole#AvailableTime"; } }
+      public override string TypeName { get { return "PractitionerRole.availableTime"; } }
 
       /// <summary>
       /// mon | tue | wed | thu | fri | sat | sun
@@ -344,14 +343,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("PractitionerRole#NotAvailable")]
-    [BackboneType("PractitionerRole.notAvailable")]
+    [FhirType("PractitionerRole.notAvailable", IsBackboneType=true)]
     public partial class NotAvailableComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "PractitionerRole#NotAvailable"; } }
+      public override string TypeName { get { return "PractitionerRole.notAvailable"; } }
 
       /// <summary>
       /// Reason presented to the user explaining why time not available
diff --git a/src/Hl7.Fhir.R4/Model/Generated/Procedure.cs b/src/Hl7.Fhir.R4/Model/Generated/Procedure.cs
index c6a78e0cac..5ea229a399 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/Procedure.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/Procedure.cs
@@ -67,14 +67,13 @@ public partial class Procedure : Hl7.Fhir.Model.DomainResource, IIdentifiable<Li
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Procedure#Performer")]
-    [BackboneType("Procedure.performer")]
+    [FhirType("Procedure.performer", IsBackboneType=true)]
     public partial class PerformerComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Procedure#Performer"; } }
+      public override string TypeName { get { return "Procedure.performer"; } }
 
       /// <summary>
       /// Type of performance
@@ -249,14 +248,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Procedure#FocalDevice")]
-    [BackboneType("Procedure.focalDevice")]
+    [FhirType("Procedure.focalDevice", IsBackboneType=true)]
     public partial class FocalDeviceComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Procedure#FocalDevice"; } }
+      public override string TypeName { get { return "Procedure.focalDevice"; } }
 
       /// <summary>
       /// Kind of change to device
diff --git a/src/Hl7.Fhir.R4/Model/Generated/Provenance.cs b/src/Hl7.Fhir.R4/Model/Generated/Provenance.cs
index 44742f7554..bf066ff044 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/Provenance.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/Provenance.cs
@@ -109,14 +109,13 @@ public enum ProvenanceEntityRole
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Provenance#Agent")]
-    [BackboneType("Provenance.agent")]
+    [FhirType("Provenance.agent", IsBackboneType=true)]
     public partial class AgentComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Provenance#Agent"; } }
+      public override string TypeName { get { return "Provenance.agent"; } }
 
       /// <summary>
       /// How the agent participated
@@ -315,14 +314,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Provenance#Entity")]
-    [BackboneType("Provenance.entity")]
+    [FhirType("Provenance.entity", IsBackboneType=true)]
     public partial class EntityComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Provenance#Entity"; } }
+      public override string TypeName { get { return "Provenance.entity"; } }
 
       /// <summary>
       /// derivation | revision | quotation | source | removal
diff --git a/src/Hl7.Fhir.R4/Model/Generated/Questionnaire.cs b/src/Hl7.Fhir.R4/Model/Generated/Questionnaire.cs
index 0a27265338..2d05b408bb 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/Questionnaire.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/Questionnaire.cs
@@ -248,14 +248,13 @@ public enum QuestionnaireItemOperator
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Questionnaire#Item")]
-    [BackboneType("Questionnaire.item")]
+    [FhirType("Questionnaire.item", IsBackboneType=true)]
     public partial class ItemComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Questionnaire#Item"; } }
+      public override string TypeName { get { return "Questionnaire.item"; } }
 
       /// <summary>
       /// Unique id for item in questionnaire
@@ -960,14 +959,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Questionnaire#EnableWhen")]
-    [BackboneType("Questionnaire.item.enableWhen")]
+    [FhirType("Questionnaire.item.enableWhen", IsBackboneType=true)]
     public partial class EnableWhenComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Questionnaire#EnableWhen"; } }
+      public override string TypeName { get { return "Questionnaire.item.enableWhen"; } }
 
       /// <summary>
       /// Question that determines whether item is enabled
@@ -1182,14 +1180,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Questionnaire#AnswerOption")]
-    [BackboneType("Questionnaire.item.answerOption")]
+    [FhirType("Questionnaire.item.answerOption", IsBackboneType=true)]
     public partial class AnswerOptionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Questionnaire#AnswerOption"; } }
+      public override string TypeName { get { return "Questionnaire.item.answerOption"; } }
 
       /// <summary>
       /// Answer value
@@ -1357,14 +1354,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Questionnaire#Initial")]
-    [BackboneType("Questionnaire.item.initial")]
+    [FhirType("Questionnaire.item.initial", IsBackboneType=true)]
     public partial class InitialComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Questionnaire#Initial"; } }
+      public override string TypeName { get { return "Questionnaire.item.initial"; } }
 
       /// <summary>
       /// Actual value for initializing the question
diff --git a/src/Hl7.Fhir.R4/Model/Generated/QuestionnaireResponse.cs b/src/Hl7.Fhir.R4/Model/Generated/QuestionnaireResponse.cs
index 44a26c5dc5..824284d9bd 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/QuestionnaireResponse.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/QuestionnaireResponse.cs
@@ -109,14 +109,13 @@ public enum QuestionnaireResponseStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("QuestionnaireResponse#Item")]
-    [BackboneType("QuestionnaireResponse.item")]
+    [FhirType("QuestionnaireResponse.item", IsBackboneType=true)]
     public partial class ItemComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "QuestionnaireResponse#Item"; } }
+      public override string TypeName { get { return "QuestionnaireResponse.item"; } }
 
       /// <summary>
       /// Pointer to specific item from Questionnaire
@@ -393,14 +392,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("QuestionnaireResponse#Answer")]
-    [BackboneType("QuestionnaireResponse.item.answer")]
+    [FhirType("QuestionnaireResponse.item.answer", IsBackboneType=true)]
     public partial class AnswerComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "QuestionnaireResponse#Answer"; } }
+      public override string TypeName { get { return "QuestionnaireResponse.item.answer"; } }
 
       /// <summary>
       /// Single-valued answer to the question
diff --git a/src/Hl7.Fhir.R4/Model/Generated/RelatedPerson.cs b/src/Hl7.Fhir.R4/Model/Generated/RelatedPerson.cs
index 867f39a940..71b6fec83f 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/RelatedPerson.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/RelatedPerson.cs
@@ -67,14 +67,13 @@ public partial class RelatedPerson : Hl7.Fhir.Model.DomainResource, IIdentifiabl
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("RelatedPerson#Communication")]
-    [BackboneType("RelatedPerson.communication")]
+    [FhirType("RelatedPerson.communication", IsBackboneType=true)]
     public partial class CommunicationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "RelatedPerson#Communication"; } }
+      public override string TypeName { get { return "RelatedPerson.communication"; } }
 
       /// <summary>
       /// The language which can be used to communicate with the patient about his or her health
diff --git a/src/Hl7.Fhir.R4/Model/Generated/RequestGroup.cs b/src/Hl7.Fhir.R4/Model/Generated/RequestGroup.cs
index 844336629f..1029fc0365 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/RequestGroup.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/RequestGroup.cs
@@ -67,14 +67,13 @@ public partial class RequestGroup : Hl7.Fhir.Model.DomainResource, IIdentifiable
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("RequestGroup#Action")]
-    [BackboneType("RequestGroup.action")]
+    [FhirType("RequestGroup.action", IsBackboneType=true)]
     public partial class ActionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "RequestGroup#Action"; } }
+      public override string TypeName { get { return "RequestGroup.action"; } }
 
       /// <summary>
       /// User-visible prefix for the action (e.g. 1. or A.)
@@ -849,14 +848,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("RequestGroup#Condition")]
-    [BackboneType("RequestGroup.action.condition")]
+    [FhirType("RequestGroup.action.condition", IsBackboneType=true)]
     public partial class ConditionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "RequestGroup#Condition"; } }
+      public override string TypeName { get { return "RequestGroup.action.condition"; } }
 
       /// <summary>
       /// applicability | start | stop
@@ -1021,14 +1019,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("RequestGroup#RelatedAction")]
-    [BackboneType("RequestGroup.action.relatedAction")]
+    [FhirType("RequestGroup.action.relatedAction", IsBackboneType=true)]
     public partial class RelatedActionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "RequestGroup#RelatedAction"; } }
+      public override string TypeName { get { return "RequestGroup.action.relatedAction"; } }
 
       /// <summary>
       /// What action this is related to
diff --git a/src/Hl7.Fhir.R4/Model/Generated/ResearchElementDefinition.cs b/src/Hl7.Fhir.R4/Model/Generated/ResearchElementDefinition.cs
index 7a0753436b..a1c52585b5 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/ResearchElementDefinition.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/ResearchElementDefinition.cs
@@ -97,14 +97,13 @@ public enum ResearchElementType
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ResearchElementDefinition#Characteristic")]
-    [BackboneType("ResearchElementDefinition.characteristic")]
+    [FhirType("ResearchElementDefinition.characteristic", IsBackboneType=true)]
     public partial class CharacteristicComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ResearchElementDefinition#Characteristic"; } }
+      public override string TypeName { get { return "ResearchElementDefinition.characteristic"; } }
 
       /// <summary>
       /// What code or expression defines members?
diff --git a/src/Hl7.Fhir.R4/Model/Generated/ResearchStudy.cs b/src/Hl7.Fhir.R4/Model/Generated/ResearchStudy.cs
index efa565c616..6585f1292b 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/ResearchStudy.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/ResearchStudy.cs
@@ -144,14 +144,13 @@ public enum ResearchStudyStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ResearchStudy#Arm")]
-    [BackboneType("ResearchStudy.arm")]
+    [FhirType("ResearchStudy.arm", IsBackboneType=true)]
     public partial class ArmComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ResearchStudy#Arm"; } }
+      public override string TypeName { get { return "ResearchStudy.arm"; } }
 
       /// <summary>
       /// Label for study arm
@@ -357,14 +356,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ResearchStudy#Objective")]
-    [BackboneType("ResearchStudy.objective")]
+    [FhirType("ResearchStudy.objective", IsBackboneType=true)]
     public partial class ObjectiveComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ResearchStudy#Objective"; } }
+      public override string TypeName { get { return "ResearchStudy.objective"; } }
 
       /// <summary>
       /// Label for the objective
diff --git a/src/Hl7.Fhir.R4/Model/Generated/RiskAssessment.cs b/src/Hl7.Fhir.R4/Model/Generated/RiskAssessment.cs
index 75b6465c2a..e8c81c16c5 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/RiskAssessment.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/RiskAssessment.cs
@@ -68,14 +68,13 @@ public partial class RiskAssessment : Hl7.Fhir.Model.DomainResource, IIdentifiab
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("RiskAssessment#Prediction")]
-    [BackboneType("RiskAssessment.prediction")]
+    [FhirType("RiskAssessment.prediction", IsBackboneType=true)]
     public partial class PredictionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "RiskAssessment#Prediction"; } }
+      public override string TypeName { get { return "RiskAssessment.prediction"; } }
 
       /// <summary>
       /// Possible outcome for the subject
diff --git a/src/Hl7.Fhir.R4/Model/Generated/RiskEvidenceSynthesis.cs b/src/Hl7.Fhir.R4/Model/Generated/RiskEvidenceSynthesis.cs
index 03d23c9340..6cd2876fe6 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/RiskEvidenceSynthesis.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/RiskEvidenceSynthesis.cs
@@ -67,14 +67,13 @@ public partial class RiskEvidenceSynthesis : Hl7.Fhir.Model.DomainResource, IIde
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("RiskEvidenceSynthesis#SampleSize")]
-    [BackboneType("RiskEvidenceSynthesis.sampleSize")]
+    [FhirType("RiskEvidenceSynthesis.sampleSize", IsBackboneType=true)]
     public partial class SampleSizeComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "RiskEvidenceSynthesis#SampleSize"; } }
+      public override string TypeName { get { return "RiskEvidenceSynthesis.sampleSize"; } }
 
       /// <summary>
       /// Description of sample size
@@ -297,14 +296,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("RiskEvidenceSynthesis#RiskEstimate")]
-    [BackboneType("RiskEvidenceSynthesis.riskEstimate")]
+    [FhirType("RiskEvidenceSynthesis.riskEstimate", IsBackboneType=true)]
     public partial class RiskEstimateComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "RiskEvidenceSynthesis#RiskEstimate"; } }
+      public override string TypeName { get { return "RiskEvidenceSynthesis.riskEstimate"; } }
 
       /// <summary>
       /// Description of risk estimate
@@ -648,14 +646,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("RiskEvidenceSynthesis#PrecisionEstimate")]
-    [BackboneType("RiskEvidenceSynthesis.riskEstimate.precisionEstimate")]
+    [FhirType("RiskEvidenceSynthesis.riskEstimate.precisionEstimate", IsBackboneType=true)]
     public partial class PrecisionEstimateComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "RiskEvidenceSynthesis#PrecisionEstimate"; } }
+      public override string TypeName { get { return "RiskEvidenceSynthesis.riskEstimate.precisionEstimate"; } }
 
       /// <summary>
       /// Type of precision estimate
@@ -904,14 +901,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("RiskEvidenceSynthesis#Certainty")]
-    [BackboneType("RiskEvidenceSynthesis.certainty")]
+    [FhirType("RiskEvidenceSynthesis.certainty", IsBackboneType=true)]
     public partial class CertaintyComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "RiskEvidenceSynthesis#Certainty"; } }
+      public override string TypeName { get { return "RiskEvidenceSynthesis.certainty"; } }
 
       /// <summary>
       /// Certainty rating
@@ -1084,14 +1080,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("RiskEvidenceSynthesis#CertaintySubcomponent")]
-    [BackboneType("RiskEvidenceSynthesis.certainty.certaintySubcomponent")]
+    [FhirType("RiskEvidenceSynthesis.certainty.certaintySubcomponent", IsBackboneType=true)]
     public partial class CertaintySubcomponentComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "RiskEvidenceSynthesis#CertaintySubcomponent"; } }
+      public override string TypeName { get { return "RiskEvidenceSynthesis.certainty.certaintySubcomponent"; } }
 
       /// <summary>
       /// Type of subcomponent of certainty rating
diff --git a/src/Hl7.Fhir.R4/Model/Generated/SearchParameter.cs b/src/Hl7.Fhir.R4/Model/Generated/SearchParameter.cs
index f51b70c875..9c9b63db38 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/SearchParameter.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/SearchParameter.cs
@@ -254,14 +254,13 @@ public enum SearchModifierCode
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("SearchParameter#Component")]
-    [BackboneType("SearchParameter.component")]
+    [FhirType("SearchParameter.component", IsBackboneType=true)]
     public partial class ComponentComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "SearchParameter#Component"; } }
+      public override string TypeName { get { return "SearchParameter.component"; } }
 
       /// <summary>
       /// Defines how the part works
diff --git a/src/Hl7.Fhir.R4/Model/Generated/Specimen.cs b/src/Hl7.Fhir.R4/Model/Generated/Specimen.cs
index fb50d2acea..65a5df9e61 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/Specimen.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/Specimen.cs
@@ -101,14 +101,13 @@ public enum SpecimenStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Specimen#Collection")]
-    [BackboneType("Specimen.collection")]
+    [FhirType("Specimen.collection", IsBackboneType=true)]
     public partial class CollectionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Specimen#Collection"; } }
+      public override string TypeName { get { return "Specimen.collection"; } }
 
       /// <summary>
       /// Who collected the specimen
@@ -386,14 +385,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Specimen#Processing")]
-    [BackboneType("Specimen.processing")]
+    [FhirType("Specimen.processing", IsBackboneType=true)]
     public partial class ProcessingComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Specimen#Processing"; } }
+      public override string TypeName { get { return "Specimen.processing"; } }
 
       /// <summary>
       /// Textual description of procedure
@@ -611,14 +609,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Specimen#Container")]
-    [BackboneType("Specimen.container")]
+    [FhirType("Specimen.container", IsBackboneType=true)]
     public partial class ContainerComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Specimen#Container"; } }
+      public override string TypeName { get { return "Specimen.container"; } }
 
       /// <summary>
       /// Id for the container
diff --git a/src/Hl7.Fhir.R4/Model/Generated/SpecimenDefinition.cs b/src/Hl7.Fhir.R4/Model/Generated/SpecimenDefinition.cs
index 54b9a77263..157b8ba93a 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/SpecimenDefinition.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/SpecimenDefinition.cs
@@ -89,14 +89,13 @@ public enum SpecimenContainedPreference
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("SpecimenDefinition#TypeTested")]
-    [BackboneType("SpecimenDefinition.typeTested")]
+    [FhirType("SpecimenDefinition.typeTested", IsBackboneType=true)]
     public partial class TypeTestedComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "SpecimenDefinition#TypeTested"; } }
+      public override string TypeName { get { return "SpecimenDefinition.typeTested"; } }
 
       /// <summary>
       /// Primary or secondary specimen
@@ -448,14 +447,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SpecimenDefinition#Container")]
-    [BackboneType("SpecimenDefinition.typeTested.container")]
+    [FhirType("SpecimenDefinition.typeTested.container", IsBackboneType=true)]
     public partial class ContainerComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "SpecimenDefinition#Container"; } }
+      public override string TypeName { get { return "SpecimenDefinition.typeTested.container"; } }
 
       /// <summary>
       /// Container material
@@ -791,14 +789,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("SpecimenDefinition#Additive")]
-    [BackboneType("SpecimenDefinition.typeTested.container.additive")]
+    [FhirType("SpecimenDefinition.typeTested.container.additive", IsBackboneType=true)]
     public partial class AdditiveComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "SpecimenDefinition#Additive"; } }
+      public override string TypeName { get { return "SpecimenDefinition.typeTested.container.additive"; } }
 
       /// <summary>
       /// Additive associated with container
@@ -922,14 +919,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("SpecimenDefinition#Handling")]
-    [BackboneType("SpecimenDefinition.typeTested.handling")]
+    [FhirType("SpecimenDefinition.typeTested.handling", IsBackboneType=true)]
     public partial class HandlingComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "SpecimenDefinition#Handling"; } }
+      public override string TypeName { get { return "SpecimenDefinition.typeTested.handling"; } }
 
       /// <summary>
       /// Temperature qualifier
diff --git a/src/Hl7.Fhir.R4/Model/Generated/StructureMap.cs b/src/Hl7.Fhir.R4/Model/Generated/StructureMap.cs
index 5117090ef5..c90eb80d97 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/StructureMap.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/StructureMap.cs
@@ -357,14 +357,13 @@ public enum StructureMapTransform
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("StructureMap#Structure")]
-    [BackboneType("StructureMap.structure")]
+    [FhirType("StructureMap.structure", IsBackboneType=true)]
     public partial class StructureComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "StructureMap#Structure"; } }
+      public override string TypeName { get { return "StructureMap.structure"; } }
 
       /// <summary>
       /// Canonical reference to structure definition
@@ -634,14 +633,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("StructureMap#Group")]
-    [BackboneType("StructureMap.group")]
+    [FhirType("StructureMap.group", IsBackboneType=true)]
     public partial class GroupComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "StructureMap#Group"; } }
+      public override string TypeName { get { return "StructureMap.group"; } }
 
       /// <summary>
       /// Human-readable label
@@ -964,14 +962,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("StructureMap#Input")]
-    [BackboneType("StructureMap.group.input")]
+    [FhirType("StructureMap.group.input", IsBackboneType=true)]
     public partial class InputComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "StructureMap#Input"; } }
+      public override string TypeName { get { return "StructureMap.group.input"; } }
 
       /// <summary>
       /// Name for this instance of data
@@ -1238,14 +1235,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("StructureMap#Rule")]
-    [BackboneType("StructureMap.group.rule")]
+    [FhirType("StructureMap.group.rule", IsBackboneType=true)]
     public partial class RuleComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "StructureMap#Rule"; } }
+      public override string TypeName { get { return "StructureMap.group.rule"; } }
 
       /// <summary>
       /// Name of the rule for internal references
@@ -1527,14 +1523,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("StructureMap#Source")]
-    [BackboneType("StructureMap.group.rule.source")]
+    [FhirType("StructureMap.group.rule.source", IsBackboneType=true)]
     public partial class SourceComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "StructureMap#Source"; } }
+      public override string TypeName { get { return "StructureMap.group.rule.source"; } }
 
       /// <summary>
       /// Type or variable this rule applies to
@@ -2085,14 +2080,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("StructureMap#Target")]
-    [BackboneType("StructureMap.group.rule.target")]
+    [FhirType("StructureMap.group.rule.target", IsBackboneType=true)]
     public partial class TargetComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "StructureMap#Target"; } }
+      public override string TypeName { get { return "StructureMap.group.rule.target"; } }
 
       /// <summary>
       /// Type or variable this rule applies to
@@ -2517,14 +2511,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("StructureMap#Parameter")]
-    [BackboneType("StructureMap.group.rule.target.parameter")]
+    [FhirType("StructureMap.group.rule.target.parameter", IsBackboneType=true)]
     public partial class ParameterComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "StructureMap#Parameter"; } }
+      public override string TypeName { get { return "StructureMap.group.rule.target.parameter"; } }
 
       /// <summary>
       /// Parameter value - variable or literal
@@ -2643,14 +2636,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("StructureMap#Dependent")]
-    [BackboneType("StructureMap.group.rule.dependent")]
+    [FhirType("StructureMap.group.rule.dependent", IsBackboneType=true)]
     public partial class DependentComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "StructureMap#Dependent"; } }
+      public override string TypeName { get { return "StructureMap.group.rule.dependent"; } }
 
       /// <summary>
       /// Name of a rule or group to apply
diff --git a/src/Hl7.Fhir.R4/Model/Generated/Subscription.cs b/src/Hl7.Fhir.R4/Model/Generated/Subscription.cs
index 59edabdef8..d2afd1b39e 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/Subscription.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/Subscription.cs
@@ -141,14 +141,13 @@ public enum SubscriptionChannelType
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Subscription#Channel")]
-    [BackboneType("Subscription.channel")]
+    [FhirType("Subscription.channel", IsBackboneType=true)]
     public partial class ChannelComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Subscription#Channel"; } }
+      public override string TypeName { get { return "Subscription.channel"; } }
 
       /// <summary>
       /// rest-hook | websocket | email | sms | message
diff --git a/src/Hl7.Fhir.R4/Model/Generated/Substance.cs b/src/Hl7.Fhir.R4/Model/Generated/Substance.cs
index a7ab422032..d386e66e3e 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/Substance.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/Substance.cs
@@ -92,14 +92,13 @@ public enum FHIRSubstanceStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Substance#Instance")]
-    [BackboneType("Substance.instance")]
+    [FhirType("Substance.instance", IsBackboneType=true)]
     public partial class InstanceComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Substance#Instance"; } }
+      public override string TypeName { get { return "Substance.instance"; } }
 
       /// <summary>
       /// Identifier of the package/container
@@ -286,14 +285,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Substance#Ingredient")]
-    [BackboneType("Substance.ingredient")]
+    [FhirType("Substance.ingredient", IsBackboneType=true)]
     public partial class IngredientComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Substance#Ingredient"; } }
+      public override string TypeName { get { return "Substance.ingredient"; } }
 
       /// <summary>
       /// Optional amount (concentration)
diff --git a/src/Hl7.Fhir.R4/Model/Generated/SubstanceAmount.cs b/src/Hl7.Fhir.R4/Model/Generated/SubstanceAmount.cs
index 5d01f2291b..2cccf107fa 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/SubstanceAmount.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/SubstanceAmount.cs
@@ -61,14 +61,13 @@ public partial class SubstanceAmount : Hl7.Fhir.Model.BackboneType
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SubstanceAmount#ReferenceRange")]
-    [BackboneType("SubstanceAmount.referenceRange")]
+    [FhirType("SubstanceAmount.referenceRange", IsBackboneType=true)]
     public partial class ReferenceRangeComponent : Hl7.Fhir.Model.Element
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "SubstanceAmount#ReferenceRange"; } }
+      public override string TypeName { get { return "SubstanceAmount.referenceRange"; } }
 
       /// <summary>
       /// Lower limit possible or expected
diff --git a/src/Hl7.Fhir.R4/Model/Generated/SubstanceNucleicAcid.cs b/src/Hl7.Fhir.R4/Model/Generated/SubstanceNucleicAcid.cs
index d74fa4f9a7..97fef2e004 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/SubstanceNucleicAcid.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/SubstanceNucleicAcid.cs
@@ -61,14 +61,13 @@ public partial class SubstanceNucleicAcid : Hl7.Fhir.Model.DomainResource
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SubstanceNucleicAcid#Subunit")]
-    [BackboneType("SubstanceNucleicAcid.subunit")]
+    [FhirType("SubstanceNucleicAcid.subunit", IsBackboneType=true)]
     public partial class SubunitComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "SubstanceNucleicAcid#Subunit"; } }
+      public override string TypeName { get { return "SubstanceNucleicAcid.subunit"; } }
 
       /// <summary>
       /// Index of linear sequences of nucleic acids in order of decreasing length. Sequences of the same length will be ordered by molecular weight. Subunits that have identical sequences will be repeated and have sequential subscripts
@@ -415,14 +414,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SubstanceNucleicAcid#Linkage")]
-    [BackboneType("SubstanceNucleicAcid.subunit.linkage")]
+    [FhirType("SubstanceNucleicAcid.subunit.linkage", IsBackboneType=true)]
     public partial class LinkageComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "SubstanceNucleicAcid#Linkage"; } }
+      public override string TypeName { get { return "SubstanceNucleicAcid.subunit.linkage"; } }
 
       /// <summary>
       /// The entity that links the sugar residues together should also be captured for nearly all naturally occurring nucleic acid the linkage is a phosphate group. For many synthetic oligonucleotides phosphorothioate linkages are often seen. Linkage connectivity is assumed to be 3’-5’. If the linkage is either 3’-3’ or 5’-5’ this should be specified
@@ -667,14 +665,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SubstanceNucleicAcid#Sugar")]
-    [BackboneType("SubstanceNucleicAcid.subunit.sugar")]
+    [FhirType("SubstanceNucleicAcid.subunit.sugar", IsBackboneType=true)]
     public partial class SugarComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "SubstanceNucleicAcid#Sugar"; } }
+      public override string TypeName { get { return "SubstanceNucleicAcid.subunit.sugar"; } }
 
       /// <summary>
       /// The Substance ID of the sugar or sugar-like component that make up the nucleotide
diff --git a/src/Hl7.Fhir.R4/Model/Generated/SubstancePolymer.cs b/src/Hl7.Fhir.R4/Model/Generated/SubstancePolymer.cs
index 82a57c541e..b6366ac49d 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/SubstancePolymer.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/SubstancePolymer.cs
@@ -61,14 +61,13 @@ public partial class SubstancePolymer : Hl7.Fhir.Model.DomainResource
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SubstancePolymer#MonomerSet")]
-    [BackboneType("SubstancePolymer.monomerSet")]
+    [FhirType("SubstancePolymer.monomerSet", IsBackboneType=true)]
     public partial class MonomerSetComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "SubstancePolymer#MonomerSet"; } }
+      public override string TypeName { get { return "SubstancePolymer.monomerSet"; } }
 
       /// <summary>
       /// Todo
@@ -210,14 +209,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SubstancePolymer#StartingMaterial")]
-    [BackboneType("SubstancePolymer.monomerSet.startingMaterial")]
+    [FhirType("SubstancePolymer.monomerSet.startingMaterial", IsBackboneType=true)]
     public partial class StartingMaterialComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "SubstancePolymer#StartingMaterial"; } }
+      public override string TypeName { get { return "SubstancePolymer.monomerSet.startingMaterial"; } }
 
       /// <summary>
       /// Todo
@@ -426,14 +424,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SubstancePolymer#Repeat")]
-    [BackboneType("SubstancePolymer.repeat")]
+    [FhirType("SubstancePolymer.repeat", IsBackboneType=true)]
     public partial class RepeatComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "SubstancePolymer#Repeat"; } }
+      public override string TypeName { get { return "SubstancePolymer.repeat"; } }
 
       /// <summary>
       /// Todo
@@ -661,14 +658,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SubstancePolymer#RepeatUnit")]
-    [BackboneType("SubstancePolymer.repeat.repeatUnit")]
+    [FhirType("SubstancePolymer.repeat.repeatUnit", IsBackboneType=true)]
     public partial class RepeatUnitComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "SubstancePolymer#RepeatUnit"; } }
+      public override string TypeName { get { return "SubstancePolymer.repeat.repeatUnit"; } }
 
       /// <summary>
       /// Todo
@@ -904,14 +900,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SubstancePolymer#DegreeOfPolymerisation")]
-    [BackboneType("SubstancePolymer.repeat.repeatUnit.degreeOfPolymerisation")]
+    [FhirType("SubstancePolymer.repeat.repeatUnit.degreeOfPolymerisation", IsBackboneType=true)]
     public partial class DegreeOfPolymerisationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "SubstancePolymer#DegreeOfPolymerisation"; } }
+      public override string TypeName { get { return "SubstancePolymer.repeat.repeatUnit.degreeOfPolymerisation"; } }
 
       /// <summary>
       /// Todo
@@ -1052,14 +1047,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SubstancePolymer#StructuralRepresentation")]
-    [BackboneType("SubstancePolymer.repeat.repeatUnit.structuralRepresentation")]
+    [FhirType("SubstancePolymer.repeat.repeatUnit.structuralRepresentation", IsBackboneType=true)]
     public partial class StructuralRepresentationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "SubstancePolymer#StructuralRepresentation"; } }
+      public override string TypeName { get { return "SubstancePolymer.repeat.repeatUnit.structuralRepresentation"; } }
 
       /// <summary>
       /// Todo
diff --git a/src/Hl7.Fhir.R4/Model/Generated/SubstanceProtein.cs b/src/Hl7.Fhir.R4/Model/Generated/SubstanceProtein.cs
index 5b6dc53e17..f093f7322f 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/SubstanceProtein.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/SubstanceProtein.cs
@@ -61,14 +61,13 @@ public partial class SubstanceProtein : Hl7.Fhir.Model.DomainResource
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SubstanceProtein#Subunit")]
-    [BackboneType("SubstanceProtein.subunit")]
+    [FhirType("SubstanceProtein.subunit", IsBackboneType=true)]
     public partial class SubunitComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "SubstanceProtein#Subunit"; } }
+      public override string TypeName { get { return "SubstanceProtein.subunit"; } }
 
       /// <summary>
       /// Index of primary sequences of amino acids linked through peptide bonds in order of decreasing length. Sequences of the same length will be ordered by molecular weight. Subunits that have identical sequences will be repeated and have sequential subscripts
diff --git a/src/Hl7.Fhir.R4/Model/Generated/SubstanceReferenceInformation.cs b/src/Hl7.Fhir.R4/Model/Generated/SubstanceReferenceInformation.cs
index 81ceed5b90..bfc69a78e2 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/SubstanceReferenceInformation.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/SubstanceReferenceInformation.cs
@@ -61,14 +61,13 @@ public partial class SubstanceReferenceInformation : Hl7.Fhir.Model.DomainResour
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SubstanceReferenceInformation#Gene")]
-    [BackboneType("SubstanceReferenceInformation.gene")]
+    [FhirType("SubstanceReferenceInformation.gene", IsBackboneType=true)]
     public partial class GeneComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "SubstanceReferenceInformation#Gene"; } }
+      public override string TypeName { get { return "SubstanceReferenceInformation.gene"; } }
 
       /// <summary>
       /// Todo
@@ -237,14 +236,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SubstanceReferenceInformation#GeneElement")]
-    [BackboneType("SubstanceReferenceInformation.geneElement")]
+    [FhirType("SubstanceReferenceInformation.geneElement", IsBackboneType=true)]
     public partial class GeneElementComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "SubstanceReferenceInformation#GeneElement"; } }
+      public override string TypeName { get { return "SubstanceReferenceInformation.geneElement"; } }
 
       /// <summary>
       /// Todo
@@ -413,14 +411,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SubstanceReferenceInformation#Classification")]
-    [BackboneType("SubstanceReferenceInformation.classification")]
+    [FhirType("SubstanceReferenceInformation.classification", IsBackboneType=true)]
     public partial class ClassificationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "SubstanceReferenceInformation#Classification"; } }
+      public override string TypeName { get { return "SubstanceReferenceInformation.classification"; } }
 
       /// <summary>
       /// Todo
@@ -615,14 +612,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SubstanceReferenceInformation#Target")]
-    [BackboneType("SubstanceReferenceInformation.target")]
+    [FhirType("SubstanceReferenceInformation.target", IsBackboneType=true)]
     public partial class TargetComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "SubstanceReferenceInformation#Target"; } }
+      public override string TypeName { get { return "SubstanceReferenceInformation.target"; } }
 
       /// <summary>
       /// Todo
diff --git a/src/Hl7.Fhir.R4/Model/Generated/SubstanceSourceMaterial.cs b/src/Hl7.Fhir.R4/Model/Generated/SubstanceSourceMaterial.cs
index 9b17827d14..b78fa85ac0 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/SubstanceSourceMaterial.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/SubstanceSourceMaterial.cs
@@ -61,14 +61,13 @@ public partial class SubstanceSourceMaterial : Hl7.Fhir.Model.DomainResource
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SubstanceSourceMaterial#FractionDescription")]
-    [BackboneType("SubstanceSourceMaterial.fractionDescription")]
+    [FhirType("SubstanceSourceMaterial.fractionDescription", IsBackboneType=true)]
     public partial class FractionDescriptionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "SubstanceSourceMaterial#FractionDescription"; } }
+      public override string TypeName { get { return "SubstanceSourceMaterial.fractionDescription"; } }
 
       /// <summary>
       /// This element is capturing information about the fraction of a plant part, or human plasma for fractionation
@@ -227,14 +226,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SubstanceSourceMaterial#Organism")]
-    [BackboneType("SubstanceSourceMaterial.organism")]
+    [FhirType("SubstanceSourceMaterial.organism", IsBackboneType=true)]
     public partial class OrganismComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "SubstanceSourceMaterial#Organism"; } }
+      public override string TypeName { get { return "SubstanceSourceMaterial.organism"; } }
 
       /// <summary>
       /// The family of an organism shall be specified
@@ -544,14 +542,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SubstanceSourceMaterial#Author")]
-    [BackboneType("SubstanceSourceMaterial.organism.author")]
+    [FhirType("SubstanceSourceMaterial.organism.author", IsBackboneType=true)]
     public partial class AuthorComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "SubstanceSourceMaterial#Author"; } }
+      public override string TypeName { get { return "SubstanceSourceMaterial.organism.author"; } }
 
       /// <summary>
       /// The type of author of an organism species shall be specified. The parenthetical author of an organism species refers to the first author who published the plant/animal name (of any rank). The primary author of an organism species refers to the first author(s), who validly published the plant/animal name
@@ -710,14 +707,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SubstanceSourceMaterial#Hybrid")]
-    [BackboneType("SubstanceSourceMaterial.organism.hybrid")]
+    [FhirType("SubstanceSourceMaterial.organism.hybrid", IsBackboneType=true)]
     public partial class HybridComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "SubstanceSourceMaterial#Hybrid"; } }
+      public override string TypeName { get { return "SubstanceSourceMaterial.organism.hybrid"; } }
 
       /// <summary>
       /// The identifier of the maternal species constituting the hybrid organism shall be specified based on a controlled vocabulary. For plants, the parents aren’t always known, and it is unlikely that it will be known which is maternal and which is paternal
@@ -1005,14 +1001,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SubstanceSourceMaterial#OrganismGeneral")]
-    [BackboneType("SubstanceSourceMaterial.organism.organismGeneral")]
+    [FhirType("SubstanceSourceMaterial.organism.organismGeneral", IsBackboneType=true)]
     public partial class OrganismGeneralComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "SubstanceSourceMaterial#OrganismGeneral"; } }
+      public override string TypeName { get { return "SubstanceSourceMaterial.organism.organismGeneral"; } }
 
       /// <summary>
       /// The kingdom of an organism shall be specified
@@ -1203,14 +1198,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SubstanceSourceMaterial#PartDescription")]
-    [BackboneType("SubstanceSourceMaterial.partDescription")]
+    [FhirType("SubstanceSourceMaterial.partDescription", IsBackboneType=true)]
     public partial class PartDescriptionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "SubstanceSourceMaterial#PartDescription"; } }
+      public override string TypeName { get { return "SubstanceSourceMaterial.partDescription"; } }
 
       /// <summary>
       /// Entity of anatomical origin of source material within an organism
diff --git a/src/Hl7.Fhir.R4/Model/Generated/SubstanceSpecification.cs b/src/Hl7.Fhir.R4/Model/Generated/SubstanceSpecification.cs
index a82c0f7cd2..e7ea4d3aeb 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/SubstanceSpecification.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/SubstanceSpecification.cs
@@ -61,14 +61,13 @@ public partial class SubstanceSpecification : Hl7.Fhir.Model.DomainResource, IId
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SubstanceSpecification#Moiety")]
-    [BackboneType("SubstanceSpecification.moiety")]
+    [FhirType("SubstanceSpecification.moiety", IsBackboneType=true)]
     public partial class MoietyComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "SubstanceSpecification#Moiety"; } }
+      public override string TypeName { get { return "SubstanceSpecification.moiety"; } }
 
       /// <summary>
       /// Role that the moiety is playing
@@ -372,14 +371,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SubstanceSpecification#Property")]
-    [BackboneType("SubstanceSpecification.property")]
+    [FhirType("SubstanceSpecification.property", IsBackboneType=true)]
     public partial class PropertyComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "SubstanceSpecification#Property"; } }
+      public override string TypeName { get { return "SubstanceSpecification.property"; } }
 
       /// <summary>
       /// A category for this property, e.g. Physical, Chemical, Enzymatic
@@ -618,14 +616,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SubstanceSpecification#Structure")]
-    [BackboneType("SubstanceSpecification.structure")]
+    [FhirType("SubstanceSpecification.structure", IsBackboneType=true)]
     public partial class StructureComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "SubstanceSpecification#Structure"; } }
+      public override string TypeName { get { return "SubstanceSpecification.structure"; } }
 
       /// <summary>
       /// Stereochemistry type
@@ -957,14 +954,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SubstanceSpecification#Isotope")]
-    [BackboneType("SubstanceSpecification.structure.isotope")]
+    [FhirType("SubstanceSpecification.structure.isotope", IsBackboneType=true)]
     public partial class IsotopeComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "SubstanceSpecification#Isotope"; } }
+      public override string TypeName { get { return "SubstanceSpecification.structure.isotope"; } }
 
       /// <summary>
       /// Substance identifier for each non-natural or radioisotope
@@ -1180,14 +1176,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SubstanceSpecification#MolecularWeight")]
-    [BackboneType("SubstanceSpecification.structure.isotope.molecularWeight")]
+    [FhirType("SubstanceSpecification.structure.isotope.molecularWeight", IsBackboneType=true)]
     public partial class MolecularWeightComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "SubstanceSpecification#MolecularWeight"; } }
+      public override string TypeName { get { return "SubstanceSpecification.structure.isotope.molecularWeight"; } }
 
       /// <summary>
       /// The method by which the molecular weight was determined
@@ -1353,14 +1348,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SubstanceSpecification#Representation")]
-    [BackboneType("SubstanceSpecification.structure.representation")]
+    [FhirType("SubstanceSpecification.structure.representation", IsBackboneType=true)]
     public partial class RepresentationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "SubstanceSpecification#Representation"; } }
+      public override string TypeName { get { return "SubstanceSpecification.structure.representation"; } }
 
       /// <summary>
       /// The type of structure (e.g. Full, Partial, Representative)
@@ -1544,14 +1538,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SubstanceSpecification#Code")]
-    [BackboneType("SubstanceSpecification.code")]
+    [FhirType("SubstanceSpecification.code", IsBackboneType=true)]
     public partial class CodeComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "SubstanceSpecification#Code"; } }
+      public override string TypeName { get { return "SubstanceSpecification.code"; } }
 
       /// <summary>
       /// The specific code
@@ -1806,14 +1799,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SubstanceSpecification#Name")]
-    [BackboneType("SubstanceSpecification.name")]
+    [FhirType("SubstanceSpecification.name", IsBackboneType=true)]
     public partial class NameComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "SubstanceSpecification#Name"; } }
+      public override string TypeName { get { return "SubstanceSpecification.name"; } }
 
       /// <summary>
       /// The actual name
@@ -2225,14 +2217,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SubstanceSpecification#Official")]
-    [BackboneType("SubstanceSpecification.name.official")]
+    [FhirType("SubstanceSpecification.name.official", IsBackboneType=true)]
     public partial class OfficialComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "SubstanceSpecification#Official"; } }
+      public override string TypeName { get { return "SubstanceSpecification.name.official"; } }
 
       /// <summary>
       /// Which authority uses this official name
@@ -2416,14 +2407,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SubstanceSpecification#Relationship")]
-    [BackboneType("SubstanceSpecification.relationship")]
+    [FhirType("SubstanceSpecification.relationship", IsBackboneType=true)]
     public partial class RelationshipComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "SubstanceSpecification#Relationship"; } }
+      public override string TypeName { get { return "SubstanceSpecification.relationship"; } }
 
       /// <summary>
       /// A pointer to another substance, as a resource or just a representational code
diff --git a/src/Hl7.Fhir.R4/Model/Generated/SupplyDelivery.cs b/src/Hl7.Fhir.R4/Model/Generated/SupplyDelivery.cs
index 567b762dd0..a9a18ea8c4 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/SupplyDelivery.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/SupplyDelivery.cs
@@ -123,14 +123,13 @@ public enum SupplyItemType
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("SupplyDelivery#SuppliedItem")]
-    [BackboneType("SupplyDelivery.suppliedItem")]
+    [FhirType("SupplyDelivery.suppliedItem", IsBackboneType=true)]
     public partial class SuppliedItemComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "SupplyDelivery#SuppliedItem"; } }
+      public override string TypeName { get { return "SupplyDelivery.suppliedItem"; } }
 
       /// <summary>
       /// Amount dispensed
diff --git a/src/Hl7.Fhir.R4/Model/Generated/SupplyRequest.cs b/src/Hl7.Fhir.R4/Model/Generated/SupplyRequest.cs
index 38c13929d3..3d17f8933b 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/SupplyRequest.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/SupplyRequest.cs
@@ -119,14 +119,13 @@ public enum SupplyRequestStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("SupplyRequest#Parameter")]
-    [BackboneType("SupplyRequest.parameter")]
+    [FhirType("SupplyRequest.parameter", IsBackboneType=true)]
     public partial class ParameterComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "SupplyRequest#Parameter"; } }
+      public override string TypeName { get { return "SupplyRequest.parameter"; } }
 
       /// <summary>
       /// Item detail
diff --git a/src/Hl7.Fhir.R4/Model/Generated/Task.cs b/src/Hl7.Fhir.R4/Model/Generated/Task.cs
index 840486489a..19545db700 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/Task.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/Task.cs
@@ -210,14 +210,13 @@ public enum TaskIntent
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Task#Restriction")]
-    [BackboneType("Task.restriction")]
+    [FhirType("Task.restriction", IsBackboneType=true)]
     public partial class RestrictionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Task#Restriction"; } }
+      public override string TypeName { get { return "Task.restriction"; } }
 
       /// <summary>
       /// How many times to repeat
@@ -407,14 +406,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Task#Parameter")]
-    [BackboneType("Task.input")]
+    [FhirType("Task.input", IsBackboneType=true)]
     public partial class ParameterComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Task#Parameter"; } }
+      public override string TypeName { get { return "Task.input"; } }
 
       /// <summary>
       /// Label for the input
@@ -563,14 +561,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Task#Output")]
-    [BackboneType("Task.output")]
+    [FhirType("Task.output", IsBackboneType=true)]
     public partial class OutputComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Task#Output"; } }
+      public override string TypeName { get { return "Task.output"; } }
 
       /// <summary>
       /// Label for output
diff --git a/src/Hl7.Fhir.R4/Model/Generated/TerminologyCapabilities.cs b/src/Hl7.Fhir.R4/Model/Generated/TerminologyCapabilities.cs
index 0dd41b0cb6..e01dfe1684 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/TerminologyCapabilities.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/TerminologyCapabilities.cs
@@ -89,14 +89,13 @@ public enum CodeSearchSupport
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TerminologyCapabilities#Software")]
-    [BackboneType("TerminologyCapabilities.software")]
+    [FhirType("TerminologyCapabilities.software", IsBackboneType=true)]
     public partial class SoftwareComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TerminologyCapabilities#Software"; } }
+      public override string TypeName { get { return "TerminologyCapabilities.software"; } }
 
       /// <summary>
       /// A name the software is known by
@@ -277,14 +276,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TerminologyCapabilities#Implementation")]
-    [BackboneType("TerminologyCapabilities.implementation")]
+    [FhirType("TerminologyCapabilities.implementation", IsBackboneType=true)]
     public partial class ImplementationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TerminologyCapabilities#Implementation"; } }
+      public override string TypeName { get { return "TerminologyCapabilities.implementation"; } }
 
       /// <summary>
       /// Describes this specific instance
@@ -466,14 +464,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TerminologyCapabilities#CodeSystem")]
-    [BackboneType("TerminologyCapabilities.codeSystem")]
+    [FhirType("TerminologyCapabilities.codeSystem", IsBackboneType=true)]
     public partial class CodeSystemComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TerminologyCapabilities#CodeSystem"; } }
+      public override string TypeName { get { return "TerminologyCapabilities.codeSystem"; } }
 
       /// <summary>
       /// URI for the Code System
@@ -680,14 +677,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TerminologyCapabilities#Version")]
-    [BackboneType("TerminologyCapabilities.codeSystem.version")]
+    [FhirType("TerminologyCapabilities.codeSystem.version", IsBackboneType=true)]
     public partial class VersionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TerminologyCapabilities#Version"; } }
+      public override string TypeName { get { return "TerminologyCapabilities.codeSystem.version"; } }
 
       /// <summary>
       /// Version identifier for this version
@@ -1021,14 +1017,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("TerminologyCapabilities#Filter")]
-    [BackboneType("TerminologyCapabilities.codeSystem.version.filter")]
+    [FhirType("TerminologyCapabilities.codeSystem.version.filter", IsBackboneType=true)]
     public partial class FilterComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TerminologyCapabilities#Filter"; } }
+      public override string TypeName { get { return "TerminologyCapabilities.codeSystem.version.filter"; } }
 
       /// <summary>
       /// Code of the property supported
@@ -1207,14 +1202,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("TerminologyCapabilities#Expansion")]
-    [BackboneType("TerminologyCapabilities.expansion")]
+    [FhirType("TerminologyCapabilities.expansion", IsBackboneType=true)]
     public partial class ExpansionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TerminologyCapabilities#Expansion"; } }
+      public override string TypeName { get { return "TerminologyCapabilities.expansion"; } }
 
       /// <summary>
       /// Whether the server can return nested value sets
@@ -1503,14 +1497,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("TerminologyCapabilities#Parameter")]
-    [BackboneType("TerminologyCapabilities.expansion.parameter")]
+    [FhirType("TerminologyCapabilities.expansion.parameter", IsBackboneType=true)]
     public partial class ParameterComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TerminologyCapabilities#Parameter"; } }
+      public override string TypeName { get { return "TerminologyCapabilities.expansion.parameter"; } }
 
       /// <summary>
       /// Expansion Parameter name
@@ -1688,14 +1681,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("TerminologyCapabilities#ValidateCode")]
-    [BackboneType("TerminologyCapabilities.validateCode")]
+    [FhirType("TerminologyCapabilities.validateCode", IsBackboneType=true)]
     public partial class ValidateCodeComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TerminologyCapabilities#ValidateCode"; } }
+      public override string TypeName { get { return "TerminologyCapabilities.validateCode"; } }
 
       /// <summary>
       /// Whether translations are validated
@@ -1830,14 +1822,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("TerminologyCapabilities#Translation")]
-    [BackboneType("TerminologyCapabilities.translation")]
+    [FhirType("TerminologyCapabilities.translation", IsBackboneType=true)]
     public partial class TranslationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TerminologyCapabilities#Translation"; } }
+      public override string TypeName { get { return "TerminologyCapabilities.translation"; } }
 
       /// <summary>
       /// Whether the client must identify the map
@@ -1975,14 +1966,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TerminologyCapabilities#Closure")]
-    [BackboneType("TerminologyCapabilities.closure")]
+    [FhirType("TerminologyCapabilities.closure", IsBackboneType=true)]
     public partial class ClosureComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TerminologyCapabilities#Closure"; } }
+      public override string TypeName { get { return "TerminologyCapabilities.closure"; } }
 
       /// <summary>
       /// If cross-system closure is supported
diff --git a/src/Hl7.Fhir.R4/Model/Generated/TestReport.cs b/src/Hl7.Fhir.R4/Model/Generated/TestReport.cs
index 05cb1ac08b..691e9e78ea 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/TestReport.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/TestReport.cs
@@ -200,14 +200,13 @@ public enum TestReportActionResult
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("TestReport#Participant")]
-    [BackboneType("TestReport.participant")]
+    [FhirType("TestReport.participant", IsBackboneType=true)]
     public partial class ParticipantComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TestReport#Participant"; } }
+      public override string TypeName { get { return "TestReport.participant"; } }
 
       /// <summary>
       /// test-engine | client | server
@@ -431,14 +430,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("TestReport#Setup")]
-    [BackboneType("TestReport.setup")]
+    [FhirType("TestReport.setup", IsBackboneType=true)]
     public partial class SetupComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TestReport#Setup"; } }
+      public override string TypeName { get { return "TestReport.setup"; } }
 
       /// <summary>
       /// A setup operation or assert that was executed
@@ -559,14 +557,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestReport#SetupAction")]
-    [BackboneType("TestReport.setup.action")]
+    [FhirType("TestReport.setup.action", IsBackboneType=true)]
     public partial class SetupActionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TestReport#SetupAction"; } }
+      public override string TypeName { get { return "TestReport.setup.action"; } }
 
       /// <summary>
       /// The operation to perform
@@ -710,14 +707,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestReport#Operation")]
-    [BackboneType("TestReport.setup.action.operation")]
+    [FhirType("TestReport.setup.action.operation", IsBackboneType=true)]
     public partial class OperationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TestReport#Operation"; } }
+      public override string TypeName { get { return "TestReport.setup.action.operation"; } }
 
       /// <summary>
       /// pass | skip | fail | warning | error
@@ -943,14 +939,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestReport#Assert")]
-    [BackboneType("TestReport.setup.action.assert")]
+    [FhirType("TestReport.setup.action.assert", IsBackboneType=true)]
     public partial class AssertComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TestReport#Assert"; } }
+      public override string TypeName { get { return "TestReport.setup.action.assert"; } }
 
       /// <summary>
       /// pass | skip | fail | warning | error
@@ -1173,14 +1168,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("TestReport#Test")]
-    [BackboneType("TestReport.test")]
+    [FhirType("TestReport.test", IsBackboneType=true)]
     public partial class TestComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TestReport#Test"; } }
+      public override string TypeName { get { return "TestReport.test"; } }
 
       /// <summary>
       /// Tracking/logging name of this test
@@ -1387,14 +1381,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestReport#TestAction")]
-    [BackboneType("TestReport.test.action")]
+    [FhirType("TestReport.test.action", IsBackboneType=true)]
     public partial class TestActionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TestReport#TestAction"; } }
+      public override string TypeName { get { return "TestReport.test.action"; } }
 
       /// <summary>
       /// The operation performed
@@ -1538,14 +1531,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestReport#Teardown")]
-    [BackboneType("TestReport.teardown")]
+    [FhirType("TestReport.teardown", IsBackboneType=true)]
     public partial class TeardownComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TestReport#Teardown"; } }
+      public override string TypeName { get { return "TestReport.teardown"; } }
 
       /// <summary>
       /// One or more teardown operations performed
@@ -1666,14 +1658,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestReport#TeardownAction")]
-    [BackboneType("TestReport.teardown.action")]
+    [FhirType("TestReport.teardown.action", IsBackboneType=true)]
     public partial class TeardownActionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TestReport#TeardownAction"; } }
+      public override string TypeName { get { return "TestReport.teardown.action"; } }
 
       /// <summary>
       /// The teardown operation performed
diff --git a/src/Hl7.Fhir.R4/Model/Generated/TestScript.cs b/src/Hl7.Fhir.R4/Model/Generated/TestScript.cs
index 3e5cf2025f..5f2099ea3c 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/TestScript.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/TestScript.cs
@@ -300,14 +300,13 @@ public enum AssertionResponseTypes
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#Origin")]
-    [BackboneType("TestScript.origin")]
+    [FhirType("TestScript.origin", IsBackboneType=true)]
     public partial class OriginComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TestScript#Origin"; } }
+      public override string TypeName { get { return "TestScript.origin"; } }
 
       /// <summary>
       /// The index of the abstract origin server starting at 1
@@ -473,14 +472,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#Destination")]
-    [BackboneType("TestScript.destination")]
+    [FhirType("TestScript.destination", IsBackboneType=true)]
     public partial class DestinationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TestScript#Destination"; } }
+      public override string TypeName { get { return "TestScript.destination"; } }
 
       /// <summary>
       /// The index of the abstract destination server starting at 1
@@ -645,14 +643,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#Metadata")]
-    [BackboneType("TestScript.metadata")]
+    [FhirType("TestScript.metadata", IsBackboneType=true)]
     public partial class MetadataComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TestScript#Metadata"; } }
+      public override string TypeName { get { return "TestScript.metadata"; } }
 
       /// <summary>
       /// Links to the FHIR specification
@@ -798,14 +795,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#Link")]
-    [BackboneType("TestScript.metadata.link")]
+    [FhirType("TestScript.metadata.link", IsBackboneType=true)]
     public partial class LinkComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TestScript#Link"; } }
+      public override string TypeName { get { return "TestScript.metadata.link"; } }
 
       /// <summary>
       /// URL to the specification
@@ -987,14 +983,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#Capability")]
-    [BackboneType("TestScript.metadata.capability")]
+    [FhirType("TestScript.metadata.capability", IsBackboneType=true)]
     public partial class CapabilityComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TestScript#Capability"; } }
+      public override string TypeName { get { return "TestScript.metadata.capability"; } }
 
       /// <summary>
       /// Are the capabilities required?
@@ -1394,14 +1389,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#Fixture")]
-    [BackboneType("TestScript.fixture")]
+    [FhirType("TestScript.fixture", IsBackboneType=true)]
     public partial class FixtureComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TestScript#Fixture"; } }
+      public override string TypeName { get { return "TestScript.fixture"; } }
 
       /// <summary>
       /// Whether or not to implicitly create the fixture during setup
@@ -1611,14 +1605,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#Variable")]
-    [BackboneType("TestScript.variable")]
+    [FhirType("TestScript.variable", IsBackboneType=true)]
     public partial class VariableComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TestScript#Variable"; } }
+      public override string TypeName { get { return "TestScript.variable"; } }
 
       /// <summary>
       /// Descriptive name for this variable
@@ -2054,14 +2047,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#Setup")]
-    [BackboneType("TestScript.setup")]
+    [FhirType("TestScript.setup", IsBackboneType=true)]
     public partial class SetupComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TestScript#Setup"; } }
+      public override string TypeName { get { return "TestScript.setup"; } }
 
       /// <summary>
       /// A setup operation or assert to perform
@@ -2182,14 +2174,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#SetupAction")]
-    [BackboneType("TestScript.setup.action")]
+    [FhirType("TestScript.setup.action", IsBackboneType=true)]
     public partial class SetupActionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TestScript#SetupAction"; } }
+      public override string TypeName { get { return "TestScript.setup.action"; } }
 
       /// <summary>
       /// The setup operation to perform
@@ -2333,14 +2324,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#Operation")]
-    [BackboneType("TestScript.setup.action.operation")]
+    [FhirType("TestScript.setup.action.operation", IsBackboneType=true)]
     public partial class OperationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TestScript#Operation"; } }
+      public override string TypeName { get { return "TestScript.setup.action.operation"; } }
 
       /// <summary>
       /// The operation code type that will be executed
@@ -3139,14 +3129,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#RequestHeader")]
-    [BackboneType("TestScript.setup.action.operation.requestHeader")]
+    [FhirType("TestScript.setup.action.operation.requestHeader", IsBackboneType=true)]
     public partial class RequestHeaderComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TestScript#RequestHeader"; } }
+      public override string TypeName { get { return "TestScript.setup.action.operation.requestHeader"; } }
 
       /// <summary>
       /// HTTP header field name
@@ -3329,14 +3318,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#Assert")]
-    [BackboneType("TestScript.setup.action.assert")]
+    [FhirType("TestScript.setup.action.assert", IsBackboneType=true)]
     public partial class AssertComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TestScript#Assert"; } }
+      public override string TypeName { get { return "TestScript.setup.action.assert"; } }
 
       /// <summary>
       /// Tracking/logging assertion label
@@ -4385,14 +4373,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#Test")]
-    [BackboneType("TestScript.test")]
+    [FhirType("TestScript.test", IsBackboneType=true)]
     public partial class TestComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TestScript#Test"; } }
+      public override string TypeName { get { return "TestScript.test"; } }
 
       /// <summary>
       /// Tracking/logging name of this test
@@ -4599,14 +4586,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#TestAction")]
-    [BackboneType("TestScript.test.action")]
+    [FhirType("TestScript.test.action", IsBackboneType=true)]
     public partial class TestActionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TestScript#TestAction"; } }
+      public override string TypeName { get { return "TestScript.test.action"; } }
 
       /// <summary>
       /// The setup operation to perform
@@ -4750,14 +4736,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#Teardown")]
-    [BackboneType("TestScript.teardown")]
+    [FhirType("TestScript.teardown", IsBackboneType=true)]
     public partial class TeardownComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TestScript#Teardown"; } }
+      public override string TypeName { get { return "TestScript.teardown"; } }
 
       /// <summary>
       /// One or more teardown operations to perform
@@ -4878,14 +4863,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#TeardownAction")]
-    [BackboneType("TestScript.teardown.action")]
+    [FhirType("TestScript.teardown.action", IsBackboneType=true)]
     public partial class TeardownActionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TestScript#TeardownAction"; } }
+      public override string TypeName { get { return "TestScript.teardown.action"; } }
 
       /// <summary>
       /// The teardown operation to perform
diff --git a/src/Hl7.Fhir.R4/Model/Generated/Timing.cs b/src/Hl7.Fhir.R4/Model/Generated/Timing.cs
index 565a58f340..ee955366b1 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/Timing.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/Timing.cs
@@ -291,14 +291,13 @@ public enum EventTiming
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Timing#Repeat")]
-    [BackboneType("Timing.repeat")]
+    [FhirType("Timing.repeat", IsBackboneType=true)]
     public partial class RepeatComponent : Hl7.Fhir.Model.Element
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Timing#Repeat"; } }
+      public override string TypeName { get { return "Timing.repeat"; } }
 
       /// <summary>
       /// Length/Range of lengths, or (Start and/or end) limits
diff --git a/src/Hl7.Fhir.R4/Model/Generated/VerificationResult.cs b/src/Hl7.Fhir.R4/Model/Generated/VerificationResult.cs
index bd3216392f..3877b1b1bc 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/VerificationResult.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/VerificationResult.cs
@@ -107,14 +107,13 @@ public enum StatusCode
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("VerificationResult#PrimarySource")]
-    [BackboneType("VerificationResult.primarySource")]
+    [FhirType("VerificationResult.primarySource", IsBackboneType=true)]
     public partial class PrimarySourceComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "VerificationResult#PrimarySource"; } }
+      public override string TypeName { get { return "VerificationResult.primarySource"; } }
 
       /// <summary>
       /// Reference to the primary source
@@ -408,14 +407,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("VerificationResult#Attestation")]
-    [BackboneType("VerificationResult.attestation")]
+    [FhirType("VerificationResult.attestation", IsBackboneType=true)]
     public partial class AttestationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "VerificationResult#Attestation"; } }
+      public override string TypeName { get { return "VerificationResult.attestation"; } }
 
       /// <summary>
       /// The individual or organization attesting to information
@@ -765,14 +763,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("VerificationResult#Validator")]
-    [BackboneType("VerificationResult.validator")]
+    [FhirType("VerificationResult.validator", IsBackboneType=true)]
     public partial class ValidatorComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "VerificationResult#Validator"; } }
+      public override string TypeName { get { return "VerificationResult.validator"; } }
 
       /// <summary>
       /// Reference to the organization validating information
diff --git a/src/Hl7.Fhir.R4/Model/Generated/VisionPrescription.cs b/src/Hl7.Fhir.R4/Model/Generated/VisionPrescription.cs
index 0038cc3fde..cfe4a5cee9 100644
--- a/src/Hl7.Fhir.R4/Model/Generated/VisionPrescription.cs
+++ b/src/Hl7.Fhir.R4/Model/Generated/VisionPrescription.cs
@@ -123,14 +123,13 @@ public enum VisionBase
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("VisionPrescription#LensSpecification")]
-    [BackboneType("VisionPrescription.lensSpecification")]
+    [FhirType("VisionPrescription.lensSpecification", IsBackboneType=true)]
     public partial class LensSpecificationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "VisionPrescription#LensSpecification"; } }
+      public override string TypeName { get { return "VisionPrescription.lensSpecification"; } }
 
       /// <summary>
       /// Product to be supplied
@@ -761,14 +760,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("VisionPrescription#Prism")]
-    [BackboneType("VisionPrescription.lensSpecification.prism")]
+    [FhirType("VisionPrescription.lensSpecification.prism", IsBackboneType=true)]
     public partial class PrismComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "VisionPrescription#Prism"; } }
+      public override string TypeName { get { return "VisionPrescription.lensSpecification.prism"; } }
 
       /// <summary>
       /// Amount of adjustment
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Account.cs b/src/Hl7.Fhir.R4B/Model/Generated/Account.cs
index 9608acf6de..2f910665a1 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/Account.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/Account.cs
@@ -109,14 +109,13 @@ public enum AccountStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Account#Coverage")]
-    [BackboneType("Account.coverage")]
+    [FhirType("Account.coverage", IsBackboneType=true)]
     public partial class CoverageComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Account#Coverage"; } }
+      public override string TypeName { get { return "Account.coverage"; } }
 
       /// <summary>
       /// The party(s), such as insurances, that may contribute to the payment of this account
@@ -281,14 +280,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Account#Guarantor")]
-    [BackboneType("Account.guarantor")]
+    [FhirType("Account.guarantor", IsBackboneType=true)]
     public partial class GuarantorComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Account#Guarantor"; } }
+      public override string TypeName { get { return "Account.guarantor"; } }
 
       /// <summary>
       /// Responsible entity
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/ActivityDefinition.cs b/src/Hl7.Fhir.R4B/Model/Generated/ActivityDefinition.cs
index 9a7a7ba1b3..c0c177dca0 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/ActivityDefinition.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/ActivityDefinition.cs
@@ -167,14 +167,13 @@ public enum RequestResourceType
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ActivityDefinition#Participant")]
-    [BackboneType("ActivityDefinition.participant")]
+    [FhirType("ActivityDefinition.participant", IsBackboneType=true)]
     public partial class ParticipantComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ActivityDefinition#Participant"; } }
+      public override string TypeName { get { return "ActivityDefinition.participant"; } }
 
       /// <summary>
       /// patient | practitioner | related-person | device
@@ -341,14 +340,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ActivityDefinition#DynamicValue")]
-    [BackboneType("ActivityDefinition.dynamicValue")]
+    [FhirType("ActivityDefinition.dynamicValue", IsBackboneType=true)]
     public partial class DynamicValueComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ActivityDefinition#DynamicValue"; } }
+      public override string TypeName { get { return "ActivityDefinition.dynamicValue"; } }
 
       /// <summary>
       /// The path to the element to be set dynamically
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/AdministrableProductDefinition.cs b/src/Hl7.Fhir.R4B/Model/Generated/AdministrableProductDefinition.cs
index 687e73fc9c..c94b95fbdb 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/AdministrableProductDefinition.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/AdministrableProductDefinition.cs
@@ -64,14 +64,13 @@ public partial class AdministrableProductDefinition : Hl7.Fhir.Model.DomainResou
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("AdministrableProductDefinition#Property")]
-    [BackboneType("AdministrableProductDefinition.property")]
+    [FhirType("AdministrableProductDefinition.property", IsBackboneType=true)]
     public partial class PropertyComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "AdministrableProductDefinition#Property"; } }
+      public override string TypeName { get { return "AdministrableProductDefinition.property"; } }
 
       /// <summary>
       /// A code expressing the type of characteristic
@@ -245,14 +244,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("AdministrableProductDefinition#RouteOfAdministration")]
-    [BackboneType("AdministrableProductDefinition.routeOfAdministration")]
+    [FhirType("AdministrableProductDefinition.routeOfAdministration", IsBackboneType=true)]
     public partial class RouteOfAdministrationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "AdministrableProductDefinition#RouteOfAdministration"; } }
+      public override string TypeName { get { return "AdministrableProductDefinition.routeOfAdministration"; } }
 
       /// <summary>
       /// Coded expression for the route
@@ -521,14 +519,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("AdministrableProductDefinition#TargetSpecies")]
-    [BackboneType("AdministrableProductDefinition.routeOfAdministration.targetSpecies")]
+    [FhirType("AdministrableProductDefinition.routeOfAdministration.targetSpecies", IsBackboneType=true)]
     public partial class TargetSpeciesComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "AdministrableProductDefinition#TargetSpecies"; } }
+      public override string TypeName { get { return "AdministrableProductDefinition.routeOfAdministration.targetSpecies"; } }
 
       /// <summary>
       /// Coded expression for the species
@@ -672,14 +669,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("AdministrableProductDefinition#WithdrawalPeriod")]
-    [BackboneType("AdministrableProductDefinition.routeOfAdministration.targetSpecies.withdrawalPeriod")]
+    [FhirType("AdministrableProductDefinition.routeOfAdministration.targetSpecies.withdrawalPeriod", IsBackboneType=true)]
     public partial class WithdrawalPeriodComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "AdministrableProductDefinition#WithdrawalPeriod"; } }
+      public override string TypeName { get { return "AdministrableProductDefinition.routeOfAdministration.targetSpecies.withdrawalPeriod"; } }
 
       /// <summary>
       /// The type of tissue for which the withdrawal period applies, e.g. meat, milk
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/AdverseEvent.cs b/src/Hl7.Fhir.R4B/Model/Generated/AdverseEvent.cs
index 3bb4f9de68..0d92d79fe2 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/AdverseEvent.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/AdverseEvent.cs
@@ -163,14 +163,13 @@ public enum AdverseEventOutcome
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("AdverseEvent#SuspectEntity")]
-    [BackboneType("AdverseEvent.suspectEntity")]
+    [FhirType("AdverseEvent.suspectEntity", IsBackboneType=true)]
     public partial class SuspectEntityComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "AdverseEvent#SuspectEntity"; } }
+      public override string TypeName { get { return "AdverseEvent.suspectEntity"; } }
 
       /// <summary>
       /// Refers to the specific entity that caused the adverse event
@@ -315,14 +314,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("AdverseEvent#Causality")]
-    [BackboneType("AdverseEvent.suspectEntity.causality")]
+    [FhirType("AdverseEvent.suspectEntity.causality", IsBackboneType=true)]
     public partial class CausalityComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "AdverseEvent#Causality"; } }
+      public override string TypeName { get { return "AdverseEvent.suspectEntity.causality"; } }
 
       /// <summary>
       /// Assessment of if the entity caused the event
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/AllergyIntolerance.cs b/src/Hl7.Fhir.R4B/Model/Generated/AllergyIntolerance.cs
index c239270896..9101184ee0 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/AllergyIntolerance.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/AllergyIntolerance.cs
@@ -242,14 +242,13 @@ public enum AllergyIntoleranceSeverity
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("AllergyIntolerance#Reaction")]
-    [BackboneType("AllergyIntolerance.reaction")]
+    [FhirType("AllergyIntolerance.reaction", IsBackboneType=true)]
     public partial class ReactionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "AllergyIntolerance#Reaction"; } }
+      public override string TypeName { get { return "AllergyIntolerance.reaction"; } }
 
       /// <summary>
       /// Specific substance or pharmaceutical product considered to be responsible for event
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Appointment.cs b/src/Hl7.Fhir.R4B/Model/Generated/Appointment.cs
index 70297c4cae..88a798c191 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/Appointment.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/Appointment.cs
@@ -162,14 +162,13 @@ public enum ParticipantRequired
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Appointment#Participant")]
-    [BackboneType("Appointment.participant")]
+    [FhirType("Appointment.participant", IsBackboneType=true)]
     public partial class ParticipantComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Appointment#Participant"; } }
+      public override string TypeName { get { return "Appointment.participant"; } }
 
       /// <summary>
       /// Role of participant in the appointment
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/AuditEvent.cs b/src/Hl7.Fhir.R4B/Model/Generated/AuditEvent.cs
index 9742a297f8..9e447529ce 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/AuditEvent.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/AuditEvent.cs
@@ -184,14 +184,13 @@ public enum AuditEventAgentNetworkType
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("AuditEvent#Agent")]
-    [BackboneType("AuditEvent.agent")]
+    [FhirType("AuditEvent.agent", IsBackboneType=true)]
     public partial class AgentComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "AuditEvent#Agent"; } }
+      public override string TypeName { get { return "AuditEvent.agent"; } }
 
       /// <summary>
       /// How agent participated
@@ -644,14 +643,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("AuditEvent#Network")]
-    [BackboneType("AuditEvent.agent.network")]
+    [FhirType("AuditEvent.agent.network", IsBackboneType=true)]
     public partial class NetworkComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "AuditEvent#Network"; } }
+      public override string TypeName { get { return "AuditEvent.agent.network"; } }
 
       /// <summary>
       /// Identifier for the network access point of the user device
@@ -834,14 +832,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("AuditEvent#Source")]
-    [BackboneType("AuditEvent.source")]
+    [FhirType("AuditEvent.source", IsBackboneType=true)]
     public partial class SourceComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "AuditEvent#Source"; } }
+      public override string TypeName { get { return "AuditEvent.source"; } }
 
       /// <summary>
       /// Logical source location within the enterprise
@@ -1034,14 +1031,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("AuditEvent#Entity")]
-    [BackboneType("AuditEvent.entity")]
+    [FhirType("AuditEvent.entity", IsBackboneType=true)]
     public partial class EntityComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "AuditEvent#Entity"; } }
+      public override string TypeName { get { return "AuditEvent.entity"; } }
 
       /// <summary>
       /// Specific instance of resource
@@ -1422,14 +1418,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("AuditEvent#Detail")]
-    [BackboneType("AuditEvent.entity.detail")]
+    [FhirType("AuditEvent.entity.detail", IsBackboneType=true)]
     public partial class DetailComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "AuditEvent#Detail"; } }
+      public override string TypeName { get { return "AuditEvent.entity.detail"; } }
 
       /// <summary>
       /// Name of the property
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/BiologicallyDerivedProduct.cs b/src/Hl7.Fhir.R4B/Model/Generated/BiologicallyDerivedProduct.cs
index 7d9235540c..4f2c5e3b19 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/BiologicallyDerivedProduct.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/BiologicallyDerivedProduct.cs
@@ -156,14 +156,13 @@ public enum BiologicallyDerivedProductStorageScale
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("BiologicallyDerivedProduct#Collection")]
-    [BackboneType("BiologicallyDerivedProduct.collection")]
+    [FhirType("BiologicallyDerivedProduct.collection", IsBackboneType=true)]
     public partial class CollectionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "BiologicallyDerivedProduct#Collection"; } }
+      public override string TypeName { get { return "BiologicallyDerivedProduct.collection"; } }
 
       /// <summary>
       /// Individual performing collection
@@ -338,14 +337,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("BiologicallyDerivedProduct#Processing")]
-    [BackboneType("BiologicallyDerivedProduct.processing")]
+    [FhirType("BiologicallyDerivedProduct.processing", IsBackboneType=true)]
     public partial class ProcessingComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "BiologicallyDerivedProduct#Processing"; } }
+      public override string TypeName { get { return "BiologicallyDerivedProduct.processing"; } }
 
       /// <summary>
       /// Description of of processing
@@ -562,14 +560,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("BiologicallyDerivedProduct#Manipulation")]
-    [BackboneType("BiologicallyDerivedProduct.manipulation")]
+    [FhirType("BiologicallyDerivedProduct.manipulation", IsBackboneType=true)]
     public partial class ManipulationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "BiologicallyDerivedProduct#Manipulation"; } }
+      public override string TypeName { get { return "BiologicallyDerivedProduct.manipulation"; } }
 
       /// <summary>
       /// Description of manipulation
@@ -730,14 +727,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("BiologicallyDerivedProduct#Storage")]
-    [BackboneType("BiologicallyDerivedProduct.storage")]
+    [FhirType("BiologicallyDerivedProduct.storage", IsBackboneType=true)]
     public partial class StorageComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "BiologicallyDerivedProduct#Storage"; } }
+      public override string TypeName { get { return "BiologicallyDerivedProduct.storage"; } }
 
       /// <summary>
       /// Description of storage
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/CarePlan.cs b/src/Hl7.Fhir.R4B/Model/Generated/CarePlan.cs
index 9c024d34f2..d87ca2efa9 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/CarePlan.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/CarePlan.cs
@@ -223,14 +223,13 @@ public enum CarePlanActivityStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CarePlan#Activity")]
-    [BackboneType("CarePlan.activity")]
+    [FhirType("CarePlan.activity", IsBackboneType=true)]
     public partial class ActivityComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "CarePlan#Activity"; } }
+      public override string TypeName { get { return "CarePlan.activity"; } }
 
       /// <summary>
       /// Results of the activity
@@ -457,14 +456,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CarePlan#Detail")]
-    [BackboneType("CarePlan.activity.detail")]
+    [FhirType("CarePlan.activity.detail", IsBackboneType=true)]
     public partial class DetailComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "CarePlan#Detail"; } }
+      public override string TypeName { get { return "CarePlan.activity.detail"; } }
 
       /// <summary>
       /// Appointment | CommunicationRequest | DeviceRequest | MedicationRequest | NutritionOrder | Task | ServiceRequest | VisionPrescription
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/CareTeam.cs b/src/Hl7.Fhir.R4B/Model/Generated/CareTeam.cs
index 203022a1c8..3e41dbd231 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/CareTeam.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/CareTeam.cs
@@ -107,14 +107,13 @@ public enum CareTeamStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CareTeam#Participant")]
-    [BackboneType("CareTeam.participant")]
+    [FhirType("CareTeam.participant", IsBackboneType=true)]
     public partial class ParticipantComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "CareTeam#Participant"; } }
+      public override string TypeName { get { return "CareTeam.participant"; } }
 
       /// <summary>
       /// Type of involvement
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/CatalogEntry.cs b/src/Hl7.Fhir.R4B/Model/Generated/CatalogEntry.cs
index e6ece4dd3e..5a1e9a73ba 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/CatalogEntry.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/CatalogEntry.cs
@@ -89,14 +89,13 @@ public enum CatalogEntryRelationType
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CatalogEntry#RelatedEntry")]
-    [BackboneType("CatalogEntry.relatedEntry")]
+    [FhirType("CatalogEntry.relatedEntry", IsBackboneType=true)]
     public partial class RelatedEntryComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "CatalogEntry#RelatedEntry"; } }
+      public override string TypeName { get { return "CatalogEntry.relatedEntry"; } }
 
       /// <summary>
       /// triggers | is-replaced-by
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/ChargeItem.cs b/src/Hl7.Fhir.R4B/Model/Generated/ChargeItem.cs
index 0d569d2ad2..d614aed190 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/ChargeItem.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/ChargeItem.cs
@@ -119,14 +119,13 @@ public enum ChargeItemStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ChargeItem#Performer")]
-    [BackboneType("ChargeItem.performer")]
+    [FhirType("ChargeItem.performer", IsBackboneType=true)]
     public partial class PerformerComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ChargeItem#Performer"; } }
+      public override string TypeName { get { return "ChargeItem.performer"; } }
 
       /// <summary>
       /// What type of performance was done
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/ChargeItemDefinition.cs b/src/Hl7.Fhir.R4B/Model/Generated/ChargeItemDefinition.cs
index 49f498c1cd..998752fe74 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/ChargeItemDefinition.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/ChargeItemDefinition.cs
@@ -68,14 +68,13 @@ public partial class ChargeItemDefinition : Hl7.Fhir.Model.DomainResource, IIden
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ChargeItemDefinition#Applicability")]
-    [BackboneType("ChargeItemDefinition.applicability")]
+    [FhirType("ChargeItemDefinition.applicability", IsBackboneType=true)]
     public partial class ApplicabilityComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ChargeItemDefinition#Applicability"; } }
+      public override string TypeName { get { return "ChargeItemDefinition.applicability"; } }
 
       /// <summary>
       /// Natural language description of the condition
@@ -298,14 +297,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ChargeItemDefinition#PropertyGroup")]
-    [BackboneType("ChargeItemDefinition.propertyGroup")]
+    [FhirType("ChargeItemDefinition.propertyGroup", IsBackboneType=true)]
     public partial class PropertyGroupComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ChargeItemDefinition#PropertyGroup"; } }
+      public override string TypeName { get { return "ChargeItemDefinition.propertyGroup"; } }
 
       /// <summary>
       /// Conditions under which the priceComponent is applicable
@@ -451,14 +449,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ChargeItemDefinition#PriceComponent")]
-    [BackboneType("ChargeItemDefinition.propertyGroup.priceComponent")]
+    [FhirType("ChargeItemDefinition.propertyGroup.priceComponent", IsBackboneType=true)]
     public partial class PriceComponentComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ChargeItemDefinition#PriceComponent"; } }
+      public override string TypeName { get { return "ChargeItemDefinition.propertyGroup.priceComponent"; } }
 
       /// <summary>
       /// base | surcharge | deduction | discount | tax | informational
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Citation.cs b/src/Hl7.Fhir.R4B/Model/Generated/Citation.cs
index a3b5278368..ee6f2ab871 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/Citation.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/Citation.cs
@@ -64,14 +64,13 @@ public partial class Citation : Hl7.Fhir.Model.DomainResource, IIdentifiable<Lis
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Citation#Summary")]
-    [BackboneType("Citation.summary")]
+    [FhirType("Citation.summary", IsBackboneType=true)]
     public partial class SummaryComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Citation#Summary"; } }
+      public override string TypeName { get { return "Citation.summary"; } }
 
       /// <summary>
       /// Format for display of the citation
@@ -232,14 +231,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Citation#Classification")]
-    [BackboneType("Citation.classification")]
+    [FhirType("Citation.classification", IsBackboneType=true)]
     public partial class ClassificationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Citation#Classification"; } }
+      public override string TypeName { get { return "Citation.classification"; } }
 
       /// <summary>
       /// The kind of classifier (e.g. publication type, keyword)
@@ -383,14 +381,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Citation#StatusDate")]
-    [BackboneType("Citation.statusDate")]
+    [FhirType("Citation.statusDate", IsBackboneType=true)]
     public partial class StatusDateComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Citation#StatusDate"; } }
+      public override string TypeName { get { return "Citation.statusDate"; } }
 
       /// <summary>
       /// Classification of the status
@@ -577,14 +574,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Citation#RelatesTo")]
-    [BackboneType("Citation.relatesTo")]
+    [FhirType("Citation.relatesTo", IsBackboneType=true)]
     public partial class RelatesToComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Citation#RelatesTo"; } }
+      public override string TypeName { get { return "Citation.relatesTo"; } }
 
       /// <summary>
       /// How the Citation resource relates to the target artifact
@@ -758,14 +754,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Citation#CitedArtifact")]
-    [BackboneType("Citation.citedArtifact")]
+    [FhirType("Citation.citedArtifact", IsBackboneType=true)]
     public partial class CitedArtifactComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Citation#CitedArtifact"; } }
+      public override string TypeName { get { return "Citation.citedArtifact"; } }
 
       /// <summary>
       /// May include DOI, PMID, PMCID, etc.
@@ -1261,14 +1256,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Citation#CitedArtifactVersion")]
-    [BackboneType("Citation.citedArtifact.version")]
+    [FhirType("Citation.citedArtifact.version", IsBackboneType=true)]
     public partial class CitedArtifactVersionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Citation#CitedArtifactVersion"; } }
+      public override string TypeName { get { return "Citation.citedArtifact.version"; } }
 
       /// <summary>
       /// The version number or other version identifier
@@ -1430,14 +1424,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Citation#CitedArtifactStatusDate")]
-    [BackboneType("Citation.citedArtifact.statusDate")]
+    [FhirType("Citation.citedArtifact.statusDate", IsBackboneType=true)]
     public partial class CitedArtifactStatusDateComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Citation#CitedArtifactStatusDate"; } }
+      public override string TypeName { get { return "Citation.citedArtifact.statusDate"; } }
 
       /// <summary>
       /// Classification of the status
@@ -1624,14 +1617,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Citation#CitedArtifactTitle")]
-    [BackboneType("Citation.citedArtifact.title")]
+    [FhirType("Citation.citedArtifact.title", IsBackboneType=true)]
     public partial class CitedArtifactTitleComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Citation#CitedArtifactTitle"; } }
+      public override string TypeName { get { return "Citation.citedArtifact.title"; } }
 
       /// <summary>
       /// The kind of title
@@ -1819,14 +1811,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Citation#CitedArtifactAbstract")]
-    [BackboneType("Citation.citedArtifact.abstract")]
+    [FhirType("Citation.citedArtifact.abstract", IsBackboneType=true)]
     public partial class CitedArtifactAbstractComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Citation#CitedArtifactAbstract"; } }
+      public override string TypeName { get { return "Citation.citedArtifact.abstract"; } }
 
       /// <summary>
       /// The kind of abstract
@@ -2056,14 +2047,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Citation#CitedArtifactPart")]
-    [BackboneType("Citation.citedArtifact.part")]
+    [FhirType("Citation.citedArtifact.part", IsBackboneType=true)]
     public partial class CitedArtifactPartComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Citation#CitedArtifactPart"; } }
+      public override string TypeName { get { return "Citation.citedArtifact.part"; } }
 
       /// <summary>
       /// The kind of component
@@ -2250,14 +2240,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Citation#CitedArtifactRelatesTo")]
-    [BackboneType("Citation.citedArtifact.relatesTo")]
+    [FhirType("Citation.citedArtifact.relatesTo", IsBackboneType=true)]
     public partial class CitedArtifactRelatesToComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Citation#CitedArtifactRelatesTo"; } }
+      public override string TypeName { get { return "Citation.citedArtifact.relatesTo"; } }
 
       /// <summary>
       /// How the cited artifact relates to the target artifact
@@ -2434,14 +2423,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Citation#CitedArtifactPublicationForm")]
-    [BackboneType("Citation.citedArtifact.publicationForm")]
+    [FhirType("Citation.citedArtifact.publicationForm", IsBackboneType=true)]
     public partial class CitedArtifactPublicationFormComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Citation#CitedArtifactPublicationForm"; } }
+      public override string TypeName { get { return "Citation.citedArtifact.publicationForm"; } }
 
       /// <summary>
       /// The collection the cited article or artifact is published in
@@ -2953,14 +2941,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Citation#CitedArtifactPublicationFormPublishedIn")]
-    [BackboneType("Citation.citedArtifact.publicationForm.publishedIn")]
+    [FhirType("Citation.citedArtifact.publicationForm.publishedIn", IsBackboneType=true)]
     public partial class CitedArtifactPublicationFormPublishedInComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Citation#CitedArtifactPublicationFormPublishedIn"; } }
+      public override string TypeName { get { return "Citation.citedArtifact.publicationForm.publishedIn"; } }
 
       /// <summary>
       /// Kind of container (e.g. Periodical, database, or book)
@@ -3216,14 +3203,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Citation#CitedArtifactPublicationFormPeriodicRelease")]
-    [BackboneType("Citation.citedArtifact.publicationForm.periodicRelease")]
+    [FhirType("Citation.citedArtifact.publicationForm.periodicRelease", IsBackboneType=true)]
     public partial class CitedArtifactPublicationFormPeriodicReleaseComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Citation#CitedArtifactPublicationFormPeriodicRelease"; } }
+      public override string TypeName { get { return "Citation.citedArtifact.publicationForm.periodicRelease"; } }
 
       /// <summary>
       /// Internet or Print
@@ -3451,14 +3437,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Citation#CitedArtifactPublicationFormPeriodicReleaseDateOfPublication")]
-    [BackboneType("Citation.citedArtifact.publicationForm.periodicRelease.dateOfPublication")]
+    [FhirType("Citation.citedArtifact.publicationForm.periodicRelease.dateOfPublication", IsBackboneType=true)]
     public partial class CitedArtifactPublicationFormPeriodicReleaseDateOfPublicationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Citation#CitedArtifactPublicationFormPeriodicReleaseDateOfPublication"; } }
+      public override string TypeName { get { return "Citation.citedArtifact.publicationForm.periodicRelease.dateOfPublication"; } }
 
       /// <summary>
       /// Date on which the issue of the journal was published
@@ -3807,14 +3792,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Citation#CitedArtifactWebLocation")]
-    [BackboneType("Citation.citedArtifact.webLocation")]
+    [FhirType("Citation.citedArtifact.webLocation", IsBackboneType=true)]
     public partial class CitedArtifactWebLocationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Citation#CitedArtifactWebLocation"; } }
+      public override string TypeName { get { return "Citation.citedArtifact.webLocation"; } }
 
       /// <summary>
       /// Code the reason for different URLs, e.g. abstract and full-text
@@ -3974,14 +3958,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Citation#CitedArtifactClassification")]
-    [BackboneType("Citation.citedArtifact.classification")]
+    [FhirType("Citation.citedArtifact.classification", IsBackboneType=true)]
     public partial class CitedArtifactClassificationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Citation#CitedArtifactClassification"; } }
+      public override string TypeName { get { return "Citation.citedArtifact.classification"; } }
 
       /// <summary>
       /// The kind of classifier (e.g. publication type, keyword)
@@ -4150,14 +4133,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Citation#CitedArtifactClassificationWhoClassified")]
-    [BackboneType("Citation.citedArtifact.classification.whoClassified")]
+    [FhirType("Citation.citedArtifact.classification.whoClassified", IsBackboneType=true)]
     public partial class CitedArtifactClassificationWhoClassifiedComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Citation#CitedArtifactClassificationWhoClassified"; } }
+      public override string TypeName { get { return "Citation.citedArtifact.classification.whoClassified"; } }
 
       /// <summary>
       /// Person who created the classification
@@ -4418,14 +4400,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Citation#CitedArtifactContributorship")]
-    [BackboneType("Citation.citedArtifact.contributorship")]
+    [FhirType("Citation.citedArtifact.contributorship", IsBackboneType=true)]
     public partial class CitedArtifactContributorshipComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Citation#CitedArtifactContributorship"; } }
+      public override string TypeName { get { return "Citation.citedArtifact.contributorship"; } }
 
       /// <summary>
       /// Indicates if the list includes all authors and/or contributors
@@ -4615,14 +4596,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Citation#CitedArtifactContributorshipEntry")]
-    [BackboneType("Citation.citedArtifact.contributorship.entry")]
+    [FhirType("Citation.citedArtifact.contributorship.entry", IsBackboneType=true)]
     public partial class CitedArtifactContributorshipEntryComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Citation#CitedArtifactContributorshipEntry"; } }
+      public override string TypeName { get { return "Citation.citedArtifact.contributorship.entry"; } }
 
       /// <summary>
       /// A name associated with the person
@@ -5096,14 +5076,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Citation#CitedArtifactContributorshipEntryAffiliationInfo")]
-    [BackboneType("Citation.citedArtifact.contributorship.entry.affiliationInfo")]
+    [FhirType("Citation.citedArtifact.contributorship.entry.affiliationInfo", IsBackboneType=true)]
     public partial class CitedArtifactContributorshipEntryAffiliationInfoComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Citation#CitedArtifactContributorshipEntryAffiliationInfo"; } }
+      public override string TypeName { get { return "Citation.citedArtifact.contributorship.entry.affiliationInfo"; } }
 
       /// <summary>
       /// Display for the organization
@@ -5306,14 +5285,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Citation#CitedArtifactContributorshipEntryContributionInstance")]
-    [BackboneType("Citation.citedArtifact.contributorship.entry.contributionInstance")]
+    [FhirType("Citation.citedArtifact.contributorship.entry.contributionInstance", IsBackboneType=true)]
     public partial class CitedArtifactContributorshipEntryContributionInstanceComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Citation#CitedArtifactContributorshipEntryContributionInstance"; } }
+      public override string TypeName { get { return "Citation.citedArtifact.contributorship.entry.contributionInstance"; } }
 
       /// <summary>
       /// The specific contribution
@@ -5474,14 +5452,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Citation#CitedArtifactContributorshipSummary")]
-    [BackboneType("Citation.citedArtifact.contributorship.summary")]
+    [FhirType("Citation.citedArtifact.contributorship.summary", IsBackboneType=true)]
     public partial class CitedArtifactContributorshipSummaryComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Citation#CitedArtifactContributorshipSummary"; } }
+      public override string TypeName { get { return "Citation.citedArtifact.contributorship.summary"; } }
 
       /// <summary>
       /// Either authorList or contributorshipStatement
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Claim.cs b/src/Hl7.Fhir.R4B/Model/Generated/Claim.cs
index 0f05563ed9..fcd001b867 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/Claim.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/Claim.cs
@@ -69,14 +69,13 @@ public partial class Claim : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<I
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Claim#RelatedClaim")]
-    [BackboneType("Claim.related")]
+    [FhirType("Claim.related", IsBackboneType=true)]
     public partial class RelatedClaimComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Claim#RelatedClaim"; } }
+      public override string TypeName { get { return "Claim.related"; } }
 
       /// <summary>
       /// Reference to the related claim
@@ -249,14 +248,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Claim#Payee")]
-    [BackboneType("Claim.payee")]
+    [FhirType("Claim.payee", IsBackboneType=true)]
     public partial class PayeeComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Claim#Payee"; } }
+      public override string TypeName { get { return "Claim.payee"; } }
 
       /// <summary>
       /// Category of recipient
@@ -404,14 +402,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Claim#CareTeam")]
-    [BackboneType("Claim.careTeam")]
+    [FhirType("Claim.careTeam", IsBackboneType=true)]
     public partial class CareTeamComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Claim#CareTeam"; } }
+      public override string TypeName { get { return "Claim.careTeam"; } }
 
       /// <summary>
       /// Order of care team
@@ -673,14 +670,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Claim#SupportingInformation")]
-    [BackboneType("Claim.supportingInfo")]
+    [FhirType("Claim.supportingInfo", IsBackboneType=true)]
     public partial class SupportingInformationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Claim#SupportingInformation"; } }
+      public override string TypeName { get { return "Claim.supportingInfo"; } }
 
       /// <summary>
       /// Information instance identifier
@@ -952,14 +948,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Claim#Diagnosis")]
-    [BackboneType("Claim.diagnosis")]
+    [FhirType("Claim.diagnosis", IsBackboneType=true)]
     public partial class DiagnosisComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Claim#Diagnosis"; } }
+      public override string TypeName { get { return "Claim.diagnosis"; } }
 
       /// <summary>
       /// Diagnosis instance identifier
@@ -1206,14 +1201,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Claim#Procedure")]
-    [BackboneType("Claim.procedure")]
+    [FhirType("Claim.procedure", IsBackboneType=true)]
     public partial class ProcedureComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Claim#Procedure"; } }
+      public override string TypeName { get { return "Claim.procedure"; } }
 
       /// <summary>
       /// Procedure instance identifier
@@ -1480,14 +1474,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Claim#Insurance")]
-    [BackboneType("Claim.insurance")]
+    [FhirType("Claim.insurance", IsBackboneType=true)]
     public partial class InsuranceComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Claim#Insurance"; } }
+      public override string TypeName { get { return "Claim.insurance"; } }
 
       /// <summary>
       /// Insurance instance identifier
@@ -1836,14 +1829,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Claim#Accident")]
-    [BackboneType("Claim.accident")]
+    [FhirType("Claim.accident", IsBackboneType=true)]
     public partial class AccidentComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Claim#Accident"; } }
+      public override string TypeName { get { return "Claim.accident"; } }
 
       /// <summary>
       /// When the incident occurred
@@ -2035,14 +2027,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Claim#Item")]
-    [BackboneType("Claim.item")]
+    [FhirType("Claim.item", IsBackboneType=true)]
     public partial class ItemComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Claim#Item"; } }
+      public override string TypeName { get { return "Claim.item"; } }
 
       /// <summary>
       /// Item instance identifier
@@ -2798,14 +2789,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Claim#Detail")]
-    [BackboneType("Claim.item.detail")]
+    [FhirType("Claim.item.detail", IsBackboneType=true)]
     public partial class DetailComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Claim#Detail"; } }
+      public override string TypeName { get { return "Claim.item.detail"; } }
 
       /// <summary>
       /// Item instance identifier
@@ -3248,14 +3238,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Claim#SubDetail")]
-    [BackboneType("Claim.item.detail.subDetail")]
+    [FhirType("Claim.item.detail.subDetail", IsBackboneType=true)]
     public partial class SubDetailComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Claim#SubDetail"; } }
+      public override string TypeName { get { return "Claim.item.detail.subDetail"; } }
 
       /// <summary>
       /// Item instance identifier
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/ClaimResponse.cs b/src/Hl7.Fhir.R4B/Model/Generated/ClaimResponse.cs
index 9975da2485..87b7b2b4aa 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/ClaimResponse.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/ClaimResponse.cs
@@ -67,14 +67,13 @@ public partial class ClaimResponse : Hl7.Fhir.Model.DomainResource, IIdentifiabl
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ClaimResponse#Item")]
-    [BackboneType("ClaimResponse.item")]
+    [FhirType("ClaimResponse.item", IsBackboneType=true)]
     public partial class ItemComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ClaimResponse#Item"; } }
+      public override string TypeName { get { return "ClaimResponse.item"; } }
 
       /// <summary>
       /// Claim item instance identifier
@@ -308,14 +307,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ClaimResponse#Adjudication")]
-    [BackboneType("ClaimResponse.item.adjudication")]
+    [FhirType("ClaimResponse.item.adjudication", IsBackboneType=true)]
     public partial class AdjudicationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ClaimResponse#Adjudication"; } }
+      public override string TypeName { get { return "ClaimResponse.item.adjudication"; } }
 
       /// <summary>
       /// Type of adjudication information
@@ -530,14 +528,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ClaimResponse#ItemDetail")]
-    [BackboneType("ClaimResponse.item.detail")]
+    [FhirType("ClaimResponse.item.detail", IsBackboneType=true)]
     public partial class ItemDetailComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ClaimResponse#ItemDetail"; } }
+      public override string TypeName { get { return "ClaimResponse.item.detail"; } }
 
       /// <summary>
       /// Claim detail instance identifier
@@ -771,14 +768,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ClaimResponse#SubDetail")]
-    [BackboneType("ClaimResponse.item.detail.subDetail")]
+    [FhirType("ClaimResponse.item.detail.subDetail", IsBackboneType=true)]
     public partial class SubDetailComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ClaimResponse#SubDetail"; } }
+      public override string TypeName { get { return "ClaimResponse.item.detail.subDetail"; } }
 
       /// <summary>
       /// Claim sub-detail instance identifier
@@ -986,14 +982,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ClaimResponse#AddedItem")]
-    [BackboneType("ClaimResponse.addItem")]
+    [FhirType("ClaimResponse.addItem", IsBackboneType=true)]
     public partial class AddedItemComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ClaimResponse#AddedItem"; } }
+      public override string TypeName { get { return "ClaimResponse.addItem"; } }
 
       /// <summary>
       /// Item sequence number
@@ -1651,14 +1646,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ClaimResponse#AddedItemDetail")]
-    [BackboneType("ClaimResponse.addItem.detail")]
+    [FhirType("ClaimResponse.addItem.detail", IsBackboneType=true)]
     public partial class AddedItemDetailComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ClaimResponse#AddedItemDetail"; } }
+      public override string TypeName { get { return "ClaimResponse.addItem.detail"; } }
 
       /// <summary>
       /// Billing, service, product, or drug code
@@ -2020,14 +2014,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ClaimResponse#AddedItemSubDetail")]
-    [BackboneType("ClaimResponse.addItem.detail.subDetail")]
+    [FhirType("ClaimResponse.addItem.detail.subDetail", IsBackboneType=true)]
     public partial class AddedItemSubDetailComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ClaimResponse#AddedItemSubDetail"; } }
+      public override string TypeName { get { return "ClaimResponse.addItem.detail.subDetail"; } }
 
       /// <summary>
       /// Billing, service, product, or drug code
@@ -2364,14 +2357,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ClaimResponse#Total")]
-    [BackboneType("ClaimResponse.total")]
+    [FhirType("ClaimResponse.total", IsBackboneType=true)]
     public partial class TotalComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ClaimResponse#Total"; } }
+      public override string TypeName { get { return "ClaimResponse.total"; } }
 
       /// <summary>
       /// Type of adjudication information
@@ -2518,14 +2510,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ClaimResponse#Payment")]
-    [BackboneType("ClaimResponse.payment")]
+    [FhirType("ClaimResponse.payment", IsBackboneType=true)]
     public partial class PaymentComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ClaimResponse#Payment"; } }
+      public override string TypeName { get { return "ClaimResponse.payment"; } }
 
       /// <summary>
       /// Partial or complete payment
@@ -2791,14 +2782,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ClaimResponse#Note")]
-    [BackboneType("ClaimResponse.processNote")]
+    [FhirType("ClaimResponse.processNote", IsBackboneType=true)]
     public partial class NoteComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ClaimResponse#Note"; } }
+      public override string TypeName { get { return "ClaimResponse.processNote"; } }
 
       /// <summary>
       /// Note instance identifier
@@ -3051,14 +3041,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ClaimResponse#Insurance")]
-    [BackboneType("ClaimResponse.insurance")]
+    [FhirType("ClaimResponse.insurance", IsBackboneType=true)]
     public partial class InsuranceComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ClaimResponse#Insurance"; } }
+      public override string TypeName { get { return "ClaimResponse.insurance"; } }
 
       /// <summary>
       /// Insurance instance identifier
@@ -3339,14 +3328,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ClaimResponse#Error")]
-    [BackboneType("ClaimResponse.error")]
+    [FhirType("ClaimResponse.error", IsBackboneType=true)]
     public partial class ErrorComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ClaimResponse#Error"; } }
+      public override string TypeName { get { return "ClaimResponse.error"; } }
 
       /// <summary>
       /// Item sequence number
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/ClinicalImpression.cs b/src/Hl7.Fhir.R4B/Model/Generated/ClinicalImpression.cs
index fd6dc1665d..b48746d632 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/ClinicalImpression.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/ClinicalImpression.cs
@@ -95,14 +95,13 @@ public enum ClinicalImpressionStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ClinicalImpression#Investigation")]
-    [BackboneType("ClinicalImpression.investigation")]
+    [FhirType("ClinicalImpression.investigation", IsBackboneType=true)]
     public partial class InvestigationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ClinicalImpression#Investigation"; } }
+      public override string TypeName { get { return "ClinicalImpression.investigation"; } }
 
       /// <summary>
       /// A name/code for the set
@@ -251,14 +250,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ClinicalImpression#Finding")]
-    [BackboneType("ClinicalImpression.finding")]
+    [FhirType("ClinicalImpression.finding", IsBackboneType=true)]
     public partial class FindingComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ClinicalImpression#Finding"; } }
+      public override string TypeName { get { return "ClinicalImpression.finding"; } }
 
       /// <summary>
       /// What was found
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/ClinicalUseDefinition.cs b/src/Hl7.Fhir.R4B/Model/Generated/ClinicalUseDefinition.cs
index 164de5944e..809a3a0cd5 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/ClinicalUseDefinition.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/ClinicalUseDefinition.cs
@@ -101,14 +101,13 @@ public enum ClinicalUseDefinitionType
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("ClinicalUseDefinition#Contraindication")]
-    [BackboneType("ClinicalUseDefinition.contraindication")]
+    [FhirType("ClinicalUseDefinition.contraindication", IsBackboneType=true)]
     public partial class ContraindicationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ClinicalUseDefinition#Contraindication"; } }
+      public override string TypeName { get { return "ClinicalUseDefinition.contraindication"; } }
 
       /// <summary>
       /// The situation that is being documented as contraindicating against this item
@@ -335,14 +334,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ClinicalUseDefinition#OtherTherapy")]
-    [BackboneType("ClinicalUseDefinition.contraindication.otherTherapy")]
+    [FhirType("ClinicalUseDefinition.contraindication.otherTherapy", IsBackboneType=true)]
     public partial class OtherTherapyComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ClinicalUseDefinition#OtherTherapy"; } }
+      public override string TypeName { get { return "ClinicalUseDefinition.contraindication.otherTherapy"; } }
 
       /// <summary>
       /// The type of relationship between the product indication/contraindication and another therapy
@@ -487,14 +485,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("ClinicalUseDefinition#Indication")]
-    [BackboneType("ClinicalUseDefinition.indication")]
+    [FhirType("ClinicalUseDefinition.indication", IsBackboneType=true)]
     public partial class IndicationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ClinicalUseDefinition#Indication"; } }
+      public override string TypeName { get { return "ClinicalUseDefinition.indication"; } }
 
       /// <summary>
       /// The situation that is being documented as an indicaton for this item
@@ -771,14 +768,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("ClinicalUseDefinition#Interaction")]
-    [BackboneType("ClinicalUseDefinition.interaction")]
+    [FhirType("ClinicalUseDefinition.interaction", IsBackboneType=true)]
     public partial class InteractionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ClinicalUseDefinition#Interaction"; } }
+      public override string TypeName { get { return "ClinicalUseDefinition.interaction"; } }
 
       /// <summary>
       /// The specific medication, food, substance or laboratory test that interacts
@@ -1000,14 +996,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("ClinicalUseDefinition#Interactant")]
-    [BackboneType("ClinicalUseDefinition.interaction.interactant")]
+    [FhirType("ClinicalUseDefinition.interaction.interactant", IsBackboneType=true)]
     public partial class InteractantComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ClinicalUseDefinition#Interactant"; } }
+      public override string TypeName { get { return "ClinicalUseDefinition.interaction.interactant"; } }
 
       /// <summary>
       /// The specific medication, food or laboratory test that interacts
@@ -1131,14 +1126,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ClinicalUseDefinition#UndesirableEffect")]
-    [BackboneType("ClinicalUseDefinition.undesirableEffect")]
+    [FhirType("ClinicalUseDefinition.undesirableEffect", IsBackboneType=true)]
     public partial class UndesirableEffectComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ClinicalUseDefinition#UndesirableEffect"; } }
+      public override string TypeName { get { return "ClinicalUseDefinition.undesirableEffect"; } }
 
       /// <summary>
       /// The situation in which the undesirable effect may manifest
@@ -1310,14 +1304,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ClinicalUseDefinition#Warning")]
-    [BackboneType("ClinicalUseDefinition.warning")]
+    [FhirType("ClinicalUseDefinition.warning", IsBackboneType=true)]
     public partial class WarningComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ClinicalUseDefinition#Warning"; } }
+      public override string TypeName { get { return "ClinicalUseDefinition.warning"; } }
 
       /// <summary>
       /// A textual definition of this warning, with formatting
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Communication.cs b/src/Hl7.Fhir.R4B/Model/Generated/Communication.cs
index 01b81c1d6b..2b8004a2fc 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/Communication.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/Communication.cs
@@ -67,14 +67,13 @@ public partial class Communication : Hl7.Fhir.Model.DomainResource, IIdentifiabl
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Communication#Payload")]
-    [BackboneType("Communication.payload")]
+    [FhirType("Communication.payload", IsBackboneType=true)]
     public partial class PayloadComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Communication#Payload"; } }
+      public override string TypeName { get { return "Communication.payload"; } }
 
       /// <summary>
       /// Message part content
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/CommunicationRequest.cs b/src/Hl7.Fhir.R4B/Model/Generated/CommunicationRequest.cs
index c954ae3a16..bc3686b6e6 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/CommunicationRequest.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/CommunicationRequest.cs
@@ -67,14 +67,13 @@ public partial class CommunicationRequest : Hl7.Fhir.Model.DomainResource, IIden
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CommunicationRequest#Payload")]
-    [BackboneType("CommunicationRequest.payload")]
+    [FhirType("CommunicationRequest.payload", IsBackboneType=true)]
     public partial class PayloadComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "CommunicationRequest#Payload"; } }
+      public override string TypeName { get { return "CommunicationRequest.payload"; } }
 
       /// <summary>
       /// Message part content
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/CompartmentDefinition.cs b/src/Hl7.Fhir.R4B/Model/Generated/CompartmentDefinition.cs
index 0a4322605b..081839e377 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/CompartmentDefinition.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/CompartmentDefinition.cs
@@ -68,14 +68,13 @@ public partial class CompartmentDefinition : Hl7.Fhir.Model.DomainResource
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CompartmentDefinition#Resource")]
-    [BackboneType("CompartmentDefinition.resource")]
+    [FhirType("CompartmentDefinition.resource", IsBackboneType=true)]
     public partial class ResourceComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "CompartmentDefinition#Resource"; } }
+      public override string TypeName { get { return "CompartmentDefinition.resource"; } }
 
       /// <summary>
       /// Name of resource type
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Composition.cs b/src/Hl7.Fhir.R4B/Model/Generated/Composition.cs
index 5404b9e831..b0f1beaa53 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/Composition.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/Composition.cs
@@ -149,14 +149,13 @@ public enum CompositionAttestationMode
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Composition#Attester")]
-    [BackboneType("Composition.attester")]
+    [FhirType("Composition.attester", IsBackboneType=true)]
     public partial class AttesterComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Composition#Attester"; } }
+      public override string TypeName { get { return "Composition.attester"; } }
 
       /// <summary>
       /// personal | professional | legal | official
@@ -367,14 +366,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Composition#RelatesTo")]
-    [BackboneType("Composition.relatesTo")]
+    [FhirType("Composition.relatesTo", IsBackboneType=true)]
     public partial class RelatesToComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Composition#RelatesTo"; } }
+      public override string TypeName { get { return "Composition.relatesTo"; } }
 
       /// <summary>
       /// replaces | transforms | signs | appends
@@ -544,14 +542,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Composition#Event")]
-    [BackboneType("Composition.event")]
+    [FhirType("Composition.event", IsBackboneType=true)]
     public partial class EventComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Composition#Event"; } }
+      public override string TypeName { get { return "Composition.event"; } }
 
       /// <summary>
       /// Code(s) that apply to the event being documented
@@ -725,14 +722,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Composition#Section")]
-    [BackboneType("Composition.section")]
+    [FhirType("Composition.section", IsBackboneType=true)]
     public partial class SectionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Composition#Section"; } }
+      public override string TypeName { get { return "Composition.section"; } }
 
       /// <summary>
       /// Label for section (e.g. for ToC)
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/ConceptMap.cs b/src/Hl7.Fhir.R4B/Model/Generated/ConceptMap.cs
index d799566bb9..5d0ca3e620 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/ConceptMap.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/ConceptMap.cs
@@ -95,14 +95,13 @@ public enum ConceptMapGroupUnmappedMode
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ConceptMap#Group")]
-    [BackboneType("ConceptMap.group")]
+    [FhirType("ConceptMap.group", IsBackboneType=true)]
     public partial class GroupComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ConceptMap#Group"; } }
+      public override string TypeName { get { return "ConceptMap.group"; } }
 
       /// <summary>
       /// Source system where concepts to be mapped are defined
@@ -420,14 +419,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ConceptMap#SourceElement")]
-    [BackboneType("ConceptMap.group.element")]
+    [FhirType("ConceptMap.group.element", IsBackboneType=true)]
     public partial class SourceElementComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ConceptMap#SourceElement"; } }
+      public override string TypeName { get { return "ConceptMap.group.element"; } }
 
       /// <summary>
       /// Identifies element being mapped
@@ -634,14 +632,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ConceptMap#TargetElement")]
-    [BackboneType("ConceptMap.group.element.target")]
+    [FhirType("ConceptMap.group.element.target", IsBackboneType=true)]
     public partial class TargetElementComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ConceptMap#TargetElement"; } }
+      public override string TypeName { get { return "ConceptMap.group.element.target"; } }
 
       /// <summary>
       /// Code that identifies the target element
@@ -962,14 +959,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ConceptMap#OtherElement")]
-    [BackboneType("ConceptMap.group.element.target.dependsOn")]
+    [FhirType("ConceptMap.group.element.target.dependsOn", IsBackboneType=true)]
     public partial class OtherElementComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ConceptMap#OtherElement"; } }
+      public override string TypeName { get { return "ConceptMap.group.element.target.dependsOn"; } }
 
       /// <summary>
       /// Reference to property mapping depends on
@@ -1238,14 +1234,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ConceptMap#Unmapped")]
-    [BackboneType("ConceptMap.group.unmapped")]
+    [FhirType("ConceptMap.group.unmapped", IsBackboneType=true)]
     public partial class UnmappedComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ConceptMap#Unmapped"; } }
+      public override string TypeName { get { return "ConceptMap.group.unmapped"; } }
 
       /// <summary>
       /// provided | fixed | other-map
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Condition.cs b/src/Hl7.Fhir.R4B/Model/Generated/Condition.cs
index 936c3093a6..0777f09001 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/Condition.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/Condition.cs
@@ -159,14 +159,13 @@ public enum ConditionVerificationStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Condition#Stage")]
-    [BackboneType("Condition.stage")]
+    [FhirType("Condition.stage", IsBackboneType=true)]
     public partial class StageComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Condition#Stage"; } }
+      public override string TypeName { get { return "Condition.stage"; } }
 
       /// <summary>
       /// Simple summary (disease specific)
@@ -341,14 +340,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Condition#Evidence")]
-    [BackboneType("Condition.evidence")]
+    [FhirType("Condition.evidence", IsBackboneType=true)]
     public partial class EvidenceComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Condition#Evidence"; } }
+      public override string TypeName { get { return "Condition.evidence"; } }
 
       /// <summary>
       /// Manifestation/symptom
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Consent.cs b/src/Hl7.Fhir.R4B/Model/Generated/Consent.cs
index 8d62197859..b85387c166 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/Consent.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/Consent.cs
@@ -170,14 +170,13 @@ public enum ConsentDataMeaning
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Consent#Policy")]
-    [BackboneType("Consent.policy")]
+    [FhirType("Consent.policy", IsBackboneType=true)]
     public partial class PolicyComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Consent#Policy"; } }
+      public override string TypeName { get { return "Consent.policy"; } }
 
       /// <summary>
       /// Enforcement source for policy
@@ -357,14 +356,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Consent#Verification")]
-    [BackboneType("Consent.verification")]
+    [FhirType("Consent.verification", IsBackboneType=true)]
     public partial class VerificationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Consent#Verification"; } }
+      public override string TypeName { get { return "Consent.verification"; } }
 
       /// <summary>
       /// Has been verified
@@ -572,14 +570,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Consent#provision")]
-    [BackboneType("Consent.provision")]
+    [FhirType("Consent.provision", IsBackboneType=true)]
     public partial class provisionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Consent#provision"; } }
+      public override string TypeName { get { return "Consent.provision"; } }
 
       /// <summary>
       /// deny | permit
@@ -981,14 +978,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Consent#provisionActor")]
-    [BackboneType("Consent.provision.actor")]
+    [FhirType("Consent.provision.actor", IsBackboneType=true)]
     public partial class provisionActorComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Consent#provisionActor"; } }
+      public override string TypeName { get { return "Consent.provision.actor"; } }
 
       /// <summary>
       /// How the actor is involved
@@ -1137,14 +1133,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Consent#provisionData")]
-    [BackboneType("Consent.provision.data")]
+    [FhirType("Consent.provision.data", IsBackboneType=true)]
     public partial class provisionDataComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Consent#provisionData"; } }
+      public override string TypeName { get { return "Consent.provision.data"; } }
 
       /// <summary>
       /// instance | related | dependents | authoredby
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Contract.cs b/src/Hl7.Fhir.R4B/Model/Generated/Contract.cs
index 3d0ed720ea..d2b4ffb391 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/Contract.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/Contract.cs
@@ -267,14 +267,13 @@ public enum ContractResourcePublicationStatusCodes
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Contract#ContentDefinition")]
-    [BackboneType("Contract.contentDefinition")]
+    [FhirType("Contract.contentDefinition", IsBackboneType=true)]
     public partial class ContentDefinitionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Contract#ContentDefinition"; } }
+      public override string TypeName { get { return "Contract.contentDefinition"; } }
 
       /// <summary>
       /// Content structure and use
@@ -580,14 +579,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Contract#Term")]
-    [BackboneType("Contract.term")]
+    [FhirType("Contract.term", IsBackboneType=true)]
     public partial class TermComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Contract#Term"; } }
+      public override string TypeName { get { return "Contract.term"; } }
 
       /// <summary>
       /// Contract Term Number
@@ -1027,14 +1025,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Contract#SecurityLabel")]
-    [BackboneType("Contract.term.securityLabel")]
+    [FhirType("Contract.term.securityLabel", IsBackboneType=true)]
     public partial class SecurityLabelComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Contract#SecurityLabel"; } }
+      public override string TypeName { get { return "Contract.term.securityLabel"; } }
 
       /// <summary>
       /// Link to Security Labels
@@ -1253,14 +1250,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Contract#ContractOffer")]
-    [BackboneType("Contract.term.offer")]
+    [FhirType("Contract.term.offer", IsBackboneType=true)]
     public partial class ContractOfferComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Contract#ContractOffer"; } }
+      public override string TypeName { get { return "Contract.term.offer"; } }
 
       /// <summary>
       /// Offer business ID
@@ -1666,14 +1662,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Contract#ContractParty")]
-    [BackboneType("Contract.term.offer.party")]
+    [FhirType("Contract.term.offer.party", IsBackboneType=true)]
     public partial class ContractPartyComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Contract#ContractParty"; } }
+      public override string TypeName { get { return "Contract.term.offer.party"; } }
 
       /// <summary>
       /// Referenced entity
@@ -1819,14 +1814,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Contract#Answer")]
-    [BackboneType("Contract.term.offer.answer")]
+    [FhirType("Contract.term.offer.answer", IsBackboneType=true)]
     public partial class AnswerComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Contract#Answer"; } }
+      public override string TypeName { get { return "Contract.term.offer.answer"; } }
 
       /// <summary>
       /// The actual answer response
@@ -1946,14 +1940,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Contract#ContractAsset")]
-    [BackboneType("Contract.term.asset")]
+    [FhirType("Contract.term.asset", IsBackboneType=true)]
     public partial class ContractAssetComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Contract#ContractAsset"; } }
+      public override string TypeName { get { return "Contract.term.asset"; } }
 
       /// <summary>
       /// Range of asset
@@ -2509,14 +2502,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Contract#AssetContext")]
-    [BackboneType("Contract.term.asset.context")]
+    [FhirType("Contract.term.asset.context", IsBackboneType=true)]
     public partial class AssetContextComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Contract#AssetContext"; } }
+      public override string TypeName { get { return "Contract.term.asset.context"; } }
 
       /// <summary>
       /// Creator,custodian or owner
@@ -2704,14 +2696,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Contract#ValuedItem")]
-    [BackboneType("Contract.term.asset.valuedItem")]
+    [FhirType("Contract.term.asset.valuedItem", IsBackboneType=true)]
     public partial class ValuedItemComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Contract#ValuedItem"; } }
+      public override string TypeName { get { return "Contract.term.asset.valuedItem"; } }
 
       /// <summary>
       /// Contract Valued Item Type
@@ -3292,14 +3283,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Contract#Action")]
-    [BackboneType("Contract.term.action")]
+    [FhirType("Contract.term.action", IsBackboneType=true)]
     public partial class ActionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Contract#Action"; } }
+      public override string TypeName { get { return "Contract.term.action"; } }
 
       /// <summary>
       /// True if the term prohibits the  action
@@ -4091,14 +4081,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Contract#ActionSubject")]
-    [BackboneType("Contract.term.action.subject")]
+    [FhirType("Contract.term.action.subject", IsBackboneType=true)]
     public partial class ActionSubjectComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Contract#ActionSubject"; } }
+      public override string TypeName { get { return "Contract.term.action.subject"; } }
 
       /// <summary>
       /// Entity of the action
@@ -4248,14 +4237,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Contract#Signatory")]
-    [BackboneType("Contract.signer")]
+    [FhirType("Contract.signer", IsBackboneType=true)]
     public partial class SignatoryComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Contract#Signatory"; } }
+      public override string TypeName { get { return "Contract.signer"; } }
 
       /// <summary>
       /// Contract Signatory Role
@@ -4430,14 +4418,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Contract#FriendlyLanguage")]
-    [BackboneType("Contract.friendly")]
+    [FhirType("Contract.friendly", IsBackboneType=true)]
     public partial class FriendlyLanguageComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Contract#FriendlyLanguage"; } }
+      public override string TypeName { get { return "Contract.friendly"; } }
 
       /// <summary>
       /// Easily comprehended representation of this Contract
@@ -4560,14 +4547,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Contract#LegalLanguage")]
-    [BackboneType("Contract.legal")]
+    [FhirType("Contract.legal", IsBackboneType=true)]
     public partial class LegalLanguageComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Contract#LegalLanguage"; } }
+      public override string TypeName { get { return "Contract.legal"; } }
 
       /// <summary>
       /// Contract Legal Text
@@ -4690,14 +4676,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Contract#ComputableLanguage")]
-    [BackboneType("Contract.rule")]
+    [FhirType("Contract.rule", IsBackboneType=true)]
     public partial class ComputableLanguageComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Contract#ComputableLanguage"; } }
+      public override string TypeName { get { return "Contract.rule"; } }
 
       /// <summary>
       /// Computable Contract Rules
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Coverage.cs b/src/Hl7.Fhir.R4B/Model/Generated/Coverage.cs
index 963ec70ca3..13e41ca46f 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/Coverage.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/Coverage.cs
@@ -69,14 +69,13 @@ public partial class Coverage : Hl7.Fhir.Model.DomainResource, IIdentifiable<Lis
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Coverage#Class")]
-    [BackboneType("Coverage.class")]
+    [FhirType("Coverage.class", IsBackboneType=true)]
     public partial class ClassComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Coverage#Class"; } }
+      public override string TypeName { get { return "Coverage.class"; } }
 
       /// <summary>
       /// Type of class such as 'group' or 'plan'
@@ -285,14 +284,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Coverage#CostToBeneficiary")]
-    [BackboneType("Coverage.costToBeneficiary")]
+    [FhirType("Coverage.costToBeneficiary", IsBackboneType=true)]
     public partial class CostToBeneficiaryComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Coverage#CostToBeneficiary"; } }
+      public override string TypeName { get { return "Coverage.costToBeneficiary"; } }
 
       /// <summary>
       /// Cost category
@@ -466,14 +464,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Coverage#Exemption")]
-    [BackboneType("Coverage.costToBeneficiary.exception")]
+    [FhirType("Coverage.costToBeneficiary.exception", IsBackboneType=true)]
     public partial class ExemptionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Coverage#Exemption"; } }
+      public override string TypeName { get { return "Coverage.costToBeneficiary.exception"; } }
 
       /// <summary>
       /// Exception category
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/CoverageEligibilityRequest.cs b/src/Hl7.Fhir.R4B/Model/Generated/CoverageEligibilityRequest.cs
index 8e9def6f3d..d8ee875942 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/CoverageEligibilityRequest.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/CoverageEligibilityRequest.cs
@@ -102,14 +102,13 @@ public enum EligibilityRequestPurpose
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CoverageEligibilityRequest#SupportingInformation")]
-    [BackboneType("CoverageEligibilityRequest.supportingInfo")]
+    [FhirType("CoverageEligibilityRequest.supportingInfo", IsBackboneType=true)]
     public partial class SupportingInformationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "CoverageEligibilityRequest#SupportingInformation"; } }
+      public override string TypeName { get { return "CoverageEligibilityRequest.supportingInfo"; } }
 
       /// <summary>
       /// Information instance identifier
@@ -319,14 +318,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CoverageEligibilityRequest#Insurance")]
-    [BackboneType("CoverageEligibilityRequest.insurance")]
+    [FhirType("CoverageEligibilityRequest.insurance", IsBackboneType=true)]
     public partial class InsuranceComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "CoverageEligibilityRequest#Insurance"; } }
+      public override string TypeName { get { return "CoverageEligibilityRequest.insurance"; } }
 
       /// <summary>
       /// Applicable coverage
@@ -534,14 +532,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CoverageEligibilityRequest#Details")]
-    [BackboneType("CoverageEligibilityRequest.item")]
+    [FhirType("CoverageEligibilityRequest.item", IsBackboneType=true)]
     public partial class DetailsComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "CoverageEligibilityRequest#Details"; } }
+      public override string TypeName { get { return "CoverageEligibilityRequest.item"; } }
 
       /// <summary>
       /// Applicable exception or supporting information
@@ -916,14 +913,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CoverageEligibilityRequest#Diagnosis")]
-    [BackboneType("CoverageEligibilityRequest.item.diagnosis")]
+    [FhirType("CoverageEligibilityRequest.item.diagnosis", IsBackboneType=true)]
     public partial class DiagnosisComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "CoverageEligibilityRequest#Diagnosis"; } }
+      public override string TypeName { get { return "CoverageEligibilityRequest.item.diagnosis"; } }
 
       /// <summary>
       /// Nature of illness or problem
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/CoverageEligibilityResponse.cs b/src/Hl7.Fhir.R4B/Model/Generated/CoverageEligibilityResponse.cs
index f41ccce207..21523ca2eb 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/CoverageEligibilityResponse.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/CoverageEligibilityResponse.cs
@@ -102,14 +102,13 @@ public enum EligibilityResponsePurpose
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CoverageEligibilityResponse#Insurance")]
-    [BackboneType("CoverageEligibilityResponse.insurance")]
+    [FhirType("CoverageEligibilityResponse.insurance", IsBackboneType=true)]
     public partial class InsuranceComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "CoverageEligibilityResponse#Insurance"; } }
+      public override string TypeName { get { return "CoverageEligibilityResponse.insurance"; } }
 
       /// <summary>
       /// Insurance information
@@ -325,14 +324,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CoverageEligibilityResponse#Items")]
-    [BackboneType("CoverageEligibilityResponse.insurance.item")]
+    [FhirType("CoverageEligibilityResponse.insurance.item", IsBackboneType=true)]
     public partial class ItemsComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "CoverageEligibilityResponse#Items"; } }
+      public override string TypeName { get { return "CoverageEligibilityResponse.insurance.item"; } }
 
       /// <summary>
       /// Benefit classification
@@ -878,14 +876,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CoverageEligibilityResponse#Benefit")]
-    [BackboneType("CoverageEligibilityResponse.insurance.item.benefit")]
+    [FhirType("CoverageEligibilityResponse.insurance.item.benefit", IsBackboneType=true)]
     public partial class BenefitComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "CoverageEligibilityResponse#Benefit"; } }
+      public override string TypeName { get { return "CoverageEligibilityResponse.insurance.item.benefit"; } }
 
       /// <summary>
       /// Benefit classification
@@ -1060,14 +1057,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CoverageEligibilityResponse#Errors")]
-    [BackboneType("CoverageEligibilityResponse.error")]
+    [FhirType("CoverageEligibilityResponse.error", IsBackboneType=true)]
     public partial class ErrorsComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "CoverageEligibilityResponse#Errors"; } }
+      public override string TypeName { get { return "CoverageEligibilityResponse.error"; } }
 
       /// <summary>
       /// Error code detailing processing issues
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/DataRequirement.cs b/src/Hl7.Fhir.R4B/Model/Generated/DataRequirement.cs
index 7963be359b..278501a5fa 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/DataRequirement.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/DataRequirement.cs
@@ -89,14 +89,13 @@ public enum SortDirection
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("DataRequirement#CodeFilter")]
-    [BackboneType("DataRequirement.codeFilter")]
+    [FhirType("DataRequirement.codeFilter", IsBackboneType=true)]
     public partial class CodeFilterComponent : Hl7.Fhir.Model.Element
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "DataRequirement#CodeFilter"; } }
+      public override string TypeName { get { return "DataRequirement.codeFilter"; } }
 
       /// <summary>
       /// A code-valued attribute to filter on
@@ -345,14 +344,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("DataRequirement#DateFilter")]
-    [BackboneType("DataRequirement.dateFilter")]
+    [FhirType("DataRequirement.dateFilter", IsBackboneType=true)]
     public partial class DateFilterComponent : Hl7.Fhir.Model.Element
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "DataRequirement#DateFilter"; } }
+      public override string TypeName { get { return "DataRequirement.dateFilter"; } }
 
       /// <summary>
       /// A date-valued attribute to filter on
@@ -560,14 +558,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("DataRequirement#Sort")]
-    [BackboneType("DataRequirement.sort")]
+    [FhirType("DataRequirement.sort", IsBackboneType=true)]
     public partial class SortComponent : Hl7.Fhir.Model.Element
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "DataRequirement#Sort"; } }
+      public override string TypeName { get { return "DataRequirement.sort"; } }
 
       /// <summary>
       /// The name of the attribute to perform the sort
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/DetectedIssue.cs b/src/Hl7.Fhir.R4B/Model/Generated/DetectedIssue.cs
index 31b07de624..821671cad6 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/DetectedIssue.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/DetectedIssue.cs
@@ -95,14 +95,13 @@ public enum DetectedIssueSeverity
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("DetectedIssue#Evidence")]
-    [BackboneType("DetectedIssue.evidence")]
+    [FhirType("DetectedIssue.evidence", IsBackboneType=true)]
     public partial class EvidenceComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "DetectedIssue#Evidence"; } }
+      public override string TypeName { get { return "DetectedIssue.evidence"; } }
 
       /// <summary>
       /// Manifestation
@@ -251,14 +250,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("DetectedIssue#Mitigation")]
-    [BackboneType("DetectedIssue.mitigation")]
+    [FhirType("DetectedIssue.mitigation", IsBackboneType=true)]
     public partial class MitigationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "DetectedIssue#Mitigation"; } }
+      public override string TypeName { get { return "DetectedIssue.mitigation"; } }
 
       /// <summary>
       /// What mitigation?
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Device.cs b/src/Hl7.Fhir.R4B/Model/Generated/Device.cs
index 1183f733b6..6c41a9e54b 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/Device.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/Device.cs
@@ -148,14 +148,13 @@ public enum UDIEntryType
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Device#UdiCarrier")]
-    [BackboneType("Device.udiCarrier")]
+    [FhirType("Device.udiCarrier", IsBackboneType=true)]
     public partial class UdiCarrierComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Device#UdiCarrier"; } }
+      public override string TypeName { get { return "Device.udiCarrier"; } }
 
       /// <summary>
       /// Mandatory fixed portion of UDI
@@ -509,14 +508,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Device#DeviceName")]
-    [BackboneType("Device.deviceName")]
+    [FhirType("Device.deviceName", IsBackboneType=true)]
     public partial class DeviceNameComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Device#DeviceName"; } }
+      public override string TypeName { get { return "Device.deviceName"; } }
 
       /// <summary>
       /// The name that identifies the device
@@ -697,14 +695,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Device#Specialization")]
-    [BackboneType("Device.specialization")]
+    [FhirType("Device.specialization", IsBackboneType=true)]
     public partial class SpecializationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Device#Specialization"; } }
+      public override string TypeName { get { return "Device.specialization"; } }
 
       /// <summary>
       /// The standard that is used to operate and communicate
@@ -864,14 +861,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Device#Version")]
-    [BackboneType("Device.version")]
+    [FhirType("Device.version", IsBackboneType=true)]
     public partial class VersionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Device#Version"; } }
+      public override string TypeName { get { return "Device.version"; } }
 
       /// <summary>
       /// The type of the device version, e.g. manufacturer, approved, internal
@@ -1056,14 +1052,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Device#Property")]
-    [BackboneType("Device.property")]
+    [FhirType("Device.property", IsBackboneType=true)]
     public partial class PropertyComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Device#Property"; } }
+      public override string TypeName { get { return "Device.property"; } }
 
       /// <summary>
       /// Code that specifies the property DeviceDefinitionPropetyCode (Extensible)
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/DeviceDefinition.cs b/src/Hl7.Fhir.R4B/Model/Generated/DeviceDefinition.cs
index 780efc82c8..ea7676ce37 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/DeviceDefinition.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/DeviceDefinition.cs
@@ -68,14 +68,13 @@ public partial class DeviceDefinition : Hl7.Fhir.Model.DomainResource, IIdentifi
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("DeviceDefinition#UdiDeviceIdentifier")]
-    [BackboneType("DeviceDefinition.udiDeviceIdentifier")]
+    [FhirType("DeviceDefinition.udiDeviceIdentifier", IsBackboneType=true)]
     public partial class UdiDeviceIdentifierComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "DeviceDefinition#UdiDeviceIdentifier"; } }
+      public override string TypeName { get { return "DeviceDefinition.udiDeviceIdentifier"; } }
 
       /// <summary>
       /// The identifier that is to be associated with every Device that references this DeviceDefintiion for the issuer and jurisdication porvided in the DeviceDefinition.udiDeviceIdentifier
@@ -298,14 +297,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("DeviceDefinition#DeviceName")]
-    [BackboneType("DeviceDefinition.deviceName")]
+    [FhirType("DeviceDefinition.deviceName", IsBackboneType=true)]
     public partial class DeviceNameComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "DeviceDefinition#DeviceName"; } }
+      public override string TypeName { get { return "DeviceDefinition.deviceName"; } }
 
       /// <summary>
       /// The name of the device
@@ -486,14 +484,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("DeviceDefinition#Specialization")]
-    [BackboneType("DeviceDefinition.specialization")]
+    [FhirType("DeviceDefinition.specialization", IsBackboneType=true)]
     public partial class SpecializationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "DeviceDefinition#Specialization"; } }
+      public override string TypeName { get { return "DeviceDefinition.specialization"; } }
 
       /// <summary>
       /// The standard that is used to operate and communicate
@@ -671,14 +668,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("DeviceDefinition#Capability")]
-    [BackboneType("DeviceDefinition.capability")]
+    [FhirType("DeviceDefinition.capability", IsBackboneType=true)]
     public partial class CapabilityComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "DeviceDefinition#Capability"; } }
+      public override string TypeName { get { return "DeviceDefinition.capability"; } }
 
       /// <summary>
       /// Type of capability
@@ -821,14 +817,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("DeviceDefinition#Property")]
-    [BackboneType("DeviceDefinition.property")]
+    [FhirType("DeviceDefinition.property", IsBackboneType=true)]
     public partial class PropertyComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "DeviceDefinition#Property"; } }
+      public override string TypeName { get { return "DeviceDefinition.property"; } }
 
       /// <summary>
       /// Code that specifies the property DeviceDefinitionPropetyCode (Extensible)
@@ -997,14 +992,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("DeviceDefinition#Material")]
-    [BackboneType("DeviceDefinition.material")]
+    [FhirType("DeviceDefinition.material", IsBackboneType=true)]
     public partial class MaterialComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "DeviceDefinition#Material"; } }
+      public override string TypeName { get { return "DeviceDefinition.material"; } }
 
       /// <summary>
       /// The substance
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/DeviceMetric.cs b/src/Hl7.Fhir.R4B/Model/Generated/DeviceMetric.cs
index f7c4b8beee..91ca6692c1 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/DeviceMetric.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/DeviceMetric.cs
@@ -259,14 +259,13 @@ public enum DeviceMetricCalibrationState
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("DeviceMetric#Calibration")]
-    [BackboneType("DeviceMetric.calibration")]
+    [FhirType("DeviceMetric.calibration", IsBackboneType=true)]
     public partial class CalibrationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "DeviceMetric#Calibration"; } }
+      public override string TypeName { get { return "DeviceMetric.calibration"; } }
 
       /// <summary>
       /// unspecified | offset | gain | two-point
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/DeviceRequest.cs b/src/Hl7.Fhir.R4B/Model/Generated/DeviceRequest.cs
index 6d6fe78f41..dca0d43f3e 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/DeviceRequest.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/DeviceRequest.cs
@@ -67,14 +67,13 @@ public partial class DeviceRequest : Hl7.Fhir.Model.DomainResource, IIdentifiabl
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("DeviceRequest#Parameter")]
-    [BackboneType("DeviceRequest.parameter")]
+    [FhirType("DeviceRequest.parameter", IsBackboneType=true)]
     public partial class ParameterComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "DeviceRequest#Parameter"; } }
+      public override string TypeName { get { return "DeviceRequest.parameter"; } }
 
       /// <summary>
       /// Device detail
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/DiagnosticReport.cs b/src/Hl7.Fhir.R4B/Model/Generated/DiagnosticReport.cs
index fcdbb05260..8ecc5756ac 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/DiagnosticReport.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/DiagnosticReport.cs
@@ -138,14 +138,13 @@ public enum DiagnosticReportStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("DiagnosticReport#Media")]
-    [BackboneType("DiagnosticReport.media")]
+    [FhirType("DiagnosticReport.media", IsBackboneType=true)]
     public partial class MediaComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "DiagnosticReport#Media"; } }
+      public override string TypeName { get { return "DiagnosticReport.media"; } }
 
       /// <summary>
       /// Comment about the image (e.g. explanation)
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/DocumentManifest.cs b/src/Hl7.Fhir.R4B/Model/Generated/DocumentManifest.cs
index 7b82d81bf5..221cc60b49 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/DocumentManifest.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/DocumentManifest.cs
@@ -68,14 +68,13 @@ public partial class DocumentManifest : Hl7.Fhir.Model.DomainResource, IIdentifi
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("DocumentManifest#Related")]
-    [BackboneType("DocumentManifest.related")]
+    [FhirType("DocumentManifest.related", IsBackboneType=true)]
     public partial class RelatedComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "DocumentManifest#Related"; } }
+      public override string TypeName { get { return "DocumentManifest.related"; } }
 
       /// <summary>
       /// Identifiers of things that are related
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/DocumentReference.cs b/src/Hl7.Fhir.R4B/Model/Generated/DocumentReference.cs
index ad165f137f..6089f9f418 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/DocumentReference.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/DocumentReference.cs
@@ -69,14 +69,13 @@ public partial class DocumentReference : Hl7.Fhir.Model.DomainResource, IIdentif
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("DocumentReference#RelatesTo")]
-    [BackboneType("DocumentReference.relatesTo")]
+    [FhirType("DocumentReference.relatesTo", IsBackboneType=true)]
     public partial class RelatesToComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "DocumentReference#RelatesTo"; } }
+      public override string TypeName { get { return "DocumentReference.relatesTo"; } }
 
       /// <summary>
       /// replaces | transforms | signs | appends
@@ -244,14 +243,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("DocumentReference#Content")]
-    [BackboneType("DocumentReference.content")]
+    [FhirType("DocumentReference.content", IsBackboneType=true)]
     public partial class ContentComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "DocumentReference#Content"; } }
+      public override string TypeName { get { return "DocumentReference.content"; } }
 
       /// <summary>
       /// Where to access the document
@@ -398,14 +396,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("DocumentReference#Context")]
-    [BackboneType("DocumentReference.context")]
+    [FhirType("DocumentReference.context", IsBackboneType=true)]
     public partial class ContextComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "DocumentReference#Context"; } }
+      public override string TypeName { get { return "DocumentReference.context"; } }
 
       /// <summary>
       /// Context of the document  content
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Dosage.cs b/src/Hl7.Fhir.R4B/Model/Generated/Dosage.cs
index 13dbac9512..284f4de6cc 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/Dosage.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/Dosage.cs
@@ -67,14 +67,13 @@ public partial class Dosage : Hl7.Fhir.Model.BackboneType
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Dosage#DoseAndRate")]
-    [BackboneType("Dosage.doseAndRate")]
+    [FhirType("Dosage.doseAndRate", IsBackboneType=true)]
     public partial class DoseAndRateComponent : Hl7.Fhir.Model.Element
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Dosage#DoseAndRate"; } }
+      public override string TypeName { get { return "Dosage.doseAndRate"; } }
 
       /// <summary>
       /// The kind of dose or rate specified
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Encounter.cs b/src/Hl7.Fhir.R4B/Model/Generated/Encounter.cs
index ca574239a3..1d35ae3a75 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/Encounter.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/Encounter.cs
@@ -168,14 +168,13 @@ public enum EncounterLocationStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Encounter#StatusHistory")]
-    [BackboneType("Encounter.statusHistory")]
+    [FhirType("Encounter.statusHistory", IsBackboneType=true)]
     public partial class StatusHistoryComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Encounter#StatusHistory"; } }
+      public override string TypeName { get { return "Encounter.statusHistory"; } }
 
       /// <summary>
       /// planned | arrived | triaged | in-progress | onleave | finished | cancelled +
@@ -341,14 +340,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Encounter#ClassHistory")]
-    [BackboneType("Encounter.classHistory")]
+    [FhirType("Encounter.classHistory", IsBackboneType=true)]
     public partial class ClassHistoryComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Encounter#ClassHistory"; } }
+      public override string TypeName { get { return "Encounter.classHistory"; } }
 
       /// <summary>
       /// inpatient | outpatient | ambulatory | emergency +
@@ -495,14 +493,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Encounter#Participant")]
-    [BackboneType("Encounter.participant")]
+    [FhirType("Encounter.participant", IsBackboneType=true)]
     public partial class ParticipantComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Encounter#Participant"; } }
+      public override string TypeName { get { return "Encounter.participant"; } }
 
       /// <summary>
       /// Role of participant in encounter
@@ -672,14 +669,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Encounter#Diagnosis")]
-    [BackboneType("Encounter.diagnosis")]
+    [FhirType("Encounter.diagnosis", IsBackboneType=true)]
     public partial class DiagnosisComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Encounter#Diagnosis"; } }
+      public override string TypeName { get { return "Encounter.diagnosis"; } }
 
       /// <summary>
       /// The diagnosis or procedure relevant to the encounter
@@ -871,14 +867,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Encounter#Hospitalization")]
-    [BackboneType("Encounter.hospitalization")]
+    [FhirType("Encounter.hospitalization", IsBackboneType=true)]
     public partial class HospitalizationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Encounter#Hospitalization"; } }
+      public override string TypeName { get { return "Encounter.hospitalization"; } }
 
       /// <summary>
       /// Pre-admission identifier
@@ -1211,14 +1206,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Encounter#Location")]
-    [BackboneType("Encounter.location")]
+    [FhirType("Encounter.location", IsBackboneType=true)]
     public partial class LocationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Encounter#Location"; } }
+      public override string TypeName { get { return "Encounter.location"; } }
 
       /// <summary>
       /// Location the encounter takes place
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/EpisodeOfCare.cs b/src/Hl7.Fhir.R4B/Model/Generated/EpisodeOfCare.cs
index 042b963cdc..531d182042 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/EpisodeOfCare.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/EpisodeOfCare.cs
@@ -119,14 +119,13 @@ public enum EpisodeOfCareStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("EpisodeOfCare#StatusHistory")]
-    [BackboneType("EpisodeOfCare.statusHistory")]
+    [FhirType("EpisodeOfCare.statusHistory", IsBackboneType=true)]
     public partial class StatusHistoryComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "EpisodeOfCare#StatusHistory"; } }
+      public override string TypeName { get { return "EpisodeOfCare.statusHistory"; } }
 
       /// <summary>
       /// planned | waitlist | active | onhold | finished | cancelled | entered-in-error
@@ -289,14 +288,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("EpisodeOfCare#Diagnosis")]
-    [BackboneType("EpisodeOfCare.diagnosis")]
+    [FhirType("EpisodeOfCare.diagnosis", IsBackboneType=true)]
     public partial class DiagnosisComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "EpisodeOfCare#Diagnosis"; } }
+      public override string TypeName { get { return "EpisodeOfCare.diagnosis"; } }
 
       /// <summary>
       /// Conditions/problems/diagnoses this episode of care is for
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Evidence.cs b/src/Hl7.Fhir.R4B/Model/Generated/Evidence.cs
index 854c959798..3bb6057f80 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/Evidence.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/Evidence.cs
@@ -64,14 +64,13 @@ public partial class Evidence : Hl7.Fhir.Model.DomainResource, IIdentifiable<Lis
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Evidence#VariableDefinition")]
-    [BackboneType("Evidence.variableDefinition")]
+    [FhirType("Evidence.variableDefinition", IsBackboneType=true)]
     public partial class VariableDefinitionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Evidence#VariableDefinition"; } }
+      public override string TypeName { get { return "Evidence.variableDefinition"; } }
 
       /// <summary>
       /// A text description or summary of the variable
@@ -338,14 +337,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Evidence#Statistic")]
-    [BackboneType("Evidence.statistic")]
+    [FhirType("Evidence.statistic", IsBackboneType=true)]
     public partial class StatisticComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Evidence#Statistic"; } }
+      public override string TypeName { get { return "Evidence.statistic"; } }
 
       /// <summary>
       /// Description of content
@@ -744,14 +742,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Evidence#SampleSize")]
-    [BackboneType("Evidence.statistic.sampleSize")]
+    [FhirType("Evidence.statistic.sampleSize", IsBackboneType=true)]
     public partial class SampleSizeComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Evidence#SampleSize"; } }
+      public override string TypeName { get { return "Evidence.statistic.sampleSize"; } }
 
       /// <summary>
       /// Textual description of sample size for statistic
@@ -1043,14 +1040,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Evidence#AttributeEstimate")]
-    [BackboneType("Evidence.statistic.attributeEstimate")]
+    [FhirType("Evidence.statistic.attributeEstimate", IsBackboneType=true)]
     public partial class AttributeEstimateComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Evidence#AttributeEstimate"; } }
+      public override string TypeName { get { return "Evidence.statistic.attributeEstimate"; } }
 
       /// <summary>
       /// Textual description of the attribute estimate
@@ -1358,14 +1354,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Evidence#ModelCharacteristic")]
-    [BackboneType("Evidence.statistic.modelCharacteristic")]
+    [FhirType("Evidence.statistic.modelCharacteristic", IsBackboneType=true)]
     public partial class ModelCharacteristicComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Evidence#ModelCharacteristic"; } }
+      public override string TypeName { get { return "Evidence.statistic.modelCharacteristic"; } }
 
       /// <summary>
       /// Model specification
@@ -1560,14 +1555,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Evidence#Variable")]
-    [BackboneType("Evidence.statistic.modelCharacteristic.variable")]
+    [FhirType("Evidence.statistic.modelCharacteristic.variable", IsBackboneType=true)]
     public partial class VariableComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Evidence#Variable"; } }
+      public override string TypeName { get { return "Evidence.statistic.modelCharacteristic.variable"; } }
 
       /// <summary>
       /// Description of the variable
@@ -1812,14 +1806,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Evidence#Certainty")]
-    [BackboneType("Evidence.certainty")]
+    [FhirType("Evidence.certainty", IsBackboneType=true)]
     public partial class CertaintyComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Evidence#Certainty"; } }
+      public override string TypeName { get { return "Evidence.certainty"; } }
 
       /// <summary>
       /// Textual description of certainty
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/EvidenceReport.cs b/src/Hl7.Fhir.R4B/Model/Generated/EvidenceReport.cs
index d9dc63e508..95078ee47f 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/EvidenceReport.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/EvidenceReport.cs
@@ -126,14 +126,13 @@ public enum ReportRelationshipType
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("EvidenceReport#Subject")]
-    [BackboneType("EvidenceReport.subject")]
+    [FhirType("EvidenceReport.subject", IsBackboneType=true)]
     public partial class SubjectComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "EvidenceReport#Subject"; } }
+      public override string TypeName { get { return "EvidenceReport.subject"; } }
 
       /// <summary>
       /// Characteristic
@@ -276,14 +275,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("EvidenceReport#Characteristic")]
-    [BackboneType("EvidenceReport.subject.characteristic")]
+    [FhirType("EvidenceReport.subject.characteristic", IsBackboneType=true)]
     public partial class CharacteristicComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "EvidenceReport#Characteristic"; } }
+      public override string TypeName { get { return "EvidenceReport.subject.characteristic"; } }
 
       /// <summary>
       /// Characteristic code
@@ -502,14 +500,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("EvidenceReport#RelatesTo")]
-    [BackboneType("EvidenceReport.relatesTo")]
+    [FhirType("EvidenceReport.relatesTo", IsBackboneType=true)]
     public partial class RelatesToComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "EvidenceReport#RelatesTo"; } }
+      public override string TypeName { get { return "EvidenceReport.relatesTo"; } }
 
       /// <summary>
       /// replaces | amends | appends | transforms | replacedWith | amendedWith | appendedWith | transformedWith
@@ -678,14 +675,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("EvidenceReport#Section")]
-    [BackboneType("EvidenceReport.section")]
+    [FhirType("EvidenceReport.section", IsBackboneType=true)]
     public partial class SectionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "EvidenceReport#Section"; } }
+      public override string TypeName { get { return "EvidenceReport.section"; } }
 
       /// <summary>
       /// Label for section (e.g. for ToC)
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/EvidenceVariable.cs b/src/Hl7.Fhir.R4B/Model/Generated/EvidenceVariable.cs
index 4160382221..ebb71805c5 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/EvidenceVariable.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/EvidenceVariable.cs
@@ -91,14 +91,13 @@ public enum CharacteristicCombinationCode
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("EvidenceVariable#Characteristic")]
-    [BackboneType("EvidenceVariable.characteristic")]
+    [FhirType("EvidenceVariable.characteristic", IsBackboneType=true)]
     public partial class CharacteristicComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "EvidenceVariable#Characteristic"; } }
+      public override string TypeName { get { return "EvidenceVariable.characteristic"; } }
 
       /// <summary>
       /// Natural language description of the characteristic
@@ -430,14 +429,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("EvidenceVariable#TimeFromStart")]
-    [BackboneType("EvidenceVariable.characteristic.timeFromStart")]
+    [FhirType("EvidenceVariable.characteristic.timeFromStart", IsBackboneType=true)]
     public partial class TimeFromStartComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "EvidenceVariable#TimeFromStart"; } }
+      public override string TypeName { get { return "EvidenceVariable.characteristic.timeFromStart"; } }
 
       /// <summary>
       /// Human readable description
@@ -650,14 +648,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("EvidenceVariable#Category")]
-    [BackboneType("EvidenceVariable.category")]
+    [FhirType("EvidenceVariable.category", IsBackboneType=true)]
     public partial class CategoryComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "EvidenceVariable#Category"; } }
+      public override string TypeName { get { return "EvidenceVariable.category"; } }
 
       /// <summary>
       /// Description of the grouping
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/ExampleScenario.cs b/src/Hl7.Fhir.R4B/Model/Generated/ExampleScenario.cs
index 1ee9fa6348..0a1726554a 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/ExampleScenario.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/ExampleScenario.cs
@@ -83,14 +83,13 @@ public enum ExampleScenarioActorType
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("ExampleScenario#Actor")]
-    [BackboneType("ExampleScenario.actor")]
+    [FhirType("ExampleScenario.actor", IsBackboneType=true)]
     public partial class ActorComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ExampleScenario#Actor"; } }
+      public override string TypeName { get { return "ExampleScenario.actor"; } }
 
       /// <summary>
       /// ID or acronym of the actor
@@ -357,14 +356,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("ExampleScenario#Instance")]
-    [BackboneType("ExampleScenario.instance")]
+    [FhirType("ExampleScenario.instance", IsBackboneType=true)]
     public partial class InstanceComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ExampleScenario#Instance"; } }
+      public override string TypeName { get { return "ExampleScenario.instance"; } }
 
       /// <summary>
       /// The id of the resource for referencing
@@ -683,14 +681,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("ExampleScenario#Version")]
-    [BackboneType("ExampleScenario.instance.version")]
+    [FhirType("ExampleScenario.instance.version", IsBackboneType=true)]
     public partial class VersionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ExampleScenario#Version"; } }
+      public override string TypeName { get { return "ExampleScenario.instance.version"; } }
 
       /// <summary>
       /// The identifier of a specific version of a resource
@@ -872,14 +869,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExampleScenario#ContainedInstance")]
-    [BackboneType("ExampleScenario.instance.containedInstance")]
+    [FhirType("ExampleScenario.instance.containedInstance", IsBackboneType=true)]
     public partial class ContainedInstanceComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ExampleScenario#ContainedInstance"; } }
+      public override string TypeName { get { return "ExampleScenario.instance.containedInstance"; } }
 
       /// <summary>
       /// Each resource contained in the instance
@@ -1057,14 +1053,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("ExampleScenario#Process")]
-    [BackboneType("ExampleScenario.process")]
+    [FhirType("ExampleScenario.process", IsBackboneType=true)]
     public partial class ProcessComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ExampleScenario#Process"; } }
+      public override string TypeName { get { return "ExampleScenario.process"; } }
 
       /// <summary>
       /// The diagram title of the group of operations
@@ -1354,14 +1349,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("ExampleScenario#Step")]
-    [BackboneType("ExampleScenario.process.step")]
+    [FhirType("ExampleScenario.process.step", IsBackboneType=true)]
     public partial class StepComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ExampleScenario#Step"; } }
+      public override string TypeName { get { return "ExampleScenario.process.step"; } }
 
       /// <summary>
       /// Nested process
@@ -1572,14 +1566,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("ExampleScenario#Operation")]
-    [BackboneType("ExampleScenario.process.step.operation")]
+    [FhirType("ExampleScenario.process.step.operation", IsBackboneType=true)]
     public partial class OperationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ExampleScenario#Operation"; } }
+      public override string TypeName { get { return "ExampleScenario.process.step.operation"; } }
 
       /// <summary>
       /// The sequential number of the interaction
@@ -2068,14 +2061,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExampleScenario#Alternative")]
-    [BackboneType("ExampleScenario.process.step.alternative")]
+    [FhirType("ExampleScenario.process.step.alternative", IsBackboneType=true)]
     public partial class AlternativeComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ExampleScenario#Alternative"; } }
+      public override string TypeName { get { return "ExampleScenario.process.step.alternative"; } }
 
       /// <summary>
       /// Label for alternative
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/ExplanationOfBenefit.cs b/src/Hl7.Fhir.R4B/Model/Generated/ExplanationOfBenefit.cs
index 7acd921cf3..7cc5ec41fd 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/ExplanationOfBenefit.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/ExplanationOfBenefit.cs
@@ -102,14 +102,13 @@ public enum ExplanationOfBenefitStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#RelatedClaim")]
-    [BackboneType("ExplanationOfBenefit.related")]
+    [FhirType("ExplanationOfBenefit.related", IsBackboneType=true)]
     public partial class RelatedClaimComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ExplanationOfBenefit#RelatedClaim"; } }
+      public override string TypeName { get { return "ExplanationOfBenefit.related"; } }
 
       /// <summary>
       /// Reference to the related claim
@@ -282,14 +281,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#Payee")]
-    [BackboneType("ExplanationOfBenefit.payee")]
+    [FhirType("ExplanationOfBenefit.payee", IsBackboneType=true)]
     public partial class PayeeComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ExplanationOfBenefit#Payee"; } }
+      public override string TypeName { get { return "ExplanationOfBenefit.payee"; } }
 
       /// <summary>
       /// Category of recipient
@@ -436,14 +434,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#CareTeam")]
-    [BackboneType("ExplanationOfBenefit.careTeam")]
+    [FhirType("ExplanationOfBenefit.careTeam", IsBackboneType=true)]
     public partial class CareTeamComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ExplanationOfBenefit#CareTeam"; } }
+      public override string TypeName { get { return "ExplanationOfBenefit.careTeam"; } }
 
       /// <summary>
       /// Order of care team
@@ -705,14 +702,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#SupportingInformation")]
-    [BackboneType("ExplanationOfBenefit.supportingInfo")]
+    [FhirType("ExplanationOfBenefit.supportingInfo", IsBackboneType=true)]
     public partial class SupportingInformationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ExplanationOfBenefit#SupportingInformation"; } }
+      public override string TypeName { get { return "ExplanationOfBenefit.supportingInfo"; } }
 
       /// <summary>
       /// Information instance identifier
@@ -984,14 +980,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#Diagnosis")]
-    [BackboneType("ExplanationOfBenefit.diagnosis")]
+    [FhirType("ExplanationOfBenefit.diagnosis", IsBackboneType=true)]
     public partial class DiagnosisComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ExplanationOfBenefit#Diagnosis"; } }
+      public override string TypeName { get { return "ExplanationOfBenefit.diagnosis"; } }
 
       /// <summary>
       /// Diagnosis instance identifier
@@ -1238,14 +1233,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#Procedure")]
-    [BackboneType("ExplanationOfBenefit.procedure")]
+    [FhirType("ExplanationOfBenefit.procedure", IsBackboneType=true)]
     public partial class ProcedureComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ExplanationOfBenefit#Procedure"; } }
+      public override string TypeName { get { return "ExplanationOfBenefit.procedure"; } }
 
       /// <summary>
       /// Procedure instance identifier
@@ -1512,14 +1506,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#Insurance")]
-    [BackboneType("ExplanationOfBenefit.insurance")]
+    [FhirType("ExplanationOfBenefit.insurance", IsBackboneType=true)]
     public partial class InsuranceComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ExplanationOfBenefit#Insurance"; } }
+      public override string TypeName { get { return "ExplanationOfBenefit.insurance"; } }
 
       /// <summary>
       /// Coverage to be used for adjudication
@@ -1729,14 +1722,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#Accident")]
-    [BackboneType("ExplanationOfBenefit.accident")]
+    [FhirType("ExplanationOfBenefit.accident", IsBackboneType=true)]
     public partial class AccidentComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ExplanationOfBenefit#Accident"; } }
+      public override string TypeName { get { return "ExplanationOfBenefit.accident"; } }
 
       /// <summary>
       /// When the incident occurred
@@ -1927,14 +1919,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#Item")]
-    [BackboneType("ExplanationOfBenefit.item")]
+    [FhirType("ExplanationOfBenefit.item", IsBackboneType=true)]
     public partial class ItemComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ExplanationOfBenefit#Item"; } }
+      public override string TypeName { get { return "ExplanationOfBenefit.item"; } }
 
       /// <summary>
       /// Item instance identifier
@@ -2760,14 +2751,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#Adjudication")]
-    [BackboneType("ExplanationOfBenefit.item.adjudication")]
+    [FhirType("ExplanationOfBenefit.item.adjudication", IsBackboneType=true)]
     public partial class AdjudicationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ExplanationOfBenefit#Adjudication"; } }
+      public override string TypeName { get { return "ExplanationOfBenefit.item.adjudication"; } }
 
       /// <summary>
       /// Type of adjudication information
@@ -2982,14 +2972,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#Detail")]
-    [BackboneType("ExplanationOfBenefit.item.detail")]
+    [FhirType("ExplanationOfBenefit.item.detail", IsBackboneType=true)]
     public partial class DetailComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ExplanationOfBenefit#Detail"; } }
+      public override string TypeName { get { return "ExplanationOfBenefit.item.detail"; } }
 
       /// <summary>
       /// Product or service provided
@@ -3502,14 +3491,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#SubDetail")]
-    [BackboneType("ExplanationOfBenefit.item.detail.subDetail")]
+    [FhirType("ExplanationOfBenefit.item.detail.subDetail", IsBackboneType=true)]
     public partial class SubDetailComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ExplanationOfBenefit#SubDetail"; } }
+      public override string TypeName { get { return "ExplanationOfBenefit.item.detail.subDetail"; } }
 
       /// <summary>
       /// Product or service provided
@@ -3996,14 +3984,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#AddedItem")]
-    [BackboneType("ExplanationOfBenefit.addItem")]
+    [FhirType("ExplanationOfBenefit.addItem", IsBackboneType=true)]
     public partial class AddedItemComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ExplanationOfBenefit#AddedItem"; } }
+      public override string TypeName { get { return "ExplanationOfBenefit.addItem"; } }
 
       /// <summary>
       /// Item sequence number
@@ -4661,14 +4648,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#AddedItemDetail")]
-    [BackboneType("ExplanationOfBenefit.addItem.detail")]
+    [FhirType("ExplanationOfBenefit.addItem.detail", IsBackboneType=true)]
     public partial class AddedItemDetailComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ExplanationOfBenefit#AddedItemDetail"; } }
+      public override string TypeName { get { return "ExplanationOfBenefit.addItem.detail"; } }
 
       /// <summary>
       /// Billing, service, product, or drug code
@@ -5030,14 +5016,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#AddedItemDetailSubDetail")]
-    [BackboneType("ExplanationOfBenefit.addItem.detail.subDetail")]
+    [FhirType("ExplanationOfBenefit.addItem.detail.subDetail", IsBackboneType=true)]
     public partial class AddedItemDetailSubDetailComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ExplanationOfBenefit#AddedItemDetailSubDetail"; } }
+      public override string TypeName { get { return "ExplanationOfBenefit.addItem.detail.subDetail"; } }
 
       /// <summary>
       /// Billing, service, product, or drug code
@@ -5374,14 +5359,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#Total")]
-    [BackboneType("ExplanationOfBenefit.total")]
+    [FhirType("ExplanationOfBenefit.total", IsBackboneType=true)]
     public partial class TotalComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ExplanationOfBenefit#Total"; } }
+      public override string TypeName { get { return "ExplanationOfBenefit.total"; } }
 
       /// <summary>
       /// Type of adjudication information
@@ -5528,14 +5512,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#Payment")]
-    [BackboneType("ExplanationOfBenefit.payment")]
+    [FhirType("ExplanationOfBenefit.payment", IsBackboneType=true)]
     public partial class PaymentComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ExplanationOfBenefit#Payment"; } }
+      public override string TypeName { get { return "ExplanationOfBenefit.payment"; } }
 
       /// <summary>
       /// Partial or complete payment
@@ -5799,14 +5782,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#Note")]
-    [BackboneType("ExplanationOfBenefit.processNote")]
+    [FhirType("ExplanationOfBenefit.processNote", IsBackboneType=true)]
     public partial class NoteComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ExplanationOfBenefit#Note"; } }
+      public override string TypeName { get { return "ExplanationOfBenefit.processNote"; } }
 
       /// <summary>
       /// Note instance identifier
@@ -6054,14 +6036,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#BenefitBalance")]
-    [BackboneType("ExplanationOfBenefit.benefitBalance")]
+    [FhirType("ExplanationOfBenefit.benefitBalance", IsBackboneType=true)]
     public partial class BenefitBalanceComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ExplanationOfBenefit#BenefitBalance"; } }
+      public override string TypeName { get { return "ExplanationOfBenefit.benefitBalance"; } }
 
       /// <summary>
       /// Benefit classification
@@ -6415,14 +6396,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#Benefit")]
-    [BackboneType("ExplanationOfBenefit.benefitBalance.financial")]
+    [FhirType("ExplanationOfBenefit.benefitBalance.financial", IsBackboneType=true)]
     public partial class BenefitComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ExplanationOfBenefit#Benefit"; } }
+      public override string TypeName { get { return "ExplanationOfBenefit.benefitBalance.financial"; } }
 
       /// <summary>
       /// Benefit classification
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/FamilyMemberHistory.cs b/src/Hl7.Fhir.R4B/Model/Generated/FamilyMemberHistory.cs
index 313d18cad0..57e2f81468 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/FamilyMemberHistory.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/FamilyMemberHistory.cs
@@ -101,14 +101,13 @@ public enum FamilyHistoryStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("FamilyMemberHistory#Condition")]
-    [BackboneType("FamilyMemberHistory.condition")]
+    [FhirType("FamilyMemberHistory.condition", IsBackboneType=true)]
     public partial class ConditionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "FamilyMemberHistory#Condition"; } }
+      public override string TypeName { get { return "FamilyMemberHistory.condition"; } }
 
       /// <summary>
       /// Condition suffered by relation
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Goal.cs b/src/Hl7.Fhir.R4B/Model/Generated/Goal.cs
index 8b87dc2455..b6cc33bdd1 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/Goal.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/Goal.cs
@@ -133,14 +133,13 @@ public enum GoalLifecycleStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Goal#Target")]
-    [BackboneType("Goal.target")]
+    [FhirType("Goal.target", IsBackboneType=true)]
     public partial class TargetComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Goal#Target"; } }
+      public override string TypeName { get { return "Goal.target"; } }
 
       /// <summary>
       /// The parameter whose value is being tracked
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/GraphDefinition.cs b/src/Hl7.Fhir.R4B/Model/Generated/GraphDefinition.cs
index e4d30a28d9..9441cc76e4 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/GraphDefinition.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/GraphDefinition.cs
@@ -120,14 +120,13 @@ public enum GraphCompartmentRule
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("GraphDefinition#Link")]
-    [BackboneType("GraphDefinition.link")]
+    [FhirType("GraphDefinition.link", IsBackboneType=true)]
     public partial class LinkComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "GraphDefinition#Link"; } }
+      public override string TypeName { get { return "GraphDefinition.link"; } }
 
       /// <summary>
       /// Path in the resource that contains the link
@@ -459,14 +458,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("GraphDefinition#Target")]
-    [BackboneType("GraphDefinition.link.target")]
+    [FhirType("GraphDefinition.link.target", IsBackboneType=true)]
     public partial class TargetComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "GraphDefinition#Target"; } }
+      public override string TypeName { get { return "GraphDefinition.link.target"; } }
 
       /// <summary>
       /// Type of resource this link refers to
@@ -741,14 +739,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("GraphDefinition#Compartment")]
-    [BackboneType("GraphDefinition.link.target.compartment")]
+    [FhirType("GraphDefinition.link.target.compartment", IsBackboneType=true)]
     public partial class CompartmentComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "GraphDefinition#Compartment"; } }
+      public override string TypeName { get { return "GraphDefinition.link.target.compartment"; } }
 
       /// <summary>
       /// condition | requirement
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Group.cs b/src/Hl7.Fhir.R4B/Model/Generated/Group.cs
index 4ff1598869..0531cd0217 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/Group.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/Group.cs
@@ -115,14 +115,13 @@ public enum GroupType
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Group#Characteristic")]
-    [BackboneType("Group.characteristic")]
+    [FhirType("Group.characteristic", IsBackboneType=true)]
     public partial class CharacteristicComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Group#Characteristic"; } }
+      public override string TypeName { get { return "Group.characteristic"; } }
 
       /// <summary>
       /// Kind of characteristic
@@ -341,14 +340,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Group#Member")]
-    [BackboneType("Group.member")]
+    [FhirType("Group.member", IsBackboneType=true)]
     public partial class MemberComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Group#Member"; } }
+      public override string TypeName { get { return "Group.member"; } }
 
       /// <summary>
       /// Reference to the group member
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/HealthcareService.cs b/src/Hl7.Fhir.R4B/Model/Generated/HealthcareService.cs
index 7a1a23c30d..c0ed0b9eba 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/HealthcareService.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/HealthcareService.cs
@@ -64,14 +64,13 @@ public partial class HealthcareService : Hl7.Fhir.Model.DomainResource, IIdentif
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("HealthcareService#Eligibility")]
-    [BackboneType("HealthcareService.eligibility")]
+    [FhirType("HealthcareService.eligibility", IsBackboneType=true)]
     public partial class EligibilityComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "HealthcareService#Eligibility"; } }
+      public override string TypeName { get { return "HealthcareService.eligibility"; } }
 
       /// <summary>
       /// Coded value for the eligibility
@@ -235,14 +234,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("HealthcareService#AvailableTime")]
-    [BackboneType("HealthcareService.availableTime")]
+    [FhirType("HealthcareService.availableTime", IsBackboneType=true)]
     public partial class AvailableTimeComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "HealthcareService#AvailableTime"; } }
+      public override string TypeName { get { return "HealthcareService.availableTime"; } }
 
       /// <summary>
       /// mon | tue | wed | thu | fri | sat | sun
@@ -511,14 +509,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("HealthcareService#NotAvailable")]
-    [BackboneType("HealthcareService.notAvailable")]
+    [FhirType("HealthcareService.notAvailable", IsBackboneType=true)]
     public partial class NotAvailableComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "HealthcareService#NotAvailable"; } }
+      public override string TypeName { get { return "HealthcareService.notAvailable"; } }
 
       /// <summary>
       /// Reason presented to the user explaining why time not available
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/ImagingStudy.cs b/src/Hl7.Fhir.R4B/Model/Generated/ImagingStudy.cs
index 3049d5b9cc..5f0a92dc1f 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/ImagingStudy.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/ImagingStudy.cs
@@ -107,14 +107,13 @@ public enum ImagingStudyStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ImagingStudy#Series")]
-    [BackboneType("ImagingStudy.series")]
+    [FhirType("ImagingStudy.series", IsBackboneType=true)]
     public partial class SeriesComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ImagingStudy#Series"; } }
+      public override string TypeName { get { return "ImagingStudy.series"; } }
 
       /// <summary>
       /// DICOM Series Instance UID for the series
@@ -612,14 +611,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ImagingStudy#Performer")]
-    [BackboneType("ImagingStudy.series.performer")]
+    [FhirType("ImagingStudy.series.performer", IsBackboneType=true)]
     public partial class PerformerComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ImagingStudy#Performer"; } }
+      public override string TypeName { get { return "ImagingStudy.series.performer"; } }
 
       /// <summary>
       /// Type of performance
@@ -767,14 +765,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ImagingStudy#Instance")]
-    [BackboneType("ImagingStudy.series.instance")]
+    [FhirType("ImagingStudy.series.instance", IsBackboneType=true)]
     public partial class InstanceComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ImagingStudy#Instance"; } }
+      public override string TypeName { get { return "ImagingStudy.series.instance"; } }
 
       /// <summary>
       /// DICOM SOP Instance UID
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Immunization.cs b/src/Hl7.Fhir.R4B/Model/Generated/Immunization.cs
index 003c5a12a5..8ec27e8e36 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/Immunization.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/Immunization.cs
@@ -95,14 +95,13 @@ public enum ImmunizationStatusCodes
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Immunization#Performer")]
-    [BackboneType("Immunization.performer")]
+    [FhirType("Immunization.performer", IsBackboneType=true)]
     public partial class PerformerComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Immunization#Performer"; } }
+      public override string TypeName { get { return "Immunization.performer"; } }
 
       /// <summary>
       /// What type of performance was done
@@ -250,14 +249,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Immunization#Education")]
-    [BackboneType("Immunization.education")]
+    [FhirType("Immunization.education", IsBackboneType=true)]
     public partial class EducationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Immunization#Education"; } }
+      public override string TypeName { get { return "Immunization.education"; } }
 
       /// <summary>
       /// Educational material document identifier
@@ -524,14 +522,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Immunization#Reaction")]
-    [BackboneType("Immunization.reaction")]
+    [FhirType("Immunization.reaction", IsBackboneType=true)]
     public partial class ReactionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Immunization#Reaction"; } }
+      public override string TypeName { get { return "Immunization.reaction"; } }
 
       /// <summary>
       /// When reaction started
@@ -738,14 +735,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Immunization#ProtocolApplied")]
-    [BackboneType("Immunization.protocolApplied")]
+    [FhirType("Immunization.protocolApplied", IsBackboneType=true)]
     public partial class ProtocolAppliedComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Immunization#ProtocolApplied"; } }
+      public override string TypeName { get { return "Immunization.protocolApplied"; } }
 
       /// <summary>
       /// Name of vaccine series
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/ImmunizationRecommendation.cs b/src/Hl7.Fhir.R4B/Model/Generated/ImmunizationRecommendation.cs
index d0bf439add..44002f099f 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/ImmunizationRecommendation.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/ImmunizationRecommendation.cs
@@ -64,14 +64,13 @@ public partial class ImmunizationRecommendation : Hl7.Fhir.Model.DomainResource,
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("ImmunizationRecommendation#Recommendation")]
-    [BackboneType("ImmunizationRecommendation.recommendation")]
+    [FhirType("ImmunizationRecommendation.recommendation", IsBackboneType=true)]
     public partial class RecommendationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ImmunizationRecommendation#Recommendation"; } }
+      public override string TypeName { get { return "ImmunizationRecommendation.recommendation"; } }
 
       /// <summary>
       /// Vaccine  or vaccine group recommendation applies to
@@ -521,14 +520,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ImmunizationRecommendation#DateCriterion")]
-    [BackboneType("ImmunizationRecommendation.recommendation.dateCriterion")]
+    [FhirType("ImmunizationRecommendation.recommendation.dateCriterion", IsBackboneType=true)]
     public partial class DateCriterionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ImmunizationRecommendation#DateCriterion"; } }
+      public override string TypeName { get { return "ImmunizationRecommendation.recommendation.dateCriterion"; } }
 
       /// <summary>
       /// Type of date
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/ImplementationGuide.cs b/src/Hl7.Fhir.R4B/Model/Generated/ImplementationGuide.cs
index c6c81bfb29..c2ea48e24c 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/ImplementationGuide.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/ImplementationGuide.cs
@@ -2257,14 +2257,13 @@ public enum GuideParameterCode
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ImplementationGuide#DependsOn")]
-    [BackboneType("ImplementationGuide.dependsOn")]
+    [FhirType("ImplementationGuide.dependsOn", IsBackboneType=true)]
     public partial class DependsOnComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ImplementationGuide#DependsOn"; } }
+      public override string TypeName { get { return "ImplementationGuide.dependsOn"; } }
 
       /// <summary>
       /// Identity of the IG that this depends on
@@ -2489,14 +2488,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ImplementationGuide#Global")]
-    [BackboneType("ImplementationGuide.global")]
+    [FhirType("ImplementationGuide.global", IsBackboneType=true)]
     public partial class GlobalComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ImplementationGuide#Global"; } }
+      public override string TypeName { get { return "ImplementationGuide.global"; } }
 
       /// <summary>
       /// Type this profile applies to
@@ -2681,14 +2679,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ImplementationGuide#Definition")]
-    [BackboneType("ImplementationGuide.definition")]
+    [FhirType("ImplementationGuide.definition", IsBackboneType=true)]
     public partial class DefinitionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ImplementationGuide#Definition"; } }
+      public override string TypeName { get { return "ImplementationGuide.definition"; } }
 
       /// <summary>
       /// Grouping used to present related resources in the IG
@@ -2912,14 +2909,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ImplementationGuide#Grouping")]
-    [BackboneType("ImplementationGuide.definition.grouping")]
+    [FhirType("ImplementationGuide.definition.grouping", IsBackboneType=true)]
     public partial class GroupingComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ImplementationGuide#Grouping"; } }
+      public override string TypeName { get { return "ImplementationGuide.definition.grouping"; } }
 
       /// <summary>
       /// Descriptive name for the package
@@ -3100,14 +3096,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ImplementationGuide#Resource")]
-    [BackboneType("ImplementationGuide.definition.resource")]
+    [FhirType("ImplementationGuide.definition.resource", IsBackboneType=true)]
     public partial class ResourceComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ImplementationGuide#Resource"; } }
+      public override string TypeName { get { return "ImplementationGuide.definition.resource"; } }
 
       /// <summary>
       /// Location of the resource
@@ -3432,14 +3427,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ImplementationGuide#Page")]
-    [BackboneType("ImplementationGuide.definition.page")]
+    [FhirType("ImplementationGuide.definition.page", IsBackboneType=true)]
     public partial class PageComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ImplementationGuide#Page"; } }
+      public override string TypeName { get { return "ImplementationGuide.definition.page"; } }
 
       /// <summary>
       /// Where to find that page
@@ -3675,14 +3669,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("ImplementationGuide#Parameter")]
-    [BackboneType("ImplementationGuide.definition.parameter")]
+    [FhirType("ImplementationGuide.definition.parameter", IsBackboneType=true)]
     public partial class ParameterComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ImplementationGuide#Parameter"; } }
+      public override string TypeName { get { return "ImplementationGuide.definition.parameter"; } }
 
       /// <summary>
       /// apply | path-resource | path-pages | path-tx-cache | expansion-parameter | rule-broken-links | generate-xml | generate-json | generate-turtle | html-template
@@ -3863,14 +3856,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("ImplementationGuide#Template")]
-    [BackboneType("ImplementationGuide.definition.template")]
+    [FhirType("ImplementationGuide.definition.template", IsBackboneType=true)]
     public partial class TemplateComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ImplementationGuide#Template"; } }
+      public override string TypeName { get { return "ImplementationGuide.definition.template"; } }
 
       /// <summary>
       /// Type of template specified
@@ -4095,14 +4087,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ImplementationGuide#Manifest")]
-    [BackboneType("ImplementationGuide.manifest")]
+    [FhirType("ImplementationGuide.manifest", IsBackboneType=true)]
     public partial class ManifestComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ImplementationGuide#Manifest"; } }
+      public override string TypeName { get { return "ImplementationGuide.manifest"; } }
 
       /// <summary>
       /// Location of rendered implementation guide
@@ -4379,14 +4370,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ImplementationGuide#ManifestResource")]
-    [BackboneType("ImplementationGuide.manifest.resource")]
+    [FhirType("ImplementationGuide.manifest.resource", IsBackboneType=true)]
     public partial class ManifestResourceComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ImplementationGuide#ManifestResource"; } }
+      public override string TypeName { get { return "ImplementationGuide.manifest.resource"; } }
 
       /// <summary>
       /// Location of the resource
@@ -4578,14 +4568,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ImplementationGuide#ManifestPage")]
-    [BackboneType("ImplementationGuide.manifest.page")]
+    [FhirType("ImplementationGuide.manifest.page", IsBackboneType=true)]
     public partial class ManifestPageComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ImplementationGuide#ManifestPage"; } }
+      public override string TypeName { get { return "ImplementationGuide.manifest.page"; } }
 
       /// <summary>
       /// HTML page name
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Ingredient.cs b/src/Hl7.Fhir.R4B/Model/Generated/Ingredient.cs
index 7af811e034..5ed90be07c 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/Ingredient.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/Ingredient.cs
@@ -92,14 +92,13 @@ public enum IngredientManufacturerRole
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Ingredient#Manufacturer")]
-    [BackboneType("Ingredient.manufacturer")]
+    [FhirType("Ingredient.manufacturer", IsBackboneType=true)]
     public partial class ManufacturerComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Ingredient#Manufacturer"; } }
+      public override string TypeName { get { return "Ingredient.manufacturer"; } }
 
       /// <summary>
       /// allowed | possible | actual
@@ -263,14 +262,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Ingredient#Substance")]
-    [BackboneType("Ingredient.substance")]
+    [FhirType("Ingredient.substance", IsBackboneType=true)]
     public partial class SubstanceComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Ingredient#Substance"; } }
+      public override string TypeName { get { return "Ingredient.substance"; } }
 
       /// <summary>
       /// A code or full resource that represents the ingredient substance
@@ -417,14 +415,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Ingredient#Strength")]
-    [BackboneType("Ingredient.substance.strength")]
+    [FhirType("Ingredient.substance.strength", IsBackboneType=true)]
     public partial class StrengthComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Ingredient#Strength"; } }
+      public override string TypeName { get { return "Ingredient.substance.strength"; } }
 
       /// <summary>
       /// The quantity of substance in the unit of presentation
@@ -754,14 +751,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Ingredient#ReferenceStrength")]
-    [BackboneType("Ingredient.substance.strength.referenceStrength")]
+    [FhirType("Ingredient.substance.strength.referenceStrength", IsBackboneType=true)]
     public partial class ReferenceStrengthComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Ingredient#ReferenceStrength"; } }
+      public override string TypeName { get { return "Ingredient.substance.strength.referenceStrength"; } }
 
       /// <summary>
       /// Relevant reference substance
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/InsurancePlan.cs b/src/Hl7.Fhir.R4B/Model/Generated/InsurancePlan.cs
index fd065cac40..181a7aabc3 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/InsurancePlan.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/InsurancePlan.cs
@@ -93,14 +93,13 @@ public enum BenefitCostApplicability
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("InsurancePlan#Contact")]
-    [BackboneType("InsurancePlan.contact")]
+    [FhirType("InsurancePlan.contact", IsBackboneType=true)]
     public partial class ContactComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "InsurancePlan#Contact"; } }
+      public override string TypeName { get { return "InsurancePlan.contact"; } }
 
       /// <summary>
       /// The type of contact
@@ -296,14 +295,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("InsurancePlan#Coverage")]
-    [BackboneType("InsurancePlan.coverage")]
+    [FhirType("InsurancePlan.coverage", IsBackboneType=true)]
     public partial class CoverageComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "InsurancePlan#Coverage"; } }
+      public override string TypeName { get { return "InsurancePlan.coverage"; } }
 
       /// <summary>
       /// Type of coverage
@@ -477,14 +475,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("InsurancePlan#CoverageBenefit")]
-    [BackboneType("InsurancePlan.coverage.benefit")]
+    [FhirType("InsurancePlan.coverage.benefit", IsBackboneType=true)]
     public partial class CoverageBenefitComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "InsurancePlan#CoverageBenefit"; } }
+      public override string TypeName { get { return "InsurancePlan.coverage.benefit"; } }
 
       /// <summary>
       /// Type of benefit
@@ -673,14 +670,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("InsurancePlan#Limit")]
-    [BackboneType("InsurancePlan.coverage.benefit.limit")]
+    [FhirType("InsurancePlan.coverage.benefit.limit", IsBackboneType=true)]
     public partial class LimitComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "InsurancePlan#Limit"; } }
+      public override string TypeName { get { return "InsurancePlan.coverage.benefit.limit"; } }
 
       /// <summary>
       /// Maximum value allowed
@@ -824,14 +820,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("InsurancePlan#Plan")]
-    [BackboneType("InsurancePlan.plan")]
+    [FhirType("InsurancePlan.plan", IsBackboneType=true)]
     public partial class PlanComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "InsurancePlan#Plan"; } }
+      public override string TypeName { get { return "InsurancePlan.plan"; } }
 
       /// <summary>
       /// Business Identifier for Product
@@ -1084,14 +1079,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("InsurancePlan#GeneralCost")]
-    [BackboneType("InsurancePlan.plan.generalCost")]
+    [FhirType("InsurancePlan.plan.generalCost", IsBackboneType=true)]
     public partial class GeneralCostComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "InsurancePlan#GeneralCost"; } }
+      public override string TypeName { get { return "InsurancePlan.plan.generalCost"; } }
 
       /// <summary>
       /// Type of cost
@@ -1321,14 +1315,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("InsurancePlan#SpecificCost")]
-    [BackboneType("InsurancePlan.plan.specificCost")]
+    [FhirType("InsurancePlan.plan.specificCost", IsBackboneType=true)]
     public partial class SpecificCostComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "InsurancePlan#SpecificCost"; } }
+      public override string TypeName { get { return "InsurancePlan.plan.specificCost"; } }
 
       /// <summary>
       /// General category of benefit
@@ -1474,14 +1467,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("InsurancePlan#PlanBenefit")]
-    [BackboneType("InsurancePlan.plan.specificCost.benefit")]
+    [FhirType("InsurancePlan.plan.specificCost.benefit", IsBackboneType=true)]
     public partial class PlanBenefitComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "InsurancePlan#PlanBenefit"; } }
+      public override string TypeName { get { return "InsurancePlan.plan.specificCost.benefit"; } }
 
       /// <summary>
       /// Type of specific benefit
@@ -1627,14 +1619,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("InsurancePlan#Cost")]
-    [BackboneType("InsurancePlan.plan.specificCost.benefit.cost")]
+    [FhirType("InsurancePlan.plan.specificCost.benefit.cost", IsBackboneType=true)]
     public partial class CostComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "InsurancePlan#Cost"; } }
+      public override string TypeName { get { return "InsurancePlan.plan.specificCost.benefit.cost"; } }
 
       /// <summary>
       /// Type of cost
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Invoice.cs b/src/Hl7.Fhir.R4B/Model/Generated/Invoice.cs
index 6d47e8b1eb..a7b308e03c 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/Invoice.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/Invoice.cs
@@ -107,14 +107,13 @@ public enum InvoiceStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Invoice#Participant")]
-    [BackboneType("Invoice.participant")]
+    [FhirType("Invoice.participant", IsBackboneType=true)]
     public partial class ParticipantComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Invoice#Participant"; } }
+      public override string TypeName { get { return "Invoice.participant"; } }
 
       /// <summary>
       /// Type of involvement in creation of this Invoice
@@ -261,14 +260,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Invoice#LineItem")]
-    [BackboneType("Invoice.lineItem")]
+    [FhirType("Invoice.lineItem", IsBackboneType=true)]
     public partial class LineItemComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Invoice#LineItem"; } }
+      public override string TypeName { get { return "Invoice.lineItem"; } }
 
       /// <summary>
       /// Sequence number of line item
@@ -460,14 +458,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Invoice#PriceComponent")]
-    [BackboneType("Invoice.lineItem.priceComponent")]
+    [FhirType("Invoice.lineItem.priceComponent", IsBackboneType=true)]
     public partial class PriceComponentComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Invoice#PriceComponent"; } }
+      public override string TypeName { get { return "Invoice.lineItem.priceComponent"; } }
 
       /// <summary>
       /// base | surcharge | deduction | discount | tax | informational
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Linkage.cs b/src/Hl7.Fhir.R4B/Model/Generated/Linkage.cs
index ba898a5551..583b2a2828 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/Linkage.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/Linkage.cs
@@ -95,14 +95,13 @@ public enum LinkageType
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Linkage#Item")]
-    [BackboneType("Linkage.item")]
+    [FhirType("Linkage.item", IsBackboneType=true)]
     public partial class ItemComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Linkage#Item"; } }
+      public override string TypeName { get { return "Linkage.item"; } }
 
       /// <summary>
       /// source | alternate | historical
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/List.cs b/src/Hl7.Fhir.R4B/Model/Generated/List.cs
index 6a9ccd5e70..7c9776ad35 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/List.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/List.cs
@@ -93,14 +93,13 @@ public enum ListStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("List#Entry")]
-    [BackboneType("List.entry")]
+    [FhirType("List.entry", IsBackboneType=true)]
     public partial class EntryComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "List#Entry"; } }
+      public override string TypeName { get { return "List.entry"; } }
 
       /// <summary>
       /// Status/Workflow information about this item
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Location.cs b/src/Hl7.Fhir.R4B/Model/Generated/Location.cs
index 1c76ad1cb8..f53fa42184 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/Location.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/Location.cs
@@ -117,14 +117,13 @@ public enum LocationMode
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Location#Position")]
-    [BackboneType("Location.position")]
+    [FhirType("Location.position", IsBackboneType=true)]
     public partial class PositionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Location#Position"; } }
+      public override string TypeName { get { return "Location.position"; } }
 
       /// <summary>
       /// Longitude with WGS84 datum
@@ -350,14 +349,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Location#HoursOfOperation")]
-    [BackboneType("Location.hoursOfOperation")]
+    [FhirType("Location.hoursOfOperation", IsBackboneType=true)]
     public partial class HoursOfOperationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Location#HoursOfOperation"; } }
+      public override string TypeName { get { return "Location.hoursOfOperation"; } }
 
       /// <summary>
       /// mon | tue | wed | thu | fri | sat | sun
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/ManufacturedItemDefinition.cs b/src/Hl7.Fhir.R4B/Model/Generated/ManufacturedItemDefinition.cs
index 276a352afd..050952c0e2 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/ManufacturedItemDefinition.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/ManufacturedItemDefinition.cs
@@ -61,14 +61,13 @@ public partial class ManufacturedItemDefinition : Hl7.Fhir.Model.DomainResource,
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("ManufacturedItemDefinition#Property")]
-    [BackboneType("ManufacturedItemDefinition.property")]
+    [FhirType("ManufacturedItemDefinition.property", IsBackboneType=true)]
     public partial class PropertyComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ManufacturedItemDefinition#Property"; } }
+      public override string TypeName { get { return "ManufacturedItemDefinition.property"; } }
 
       /// <summary>
       /// A code expressing the type of characteristic
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Measure.cs b/src/Hl7.Fhir.R4B/Model/Generated/Measure.cs
index a3491f11da..118018889f 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/Measure.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/Measure.cs
@@ -67,14 +67,13 @@ public partial class Measure : Hl7.Fhir.Model.DomainResource, IIdentifiable<List
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Measure#Group")]
-    [BackboneType("Measure.group")]
+    [FhirType("Measure.group", IsBackboneType=true)]
     public partial class GroupComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Measure#Group"; } }
+      public override string TypeName { get { return "Measure.group"; } }
 
       /// <summary>
       /// Meaning of the group
@@ -289,14 +288,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Measure#Population")]
-    [BackboneType("Measure.group.population")]
+    [FhirType("Measure.group.population", IsBackboneType=true)]
     public partial class PopulationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Measure#Population"; } }
+      public override string TypeName { get { return "Measure.group.population"; } }
 
       /// <summary>
       /// initial-population | numerator | numerator-exclusion | denominator | denominator-exclusion | denominator-exception | measure-population | measure-population-exclusion | measure-observation
@@ -485,14 +483,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Measure#Stratifier")]
-    [BackboneType("Measure.group.stratifier")]
+    [FhirType("Measure.group.stratifier", IsBackboneType=true)]
     public partial class StratifierComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Measure#Stratifier"; } }
+      public override string TypeName { get { return "Measure.group.stratifier"; } }
 
       /// <summary>
       /// Meaning of the stratifier
@@ -707,14 +704,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Measure#Component")]
-    [BackboneType("Measure.group.stratifier.component")]
+    [FhirType("Measure.group.stratifier.component", IsBackboneType=true)]
     public partial class ComponentComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Measure#Component"; } }
+      public override string TypeName { get { return "Measure.group.stratifier.component"; } }
 
       /// <summary>
       /// Meaning of the stratifier component
@@ -904,14 +900,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Measure#SupplementalData")]
-    [BackboneType("Measure.supplementalData")]
+    [FhirType("Measure.supplementalData", IsBackboneType=true)]
     public partial class SupplementalDataComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Measure#SupplementalData"; } }
+      public override string TypeName { get { return "Measure.supplementalData"; } }
 
       /// <summary>
       /// Meaning of the supplemental data
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/MeasureReport.cs b/src/Hl7.Fhir.R4B/Model/Generated/MeasureReport.cs
index aa6752f52f..6b6ffc00d4 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/MeasureReport.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/MeasureReport.cs
@@ -129,14 +129,13 @@ public enum MeasureReportType
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MeasureReport#Group")]
-    [BackboneType("MeasureReport.group")]
+    [FhirType("MeasureReport.group", IsBackboneType=true)]
     public partial class GroupComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MeasureReport#Group"; } }
+      public override string TypeName { get { return "MeasureReport.group"; } }
 
       /// <summary>
       /// Meaning of the group
@@ -333,14 +332,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MeasureReport#Population")]
-    [BackboneType("MeasureReport.group.population")]
+    [FhirType("MeasureReport.group.population", IsBackboneType=true)]
     public partial class PopulationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MeasureReport#Population"; } }
+      public override string TypeName { get { return "MeasureReport.group.population"; } }
 
       /// <summary>
       /// initial-population | numerator | numerator-exclusion | denominator | denominator-exclusion | denominator-exception | measure-population | measure-population-exclusion | measure-observation
@@ -530,14 +528,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MeasureReport#Stratifier")]
-    [BackboneType("MeasureReport.group.stratifier")]
+    [FhirType("MeasureReport.group.stratifier", IsBackboneType=true)]
     public partial class StratifierComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MeasureReport#Stratifier"; } }
+      public override string TypeName { get { return "MeasureReport.group.stratifier"; } }
 
       /// <summary>
       /// What stratifier of the group
@@ -684,14 +681,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MeasureReport#StratifierGroup")]
-    [BackboneType("MeasureReport.group.stratifier.stratum")]
+    [FhirType("MeasureReport.group.stratifier.stratum", IsBackboneType=true)]
     public partial class StratifierGroupComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MeasureReport#StratifierGroup"; } }
+      public override string TypeName { get { return "MeasureReport.group.stratifier.stratum"; } }
 
       /// <summary>
       /// The stratum value, e.g. male
@@ -888,14 +884,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MeasureReport#Component")]
-    [BackboneType("MeasureReport.group.stratifier.stratum.component")]
+    [FhirType("MeasureReport.group.stratifier.stratum.component", IsBackboneType=true)]
     public partial class ComponentComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MeasureReport#Component"; } }
+      public override string TypeName { get { return "MeasureReport.group.stratifier.stratum.component"; } }
 
       /// <summary>
       /// What stratifier component of the group
@@ -1043,14 +1038,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MeasureReport#StratifierGroupPopulation")]
-    [BackboneType("MeasureReport.group.stratifier.stratum.population")]
+    [FhirType("MeasureReport.group.stratifier.stratum.population", IsBackboneType=true)]
     public partial class StratifierGroupPopulationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MeasureReport#StratifierGroupPopulation"; } }
+      public override string TypeName { get { return "MeasureReport.group.stratifier.stratum.population"; } }
 
       /// <summary>
       /// initial-population | numerator | numerator-exclusion | denominator | denominator-exclusion | denominator-exception | measure-population | measure-population-exclusion | measure-observation
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Medication.cs b/src/Hl7.Fhir.R4B/Model/Generated/Medication.cs
index 7b0c0d5026..e393717904 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/Medication.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/Medication.cs
@@ -96,14 +96,13 @@ public enum MedicationStatusCodes
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Medication#Ingredient")]
-    [BackboneType("Medication.ingredient")]
+    [FhirType("Medication.ingredient", IsBackboneType=true)]
     public partial class IngredientComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Medication#Ingredient"; } }
+      public override string TypeName { get { return "Medication.ingredient"; } }
 
       /// <summary>
       /// The actual ingredient or content
@@ -294,14 +293,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Medication#Batch")]
-    [BackboneType("Medication.batch")]
+    [FhirType("Medication.batch", IsBackboneType=true)]
     public partial class BatchComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Medication#Batch"; } }
+      public override string TypeName { get { return "Medication.batch"; } }
 
       /// <summary>
       /// Identifier assigned to batch
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/MedicationAdministration.cs b/src/Hl7.Fhir.R4B/Model/Generated/MedicationAdministration.cs
index 811ca58dbc..4a4f747a6e 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/MedicationAdministration.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/MedicationAdministration.cs
@@ -119,14 +119,13 @@ public enum MedicationAdministrationStatusCodes
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationAdministration#Performer")]
-    [BackboneType("MedicationAdministration.performer")]
+    [FhirType("MedicationAdministration.performer", IsBackboneType=true)]
     public partial class PerformerComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MedicationAdministration#Performer"; } }
+      public override string TypeName { get { return "MedicationAdministration.performer"; } }
 
       /// <summary>
       /// Type of performance
@@ -274,14 +273,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationAdministration#Dosage")]
-    [BackboneType("MedicationAdministration.dosage")]
+    [FhirType("MedicationAdministration.dosage", IsBackboneType=true)]
     public partial class DosageComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MedicationAdministration#Dosage"; } }
+      public override string TypeName { get { return "MedicationAdministration.dosage"; } }
 
       /// <summary>
       /// Free text dosage instructions e.g. SIG
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/MedicationDispense.cs b/src/Hl7.Fhir.R4B/Model/Generated/MedicationDispense.cs
index aefa1e8607..b11a9738b7 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/MedicationDispense.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/MedicationDispense.cs
@@ -131,14 +131,13 @@ public enum MedicationDispenseStatusCodes
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationDispense#Performer")]
-    [BackboneType("MedicationDispense.performer")]
+    [FhirType("MedicationDispense.performer", IsBackboneType=true)]
     public partial class PerformerComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MedicationDispense#Performer"; } }
+      public override string TypeName { get { return "MedicationDispense.performer"; } }
 
       /// <summary>
       /// Who performed the dispense and what they did
@@ -286,14 +285,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationDispense#Substitution")]
-    [BackboneType("MedicationDispense.substitution")]
+    [FhirType("MedicationDispense.substitution", IsBackboneType=true)]
     public partial class SubstitutionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MedicationDispense#Substitution"; } }
+      public override string TypeName { get { return "MedicationDispense.substitution"; } }
 
       /// <summary>
       /// Whether a substitution was or was not performed on the dispense
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/MedicationKnowledge.cs b/src/Hl7.Fhir.R4B/Model/Generated/MedicationKnowledge.cs
index 56738665fb..bccc859bcd 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/MedicationKnowledge.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/MedicationKnowledge.cs
@@ -95,14 +95,13 @@ public enum MedicationKnowledgeStatusCodes
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationKnowledge#RelatedMedicationKnowledge")]
-    [BackboneType("MedicationKnowledge.relatedMedicationKnowledge")]
+    [FhirType("MedicationKnowledge.relatedMedicationKnowledge", IsBackboneType=true)]
     public partial class RelatedMedicationKnowledgeComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MedicationKnowledge#RelatedMedicationKnowledge"; } }
+      public override string TypeName { get { return "MedicationKnowledge.relatedMedicationKnowledge"; } }
 
       /// <summary>
       /// Category of medicationKnowledge
@@ -247,14 +246,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationKnowledge#Monograph")]
-    [BackboneType("MedicationKnowledge.monograph")]
+    [FhirType("MedicationKnowledge.monograph", IsBackboneType=true)]
     public partial class MonographComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MedicationKnowledge#Monograph"; } }
+      public override string TypeName { get { return "MedicationKnowledge.monograph"; } }
 
       /// <summary>
       /// The category of medication document
@@ -400,14 +398,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationKnowledge#Ingredient")]
-    [BackboneType("MedicationKnowledge.ingredient")]
+    [FhirType("MedicationKnowledge.ingredient", IsBackboneType=true)]
     public partial class IngredientComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MedicationKnowledge#Ingredient"; } }
+      public override string TypeName { get { return "MedicationKnowledge.ingredient"; } }
 
       /// <summary>
       /// Medication(s) or substance(s) contained in the medication
@@ -598,14 +595,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationKnowledge#Cost")]
-    [BackboneType("MedicationKnowledge.cost")]
+    [FhirType("MedicationKnowledge.cost", IsBackboneType=true)]
     public partial class CostComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MedicationKnowledge#Cost"; } }
+      public override string TypeName { get { return "MedicationKnowledge.cost"; } }
 
       /// <summary>
       /// The category of the cost information
@@ -794,14 +790,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationKnowledge#MonitoringProgram")]
-    [BackboneType("MedicationKnowledge.monitoringProgram")]
+    [FhirType("MedicationKnowledge.monitoringProgram", IsBackboneType=true)]
     public partial class MonitoringProgramComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MedicationKnowledge#MonitoringProgram"; } }
+      public override string TypeName { get { return "MedicationKnowledge.monitoringProgram"; } }
 
       /// <summary>
       /// Type of program under which the medication is monitored
@@ -963,14 +958,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationKnowledge#AdministrationGuidelines")]
-    [BackboneType("MedicationKnowledge.administrationGuidelines")]
+    [FhirType("MedicationKnowledge.administrationGuidelines", IsBackboneType=true)]
     public partial class AdministrationGuidelinesComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MedicationKnowledge#AdministrationGuidelines"; } }
+      public override string TypeName { get { return "MedicationKnowledge.administrationGuidelines"; } }
 
       /// <summary>
       /// Dosage for the medication for the specific guidelines
@@ -1141,14 +1135,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationKnowledge#Dosage")]
-    [BackboneType("MedicationKnowledge.administrationGuidelines.dosage")]
+    [FhirType("MedicationKnowledge.administrationGuidelines.dosage", IsBackboneType=true)]
     public partial class DosageComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MedicationKnowledge#Dosage"; } }
+      public override string TypeName { get { return "MedicationKnowledge.administrationGuidelines.dosage"; } }
 
       /// <summary>
       /// Type of dosage
@@ -1294,14 +1287,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationKnowledge#PatientCharacteristics")]
-    [BackboneType("MedicationKnowledge.administrationGuidelines.patientCharacteristics")]
+    [FhirType("MedicationKnowledge.administrationGuidelines.patientCharacteristics", IsBackboneType=true)]
     public partial class PatientCharacteristicsComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MedicationKnowledge#PatientCharacteristics"; } }
+      public override string TypeName { get { return "MedicationKnowledge.administrationGuidelines.patientCharacteristics"; } }
 
       /// <summary>
       /// Specific characteristic that is relevant to the administration guideline
@@ -1464,14 +1456,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationKnowledge#MedicineClassification")]
-    [BackboneType("MedicationKnowledge.medicineClassification")]
+    [FhirType("MedicationKnowledge.medicineClassification", IsBackboneType=true)]
     public partial class MedicineClassificationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MedicationKnowledge#MedicineClassification"; } }
+      public override string TypeName { get { return "MedicationKnowledge.medicineClassification"; } }
 
       /// <summary>
       /// The type of category for the medication (for example, therapeutic classification, therapeutic sub-classification)
@@ -1617,14 +1608,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationKnowledge#Packaging")]
-    [BackboneType("MedicationKnowledge.packaging")]
+    [FhirType("MedicationKnowledge.packaging", IsBackboneType=true)]
     public partial class PackagingComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MedicationKnowledge#Packaging"; } }
+      public override string TypeName { get { return "MedicationKnowledge.packaging"; } }
 
       /// <summary>
       /// A code that defines the specific type of packaging that the medication can be found in
@@ -1769,14 +1759,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationKnowledge#DrugCharacteristic")]
-    [BackboneType("MedicationKnowledge.drugCharacteristic")]
+    [FhirType("MedicationKnowledge.drugCharacteristic", IsBackboneType=true)]
     public partial class DrugCharacteristicComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MedicationKnowledge#DrugCharacteristic"; } }
+      public override string TypeName { get { return "MedicationKnowledge.drugCharacteristic"; } }
 
       /// <summary>
       /// Code specifying the type of characteristic of medication
@@ -1920,14 +1909,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationKnowledge#Regulatory")]
-    [BackboneType("MedicationKnowledge.regulatory")]
+    [FhirType("MedicationKnowledge.regulatory", IsBackboneType=true)]
     public partial class RegulatoryComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MedicationKnowledge#Regulatory"; } }
+      public override string TypeName { get { return "MedicationKnowledge.regulatory"; } }
 
       /// <summary>
       /// Specifies the authority of the regulation
@@ -2123,14 +2111,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationKnowledge#Substitution")]
-    [BackboneType("MedicationKnowledge.regulatory.substitution")]
+    [FhirType("MedicationKnowledge.regulatory.substitution", IsBackboneType=true)]
     public partial class SubstitutionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MedicationKnowledge#Substitution"; } }
+      public override string TypeName { get { return "MedicationKnowledge.regulatory.substitution"; } }
 
       /// <summary>
       /// Specifies the type of substitution allowed
@@ -2291,14 +2278,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationKnowledge#Schedule")]
-    [BackboneType("MedicationKnowledge.regulatory.schedule")]
+    [FhirType("MedicationKnowledge.regulatory.schedule", IsBackboneType=true)]
     public partial class ScheduleComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MedicationKnowledge#Schedule"; } }
+      public override string TypeName { get { return "MedicationKnowledge.regulatory.schedule"; } }
 
       /// <summary>
       /// Specifies the specific drug schedule
@@ -2415,14 +2401,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationKnowledge#MaxDispense")]
-    [BackboneType("MedicationKnowledge.regulatory.maxDispense")]
+    [FhirType("MedicationKnowledge.regulatory.maxDispense", IsBackboneType=true)]
     public partial class MaxDispenseComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MedicationKnowledge#MaxDispense"; } }
+      public override string TypeName { get { return "MedicationKnowledge.regulatory.maxDispense"; } }
 
       /// <summary>
       /// The maximum number of units of the medication that can be dispensed
@@ -2564,14 +2549,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationKnowledge#Kinetics")]
-    [BackboneType("MedicationKnowledge.kinetics")]
+    [FhirType("MedicationKnowledge.kinetics", IsBackboneType=true)]
     public partial class KineticsComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MedicationKnowledge#Kinetics"; } }
+      public override string TypeName { get { return "MedicationKnowledge.kinetics"; } }
 
       /// <summary>
       /// The drug concentration measured at certain discrete points in time
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/MedicationRequest.cs b/src/Hl7.Fhir.R4B/Model/Generated/MedicationRequest.cs
index a2fe5c275f..3ff6cfeaab 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/MedicationRequest.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/MedicationRequest.cs
@@ -183,14 +183,13 @@ public enum MedicationRequestIntent
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationRequest#DispenseRequest")]
-    [BackboneType("MedicationRequest.dispenseRequest")]
+    [FhirType("MedicationRequest.dispenseRequest", IsBackboneType=true)]
     public partial class DispenseRequestComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MedicationRequest#DispenseRequest"; } }
+      public override string TypeName { get { return "MedicationRequest.dispenseRequest"; } }
 
       /// <summary>
       /// First fill details
@@ -480,14 +479,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationRequest#InitialFill")]
-    [BackboneType("MedicationRequest.dispenseRequest.initialFill")]
+    [FhirType("MedicationRequest.dispenseRequest.initialFill", IsBackboneType=true)]
     public partial class InitialFillComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MedicationRequest#InitialFill"; } }
+      public override string TypeName { get { return "MedicationRequest.dispenseRequest.initialFill"; } }
 
       /// <summary>
       /// First fill quantity
@@ -631,14 +629,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationRequest#Substitution")]
-    [BackboneType("MedicationRequest.substitution")]
+    [FhirType("MedicationRequest.substitution", IsBackboneType=true)]
     public partial class SubstitutionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MedicationRequest#Substitution"; } }
+      public override string TypeName { get { return "MedicationRequest.substitution"; } }
 
       /// <summary>
       /// Whether substitution is allowed or not
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/MedicinalProductDefinition.cs b/src/Hl7.Fhir.R4B/Model/Generated/MedicinalProductDefinition.cs
index f3e668db81..e8d21e36fb 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/MedicinalProductDefinition.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/MedicinalProductDefinition.cs
@@ -64,14 +64,13 @@ public partial class MedicinalProductDefinition : Hl7.Fhir.Model.DomainResource,
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("MedicinalProductDefinition#Contact")]
-    [BackboneType("MedicinalProductDefinition.contact")]
+    [FhirType("MedicinalProductDefinition.contact", IsBackboneType=true)]
     public partial class ContactComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MedicinalProductDefinition#Contact"; } }
+      public override string TypeName { get { return "MedicinalProductDefinition.contact"; } }
 
       /// <summary>
       /// Allows the contact to be classified, for example QPPV, Pharmacovigilance Enquiry Information
@@ -216,14 +215,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("MedicinalProductDefinition#Name")]
-    [BackboneType("MedicinalProductDefinition.name")]
+    [FhirType("MedicinalProductDefinition.name", IsBackboneType=true)]
     public partial class NameComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MedicinalProductDefinition#Name"; } }
+      public override string TypeName { get { return "MedicinalProductDefinition.name"; } }
 
       /// <summary>
       /// The full product name
@@ -436,14 +434,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("MedicinalProductDefinition#NamePart")]
-    [BackboneType("MedicinalProductDefinition.name.namePart")]
+    [FhirType("MedicinalProductDefinition.name.namePart", IsBackboneType=true)]
     public partial class NamePartComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MedicinalProductDefinition#NamePart"; } }
+      public override string TypeName { get { return "MedicinalProductDefinition.name.namePart"; } }
 
       /// <summary>
       /// A fragment of a product name
@@ -608,14 +605,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MedicinalProductDefinition#CountryLanguage")]
-    [BackboneType("MedicinalProductDefinition.name.countryLanguage")]
+    [FhirType("MedicinalProductDefinition.name.countryLanguage", IsBackboneType=true)]
     public partial class CountryLanguageComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MedicinalProductDefinition#CountryLanguage"; } }
+      public override string TypeName { get { return "MedicinalProductDefinition.name.countryLanguage"; } }
 
       /// <summary>
       /// Country code for where this name applies
@@ -789,14 +785,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MedicinalProductDefinition#CrossReference")]
-    [BackboneType("MedicinalProductDefinition.crossReference")]
+    [FhirType("MedicinalProductDefinition.crossReference", IsBackboneType=true)]
     public partial class CrossReferenceComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MedicinalProductDefinition#CrossReference"; } }
+      public override string TypeName { get { return "MedicinalProductDefinition.crossReference"; } }
 
       /// <summary>
       /// Reference to another product, e.g. for linking authorised to investigational product
@@ -942,14 +937,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MedicinalProductDefinition#Operation")]
-    [BackboneType("MedicinalProductDefinition.operation")]
+    [FhirType("MedicinalProductDefinition.operation", IsBackboneType=true)]
     public partial class OperationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MedicinalProductDefinition#Operation"; } }
+      public override string TypeName { get { return "MedicinalProductDefinition.operation"; } }
 
       /// <summary>
       /// The type of manufacturing operation e.g. manufacturing itself, re-packaging
@@ -1147,14 +1141,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MedicinalProductDefinition#Characteristic")]
-    [BackboneType("MedicinalProductDefinition.characteristic")]
+    [FhirType("MedicinalProductDefinition.characteristic", IsBackboneType=true)]
     public partial class CharacteristicComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MedicinalProductDefinition#Characteristic"; } }
+      public override string TypeName { get { return "MedicinalProductDefinition.characteristic"; } }
 
       /// <summary>
       /// A code expressing the type of characteristic
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/MessageDefinition.cs b/src/Hl7.Fhir.R4B/Model/Generated/MessageDefinition.cs
index 4f8c95b046..054c710d98 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/MessageDefinition.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/MessageDefinition.cs
@@ -96,14 +96,13 @@ public enum MessageSignificanceCategory
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MessageDefinition#Focus")]
-    [BackboneType("MessageDefinition.focus")]
+    [FhirType("MessageDefinition.focus", IsBackboneType=true)]
     public partial class FocusComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MessageDefinition#Focus"; } }
+      public override string TypeName { get { return "MessageDefinition.focus"; } }
 
       /// <summary>
       /// Type of resource
@@ -374,14 +373,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MessageDefinition#AllowedResponse")]
-    [BackboneType("MessageDefinition.allowedResponse")]
+    [FhirType("MessageDefinition.allowedResponse", IsBackboneType=true)]
     public partial class AllowedResponseComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MessageDefinition#AllowedResponse"; } }
+      public override string TypeName { get { return "MessageDefinition.allowedResponse"; } }
 
       /// <summary>
       /// Reference to allowed message definition response
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/MessageHeader.cs b/src/Hl7.Fhir.R4B/Model/Generated/MessageHeader.cs
index 0d56b4b8cf..5642b8f392 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/MessageHeader.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/MessageHeader.cs
@@ -96,14 +96,13 @@ public enum ResponseType
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MessageHeader#MessageDestination")]
-    [BackboneType("MessageHeader.destination")]
+    [FhirType("MessageHeader.destination", IsBackboneType=true)]
     public partial class MessageDestinationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MessageHeader#MessageDestination"; } }
+      public override string TypeName { get { return "MessageHeader.destination"; } }
 
       /// <summary>
       /// Name of system
@@ -338,14 +337,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MessageHeader#MessageSource")]
-    [BackboneType("MessageHeader.source")]
+    [FhirType("MessageHeader.source", IsBackboneType=true)]
     public partial class MessageSourceComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MessageHeader#MessageSource"; } }
+      public override string TypeName { get { return "MessageHeader.source"; } }
 
       /// <summary>
       /// Name of system
@@ -637,14 +635,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MessageHeader#Response")]
-    [BackboneType("MessageHeader.response")]
+    [FhirType("MessageHeader.response", IsBackboneType=true)]
     public partial class ResponseComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MessageHeader#Response"; } }
+      public override string TypeName { get { return "MessageHeader.response"; } }
 
       /// <summary>
       /// Id of original message
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/MolecularSequence.cs b/src/Hl7.Fhir.R4B/Model/Generated/MolecularSequence.cs
index dec2b25b79..0836036c54 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/MolecularSequence.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/MolecularSequence.cs
@@ -207,14 +207,13 @@ public enum RepositoryType
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MolecularSequence#ReferenceSeq")]
-    [BackboneType("MolecularSequence.referenceSeq")]
+    [FhirType("MolecularSequence.referenceSeq", IsBackboneType=true)]
     public partial class ReferenceSeqComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MolecularSequence#ReferenceSeq"; } }
+      public override string TypeName { get { return "MolecularSequence.referenceSeq"; } }
 
       /// <summary>
       /// Chromosome containing genetic finding
@@ -649,14 +648,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MolecularSequence#Variant")]
-    [BackboneType("MolecularSequence.variant")]
+    [FhirType("MolecularSequence.variant", IsBackboneType=true)]
     public partial class VariantComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MolecularSequence#Variant"; } }
+      public override string TypeName { get { return "MolecularSequence.variant"; } }
 
       /// <summary>
       /// Start position of the variant on the  reference sequence
@@ -992,14 +990,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MolecularSequence#Quality")]
-    [BackboneType("MolecularSequence.quality")]
+    [FhirType("MolecularSequence.quality", IsBackboneType=true)]
     public partial class QualityComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MolecularSequence#Quality"; } }
+      public override string TypeName { get { return "MolecularSequence.quality"; } }
 
       /// <summary>
       /// indel | snp | unknown
@@ -1671,14 +1668,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MolecularSequence#Roc")]
-    [BackboneType("MolecularSequence.quality.roc")]
+    [FhirType("MolecularSequence.quality.roc", IsBackboneType=true)]
     public partial class RocComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MolecularSequence#Roc"; } }
+      public override string TypeName { get { return "MolecularSequence.quality.roc"; } }
 
       /// <summary>
       /// Genotype quality score
@@ -2080,14 +2076,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MolecularSequence#Repository")]
-    [BackboneType("MolecularSequence.repository")]
+    [FhirType("MolecularSequence.repository", IsBackboneType=true)]
     public partial class RepositoryComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MolecularSequence#Repository"; } }
+      public override string TypeName { get { return "MolecularSequence.repository"; } }
 
       /// <summary>
       /// directlink | openapi | login | oauth | other
@@ -2442,14 +2437,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MolecularSequence#StructureVariant")]
-    [BackboneType("MolecularSequence.structureVariant")]
+    [FhirType("MolecularSequence.structureVariant", IsBackboneType=true)]
     public partial class StructureVariantComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MolecularSequence#StructureVariant"; } }
+      public override string TypeName { get { return "MolecularSequence.structureVariant"; } }
 
       /// <summary>
       /// Structural variant change type
@@ -2702,14 +2696,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("MolecularSequence#Outer")]
-    [BackboneType("MolecularSequence.structureVariant.outer")]
+    [FhirType("MolecularSequence.structureVariant.outer", IsBackboneType=true)]
     public partial class OuterComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MolecularSequence#Outer"; } }
+      public override string TypeName { get { return "MolecularSequence.structureVariant.outer"; } }
 
       /// <summary>
       /// Structural variant outer start
@@ -2886,14 +2879,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("MolecularSequence#Inner")]
-    [BackboneType("MolecularSequence.structureVariant.inner")]
+    [FhirType("MolecularSequence.structureVariant.inner", IsBackboneType=true)]
     public partial class InnerComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MolecularSequence#Inner"; } }
+      public override string TypeName { get { return "MolecularSequence.structureVariant.inner"; } }
 
       /// <summary>
       /// Structural variant inner start
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/NamingSystem.cs b/src/Hl7.Fhir.R4B/Model/Generated/NamingSystem.cs
index 04e9acb4bc..99266308ab 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/NamingSystem.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/NamingSystem.cs
@@ -130,14 +130,13 @@ public enum NamingSystemIdentifierType
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("NamingSystem#UniqueId")]
-    [BackboneType("NamingSystem.uniqueId")]
+    [FhirType("NamingSystem.uniqueId", IsBackboneType=true)]
     public partial class UniqueIdComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "NamingSystem#UniqueId"; } }
+      public override string TypeName { get { return "NamingSystem.uniqueId"; } }
 
       /// <summary>
       /// oid | uuid | uri | other
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/NutritionOrder.cs b/src/Hl7.Fhir.R4B/Model/Generated/NutritionOrder.cs
index 4fdbf53138..f4c1d1d153 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/NutritionOrder.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/NutritionOrder.cs
@@ -68,14 +68,13 @@ public partial class NutritionOrder : Hl7.Fhir.Model.DomainResource, IIdentifiab
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("NutritionOrder#OralDiet")]
-    [BackboneType("NutritionOrder.oralDiet")]
+    [FhirType("NutritionOrder.oralDiet", IsBackboneType=true)]
     public partial class OralDietComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "NutritionOrder#OralDiet"; } }
+      public override string TypeName { get { return "NutritionOrder.oralDiet"; } }
 
       /// <summary>
       /// Type of oral diet or diet restrictions that describe what can be consumed orally
@@ -344,14 +343,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("NutritionOrder#Nutrient")]
-    [BackboneType("NutritionOrder.oralDiet.nutrient")]
+    [FhirType("NutritionOrder.oralDiet.nutrient", IsBackboneType=true)]
     public partial class NutrientComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "NutritionOrder#Nutrient"; } }
+      public override string TypeName { get { return "NutritionOrder.oralDiet.nutrient"; } }
 
       /// <summary>
       /// Type of nutrient that is being modified
@@ -496,14 +494,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("NutritionOrder#Texture")]
-    [BackboneType("NutritionOrder.oralDiet.texture")]
+    [FhirType("NutritionOrder.oralDiet.texture", IsBackboneType=true)]
     public partial class TextureComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "NutritionOrder#Texture"; } }
+      public override string TypeName { get { return "NutritionOrder.oralDiet.texture"; } }
 
       /// <summary>
       /// Code to indicate how to alter the texture of the foods, e.g. pureed
@@ -649,14 +646,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("NutritionOrder#Supplement")]
-    [BackboneType("NutritionOrder.supplement")]
+    [FhirType("NutritionOrder.supplement", IsBackboneType=true)]
     public partial class SupplementComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "NutritionOrder#Supplement"; } }
+      public override string TypeName { get { return "NutritionOrder.supplement"; } }
 
       /// <summary>
       /// Type of supplement product requested
@@ -913,14 +909,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("NutritionOrder#EnteralFormula")]
-    [BackboneType("NutritionOrder.enteralFormula")]
+    [FhirType("NutritionOrder.enteralFormula", IsBackboneType=true)]
     public partial class EnteralFormulaComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "NutritionOrder#EnteralFormula"; } }
+      public override string TypeName { get { return "NutritionOrder.enteralFormula"; } }
 
       /// <summary>
       /// Type of enteral or infant formula
@@ -1298,14 +1293,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("NutritionOrder#Administration")]
-    [BackboneType("NutritionOrder.enteralFormula.administration")]
+    [FhirType("NutritionOrder.enteralFormula.administration", IsBackboneType=true)]
     public partial class AdministrationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "NutritionOrder#Administration"; } }
+      public override string TypeName { get { return "NutritionOrder.enteralFormula.administration"; } }
 
       /// <summary>
       /// Scheduled frequency of enteral feeding
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/NutritionProduct.cs b/src/Hl7.Fhir.R4B/Model/Generated/NutritionProduct.cs
index aada51c3fc..2595ce65d6 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/NutritionProduct.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/NutritionProduct.cs
@@ -95,14 +95,13 @@ public enum NutritionProductStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("NutritionProduct#Nutrient")]
-    [BackboneType("NutritionProduct.nutrient")]
+    [FhirType("NutritionProduct.nutrient", IsBackboneType=true)]
     public partial class NutrientComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "NutritionProduct#Nutrient"; } }
+      public override string TypeName { get { return "NutritionProduct.nutrient"; } }
 
       /// <summary>
       /// The (relevant) nutrients in the product
@@ -245,14 +244,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("NutritionProduct#Ingredient")]
-    [BackboneType("NutritionProduct.ingredient")]
+    [FhirType("NutritionProduct.ingredient", IsBackboneType=true)]
     public partial class IngredientComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "NutritionProduct#Ingredient"; } }
+      public override string TypeName { get { return "NutritionProduct.ingredient"; } }
 
       /// <summary>
       /// The ingredient contained in the product
@@ -395,14 +393,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("NutritionProduct#ProductCharacteristic")]
-    [BackboneType("NutritionProduct.productCharacteristic")]
+    [FhirType("NutritionProduct.productCharacteristic", IsBackboneType=true)]
     public partial class ProductCharacteristicComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "NutritionProduct#ProductCharacteristic"; } }
+      public override string TypeName { get { return "NutritionProduct.productCharacteristic"; } }
 
       /// <summary>
       /// Code specifying the type of characteristic
@@ -551,14 +548,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("NutritionProduct#Instance")]
-    [BackboneType("NutritionProduct.instance")]
+    [FhirType("NutritionProduct.instance", IsBackboneType=true)]
     public partial class InstanceComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "NutritionProduct#Instance"; } }
+      public override string TypeName { get { return "NutritionProduct.instance"; } }
 
       /// <summary>
       /// The amount of items or instances
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Observation.cs b/src/Hl7.Fhir.R4B/Model/Generated/Observation.cs
index e9e8457abe..3f46e3cc19 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/Observation.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/Observation.cs
@@ -69,14 +69,13 @@ public partial class Observation : Hl7.Fhir.Model.DomainResource, IIdentifiable<
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Observation#ReferenceRange")]
-    [BackboneType("Observation.referenceRange")]
+    [FhirType("Observation.referenceRange", IsBackboneType=true)]
     public partial class ReferenceRangeComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Observation#ReferenceRange"; } }
+      public override string TypeName { get { return "Observation.referenceRange"; } }
 
       /// <summary>
       /// Low Range, if relevant
@@ -342,14 +341,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Observation#Component")]
-    [BackboneType("Observation.component")]
+    [FhirType("Observation.component", IsBackboneType=true)]
     public partial class ComponentComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Observation#Component"; } }
+      public override string TypeName { get { return "Observation.component"; } }
 
       /// <summary>
       /// Type of component observation (code / type)
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/ObservationDefinition.cs b/src/Hl7.Fhir.R4B/Model/Generated/ObservationDefinition.cs
index 52d4fef900..ac17f77572 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/ObservationDefinition.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/ObservationDefinition.cs
@@ -172,14 +172,13 @@ public enum ObservationRangeCategory
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ObservationDefinition#QuantitativeDetails")]
-    [BackboneType("ObservationDefinition.quantitativeDetails")]
+    [FhirType("ObservationDefinition.quantitativeDetails", IsBackboneType=true)]
     public partial class QuantitativeDetailsComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ObservationDefinition#QuantitativeDetails"; } }
+      public override string TypeName { get { return "ObservationDefinition.quantitativeDetails"; } }
 
       /// <summary>
       /// Customary unit for quantitative results
@@ -411,14 +410,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ObservationDefinition#QualifiedInterval")]
-    [BackboneType("ObservationDefinition.qualifiedInterval")]
+    [FhirType("ObservationDefinition.qualifiedInterval", IsBackboneType=true)]
     public partial class QualifiedIntervalComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ObservationDefinition#QualifiedInterval"; } }
+      public override string TypeName { get { return "ObservationDefinition.qualifiedInterval"; } }
 
       /// <summary>
       /// reference | critical | absolute
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/OperationDefinition.cs b/src/Hl7.Fhir.R4B/Model/Generated/OperationDefinition.cs
index 9efb83fd33..5e74d61afc 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/OperationDefinition.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/OperationDefinition.cs
@@ -90,14 +90,13 @@ public enum OperationKind
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("OperationDefinition#Parameter")]
-    [BackboneType("OperationDefinition.parameter")]
+    [FhirType("OperationDefinition.parameter", IsBackboneType=true)]
     public partial class ParameterComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "OperationDefinition#Parameter"; } }
+      public override string TypeName { get { return "OperationDefinition.parameter"; } }
 
       /// <summary>
       /// Name in Parameters.parameter.name or in URL
@@ -623,14 +622,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("OperationDefinition#Binding")]
-    [BackboneType("OperationDefinition.parameter.binding")]
+    [FhirType("OperationDefinition.parameter.binding", IsBackboneType=true)]
     public partial class BindingComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "OperationDefinition#Binding"; } }
+      public override string TypeName { get { return "OperationDefinition.parameter.binding"; } }
 
       /// <summary>
       /// required | extensible | preferred | example
@@ -815,14 +813,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("OperationDefinition#ReferencedFrom")]
-    [BackboneType("OperationDefinition.parameter.referencedFrom")]
+    [FhirType("OperationDefinition.parameter.referencedFrom", IsBackboneType=true)]
     public partial class ReferencedFromComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "OperationDefinition#ReferencedFrom"; } }
+      public override string TypeName { get { return "OperationDefinition.parameter.referencedFrom"; } }
 
       /// <summary>
       /// Referencing parameter
@@ -1004,14 +1001,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("OperationDefinition#Overload")]
-    [BackboneType("OperationDefinition.overload")]
+    [FhirType("OperationDefinition.overload", IsBackboneType=true)]
     public partial class OverloadComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "OperationDefinition#Overload"; } }
+      public override string TypeName { get { return "OperationDefinition.overload"; } }
 
       /// <summary>
       /// Name of parameter to include in overload
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Organization.cs b/src/Hl7.Fhir.R4B/Model/Generated/Organization.cs
index 1b2e81769d..0a704533b6 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/Organization.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/Organization.cs
@@ -67,14 +67,13 @@ public partial class Organization : Hl7.Fhir.Model.DomainResource, IIdentifiable
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Organization#Contact")]
-    [BackboneType("Organization.contact")]
+    [FhirType("Organization.contact", IsBackboneType=true)]
     public partial class ContactComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Organization#Contact"; } }
+      public override string TypeName { get { return "Organization.contact"; } }
 
       /// <summary>
       /// The type of contact
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/PackagedProductDefinition.cs b/src/Hl7.Fhir.R4B/Model/Generated/PackagedProductDefinition.cs
index 05092e4261..f061d4ac38 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/PackagedProductDefinition.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/PackagedProductDefinition.cs
@@ -61,14 +61,13 @@ public partial class PackagedProductDefinition : Hl7.Fhir.Model.DomainResource,
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("PackagedProductDefinition#LegalStatusOfSupply")]
-    [BackboneType("PackagedProductDefinition.legalStatusOfSupply")]
+    [FhirType("PackagedProductDefinition.legalStatusOfSupply", IsBackboneType=true)]
     public partial class LegalStatusOfSupplyComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "PackagedProductDefinition#LegalStatusOfSupply"; } }
+      public override string TypeName { get { return "PackagedProductDefinition.legalStatusOfSupply"; } }
 
       /// <summary>
       /// The actual status of supply. In what situation this package type may be supplied for use
@@ -214,14 +213,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("PackagedProductDefinition#Package")]
-    [BackboneType("PackagedProductDefinition.package")]
+    [FhirType("PackagedProductDefinition.package", IsBackboneType=true)]
     public partial class PackageComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "PackagedProductDefinition#Package"; } }
+      public override string TypeName { get { return "PackagedProductDefinition.package"; } }
 
       /// <summary>
       /// An identifier that is specific to this particular part of the packaging. Including possibly a Data Carrier Identifier
@@ -593,14 +591,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("PackagedProductDefinition#ShelfLifeStorage")]
-    [BackboneType("PackagedProductDefinition.package.shelfLifeStorage")]
+    [FhirType("PackagedProductDefinition.package.shelfLifeStorage", IsBackboneType=true)]
     public partial class ShelfLifeStorageComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "PackagedProductDefinition#ShelfLifeStorage"; } }
+      public override string TypeName { get { return "PackagedProductDefinition.package.shelfLifeStorage"; } }
 
       /// <summary>
       /// This describes the shelf life, taking into account various scenarios such as shelf life of the packaged Medicinal Product itself, shelf life after transformation where necessary and shelf life after the first opening of a bottle, etc. The shelf life type shall be specified using an appropriate controlled vocabulary The controlled term and the controlled term identifier shall be specified
@@ -769,14 +766,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("PackagedProductDefinition#Property")]
-    [BackboneType("PackagedProductDefinition.package.property")]
+    [FhirType("PackagedProductDefinition.package.property", IsBackboneType=true)]
     public partial class PropertyComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "PackagedProductDefinition#Property"; } }
+      public override string TypeName { get { return "PackagedProductDefinition.package.property"; } }
 
       /// <summary>
       /// A code expressing the type of characteristic
@@ -921,14 +917,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("PackagedProductDefinition#ContainedItem")]
-    [BackboneType("PackagedProductDefinition.package.containedItem")]
+    [FhirType("PackagedProductDefinition.package.containedItem", IsBackboneType=true)]
     public partial class ContainedItemComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "PackagedProductDefinition#ContainedItem"; } }
+      public override string TypeName { get { return "PackagedProductDefinition.package.containedItem"; } }
 
       /// <summary>
       /// The actual item(s) of medication, as manufactured, or a device, or other medically related item (food, biologicals, raw materials, medical fluids, gases etc.), as contained in the package
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Patient.cs b/src/Hl7.Fhir.R4B/Model/Generated/Patient.cs
index a6244b2560..6b7eddee86 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/Patient.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/Patient.cs
@@ -101,14 +101,13 @@ public enum LinkType
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Patient#Contact")]
-    [BackboneType("Patient.contact")]
+    [FhirType("Patient.contact", IsBackboneType=true)]
     public partial class ContactComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Patient#Contact"; } }
+      public override string TypeName { get { return "Patient.contact"; } }
 
       /// <summary>
       /// The kind of relationship
@@ -402,14 +401,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Patient#Communication")]
-    [BackboneType("Patient.communication")]
+    [FhirType("Patient.communication", IsBackboneType=true)]
     public partial class CommunicationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Patient#Communication"; } }
+      public override string TypeName { get { return "Patient.communication"; } }
 
       /// <summary>
       /// The language which can be used to communicate with the patient about his or her health
@@ -574,14 +572,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Patient#Link")]
-    [BackboneType("Patient.link")]
+    [FhirType("Patient.link", IsBackboneType=true)]
     public partial class LinkComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Patient#Link"; } }
+      public override string TypeName { get { return "Patient.link"; } }
 
       /// <summary>
       /// The other patient or related person resource that the link refers to
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/PaymentReconciliation.cs b/src/Hl7.Fhir.R4B/Model/Generated/PaymentReconciliation.cs
index 145b9784c9..83b76c8c21 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/PaymentReconciliation.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/PaymentReconciliation.cs
@@ -67,14 +67,13 @@ public partial class PaymentReconciliation : Hl7.Fhir.Model.DomainResource, IIde
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("PaymentReconciliation#Details")]
-    [BackboneType("PaymentReconciliation.detail")]
+    [FhirType("PaymentReconciliation.detail", IsBackboneType=true)]
     public partial class DetailsComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "PaymentReconciliation#Details"; } }
+      public override string TypeName { get { return "PaymentReconciliation.detail"; } }
 
       /// <summary>
       /// Business identifier of the payment detail
@@ -448,14 +447,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("PaymentReconciliation#Notes")]
-    [BackboneType("PaymentReconciliation.processNote")]
+    [FhirType("PaymentReconciliation.processNote", IsBackboneType=true)]
     public partial class NotesComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "PaymentReconciliation#Notes"; } }
+      public override string TypeName { get { return "PaymentReconciliation.processNote"; } }
 
       /// <summary>
       /// display | print | printoper
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Person.cs b/src/Hl7.Fhir.R4B/Model/Generated/Person.cs
index da6cad356e..4f179340c0 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/Person.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/Person.cs
@@ -99,14 +99,13 @@ public enum IdentityAssuranceLevel
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Person#Link")]
-    [BackboneType("Person.link")]
+    [FhirType("Person.link", IsBackboneType=true)]
     public partial class LinkComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Person#Link"; } }
+      public override string TypeName { get { return "Person.link"; } }
 
       /// <summary>
       /// The resource to which this actual person is associated
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/PlanDefinition.cs b/src/Hl7.Fhir.R4B/Model/Generated/PlanDefinition.cs
index 94fa0ae68d..4f2a14f3f5 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/PlanDefinition.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/PlanDefinition.cs
@@ -67,14 +67,13 @@ public partial class PlanDefinition : Hl7.Fhir.Model.DomainResource, IIdentifiab
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("PlanDefinition#Goal")]
-    [BackboneType("PlanDefinition.goal")]
+    [FhirType("PlanDefinition.goal", IsBackboneType=true)]
     public partial class GoalComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "PlanDefinition#Goal"; } }
+      public override string TypeName { get { return "PlanDefinition.goal"; } }
 
       /// <summary>
       /// E.g. Treatment, dietary, behavioral
@@ -352,14 +351,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("PlanDefinition#Target")]
-    [BackboneType("PlanDefinition.goal.target")]
+    [FhirType("PlanDefinition.goal.target", IsBackboneType=true)]
     public partial class TargetComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "PlanDefinition#Target"; } }
+      public override string TypeName { get { return "PlanDefinition.goal.target"; } }
 
       /// <summary>
       /// The parameter whose value is to be tracked
@@ -532,14 +530,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("PlanDefinition#Action")]
-    [BackboneType("PlanDefinition.action")]
+    [FhirType("PlanDefinition.action", IsBackboneType=true)]
     public partial class ActionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "PlanDefinition#Action"; } }
+      public override string TypeName { get { return "PlanDefinition.action"; } }
 
       /// <summary>
       /// User-visible prefix for the action (e.g. 1. or A.)
@@ -1560,14 +1557,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("PlanDefinition#Condition")]
-    [BackboneType("PlanDefinition.action.condition")]
+    [FhirType("PlanDefinition.action.condition", IsBackboneType=true)]
     public partial class ConditionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "PlanDefinition#Condition"; } }
+      public override string TypeName { get { return "PlanDefinition.action.condition"; } }
 
       /// <summary>
       /// applicability | start | stop
@@ -1733,14 +1729,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("PlanDefinition#RelatedAction")]
-    [BackboneType("PlanDefinition.action.relatedAction")]
+    [FhirType("PlanDefinition.action.relatedAction", IsBackboneType=true)]
     public partial class RelatedActionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "PlanDefinition#RelatedAction"; } }
+      public override string TypeName { get { return "PlanDefinition.action.relatedAction"; } }
 
       /// <summary>
       /// What action is this related to
@@ -1951,14 +1946,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("PlanDefinition#Participant")]
-    [BackboneType("PlanDefinition.action.participant")]
+    [FhirType("PlanDefinition.action.participant", IsBackboneType=true)]
     public partial class ParticipantComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "PlanDefinition#Participant"; } }
+      public override string TypeName { get { return "PlanDefinition.action.participant"; } }
 
       /// <summary>
       /// patient | practitioner | related-person | device
@@ -2125,14 +2119,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("PlanDefinition#DynamicValue")]
-    [BackboneType("PlanDefinition.action.dynamicValue")]
+    [FhirType("PlanDefinition.action.dynamicValue", IsBackboneType=true)]
     public partial class DynamicValueComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "PlanDefinition#DynamicValue"; } }
+      public override string TypeName { get { return "PlanDefinition.action.dynamicValue"; } }
 
       /// <summary>
       /// The path to the element to be set dynamically
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Practitioner.cs b/src/Hl7.Fhir.R4B/Model/Generated/Practitioner.cs
index 14c6674ba3..2be5bd6c64 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/Practitioner.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/Practitioner.cs
@@ -67,14 +67,13 @@ public partial class Practitioner : Hl7.Fhir.Model.DomainResource, IIdentifiable
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Practitioner#Qualification")]
-    [BackboneType("Practitioner.qualification")]
+    [FhirType("Practitioner.qualification", IsBackboneType=true)]
     public partial class QualificationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Practitioner#Qualification"; } }
+      public override string TypeName { get { return "Practitioner.qualification"; } }
 
       /// <summary>
       /// An identifier for this qualification for the practitioner
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/PractitionerRole.cs b/src/Hl7.Fhir.R4B/Model/Generated/PractitionerRole.cs
index 98bdb3c732..17c2828363 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/PractitionerRole.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/PractitionerRole.cs
@@ -68,14 +68,13 @@ public partial class PractitionerRole : Hl7.Fhir.Model.DomainResource, IIdentifi
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("PractitionerRole#AvailableTime")]
-    [BackboneType("PractitionerRole.availableTime")]
+    [FhirType("PractitionerRole.availableTime", IsBackboneType=true)]
     public partial class AvailableTimeComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "PractitionerRole#AvailableTime"; } }
+      public override string TypeName { get { return "PractitionerRole.availableTime"; } }
 
       /// <summary>
       /// mon | tue | wed | thu | fri | sat | sun
@@ -344,14 +343,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("PractitionerRole#NotAvailable")]
-    [BackboneType("PractitionerRole.notAvailable")]
+    [FhirType("PractitionerRole.notAvailable", IsBackboneType=true)]
     public partial class NotAvailableComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "PractitionerRole#NotAvailable"; } }
+      public override string TypeName { get { return "PractitionerRole.notAvailable"; } }
 
       /// <summary>
       /// Reason presented to the user explaining why time not available
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Procedure.cs b/src/Hl7.Fhir.R4B/Model/Generated/Procedure.cs
index d880be5547..9e12c5afe4 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/Procedure.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/Procedure.cs
@@ -67,14 +67,13 @@ public partial class Procedure : Hl7.Fhir.Model.DomainResource, IIdentifiable<Li
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Procedure#Performer")]
-    [BackboneType("Procedure.performer")]
+    [FhirType("Procedure.performer", IsBackboneType=true)]
     public partial class PerformerComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Procedure#Performer"; } }
+      public override string TypeName { get { return "Procedure.performer"; } }
 
       /// <summary>
       /// Type of performance
@@ -249,14 +248,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Procedure#FocalDevice")]
-    [BackboneType("Procedure.focalDevice")]
+    [FhirType("Procedure.focalDevice", IsBackboneType=true)]
     public partial class FocalDeviceComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Procedure#FocalDevice"; } }
+      public override string TypeName { get { return "Procedure.focalDevice"; } }
 
       /// <summary>
       /// Kind of change to device
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Provenance.cs b/src/Hl7.Fhir.R4B/Model/Generated/Provenance.cs
index 88c97e1e85..86657031f2 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/Provenance.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/Provenance.cs
@@ -109,14 +109,13 @@ public enum ProvenanceEntityRole
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Provenance#Agent")]
-    [BackboneType("Provenance.agent")]
+    [FhirType("Provenance.agent", IsBackboneType=true)]
     public partial class AgentComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Provenance#Agent"; } }
+      public override string TypeName { get { return "Provenance.agent"; } }
 
       /// <summary>
       /// How the agent participated
@@ -315,14 +314,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Provenance#Entity")]
-    [BackboneType("Provenance.entity")]
+    [FhirType("Provenance.entity", IsBackboneType=true)]
     public partial class EntityComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Provenance#Entity"; } }
+      public override string TypeName { get { return "Provenance.entity"; } }
 
       /// <summary>
       /// derivation | revision | quotation | source | removal
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Questionnaire.cs b/src/Hl7.Fhir.R4B/Model/Generated/Questionnaire.cs
index 2ee25204cf..3062cad6ac 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/Questionnaire.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/Questionnaire.cs
@@ -254,14 +254,13 @@ public enum QuestionnaireItemOperator
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Questionnaire#Item")]
-    [BackboneType("Questionnaire.item")]
+    [FhirType("Questionnaire.item", IsBackboneType=true)]
     public partial class ItemComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Questionnaire#Item"; } }
+      public override string TypeName { get { return "Questionnaire.item"; } }
 
       /// <summary>
       /// Unique id for item in questionnaire
@@ -966,14 +965,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Questionnaire#EnableWhen")]
-    [BackboneType("Questionnaire.item.enableWhen")]
+    [FhirType("Questionnaire.item.enableWhen", IsBackboneType=true)]
     public partial class EnableWhenComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Questionnaire#EnableWhen"; } }
+      public override string TypeName { get { return "Questionnaire.item.enableWhen"; } }
 
       /// <summary>
       /// Question that determines whether item is enabled
@@ -1188,14 +1186,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Questionnaire#AnswerOption")]
-    [BackboneType("Questionnaire.item.answerOption")]
+    [FhirType("Questionnaire.item.answerOption", IsBackboneType=true)]
     public partial class AnswerOptionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Questionnaire#AnswerOption"; } }
+      public override string TypeName { get { return "Questionnaire.item.answerOption"; } }
 
       /// <summary>
       /// Answer value
@@ -1363,14 +1360,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Questionnaire#Initial")]
-    [BackboneType("Questionnaire.item.initial")]
+    [FhirType("Questionnaire.item.initial", IsBackboneType=true)]
     public partial class InitialComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Questionnaire#Initial"; } }
+      public override string TypeName { get { return "Questionnaire.item.initial"; } }
 
       /// <summary>
       /// Actual value for initializing the question
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/QuestionnaireResponse.cs b/src/Hl7.Fhir.R4B/Model/Generated/QuestionnaireResponse.cs
index acbcd16c36..1986f63017 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/QuestionnaireResponse.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/QuestionnaireResponse.cs
@@ -109,14 +109,13 @@ public enum QuestionnaireResponseStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("QuestionnaireResponse#Item")]
-    [BackboneType("QuestionnaireResponse.item")]
+    [FhirType("QuestionnaireResponse.item", IsBackboneType=true)]
     public partial class ItemComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "QuestionnaireResponse#Item"; } }
+      public override string TypeName { get { return "QuestionnaireResponse.item"; } }
 
       /// <summary>
       /// Pointer to specific item from Questionnaire
@@ -393,14 +392,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("QuestionnaireResponse#Answer")]
-    [BackboneType("QuestionnaireResponse.item.answer")]
+    [FhirType("QuestionnaireResponse.item.answer", IsBackboneType=true)]
     public partial class AnswerComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "QuestionnaireResponse#Answer"; } }
+      public override string TypeName { get { return "QuestionnaireResponse.item.answer"; } }
 
       /// <summary>
       /// Single-valued answer to the question
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/RegulatedAuthorization.cs b/src/Hl7.Fhir.R4B/Model/Generated/RegulatedAuthorization.cs
index f958a98d8a..14f6883962 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/RegulatedAuthorization.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/RegulatedAuthorization.cs
@@ -67,14 +67,13 @@ public partial class RegulatedAuthorization : Hl7.Fhir.Model.DomainResource, IId
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("RegulatedAuthorization#Case")]
-    [BackboneType("RegulatedAuthorization.case")]
+    [FhirType("RegulatedAuthorization.case", IsBackboneType=true)]
     public partial class CaseComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "RegulatedAuthorization#Case"; } }
+      public override string TypeName { get { return "RegulatedAuthorization.case"; } }
 
       /// <summary>
       /// Identifier by which this case can be referenced
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/RelatedPerson.cs b/src/Hl7.Fhir.R4B/Model/Generated/RelatedPerson.cs
index 286b10d95e..349b390aa6 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/RelatedPerson.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/RelatedPerson.cs
@@ -67,14 +67,13 @@ public partial class RelatedPerson : Hl7.Fhir.Model.DomainResource, IIdentifiabl
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("RelatedPerson#Communication")]
-    [BackboneType("RelatedPerson.communication")]
+    [FhirType("RelatedPerson.communication", IsBackboneType=true)]
     public partial class CommunicationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "RelatedPerson#Communication"; } }
+      public override string TypeName { get { return "RelatedPerson.communication"; } }
 
       /// <summary>
       /// The language which can be used to communicate with the patient about his or her health
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/RequestGroup.cs b/src/Hl7.Fhir.R4B/Model/Generated/RequestGroup.cs
index ba8bfb9009..854e9e1c18 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/RequestGroup.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/RequestGroup.cs
@@ -67,14 +67,13 @@ public partial class RequestGroup : Hl7.Fhir.Model.DomainResource, IIdentifiable
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("RequestGroup#Action")]
-    [BackboneType("RequestGroup.action")]
+    [FhirType("RequestGroup.action", IsBackboneType=true)]
     public partial class ActionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "RequestGroup#Action"; } }
+      public override string TypeName { get { return "RequestGroup.action"; } }
 
       /// <summary>
       /// User-visible prefix for the action (e.g. 1. or A.)
@@ -849,14 +848,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("RequestGroup#Condition")]
-    [BackboneType("RequestGroup.action.condition")]
+    [FhirType("RequestGroup.action.condition", IsBackboneType=true)]
     public partial class ConditionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "RequestGroup#Condition"; } }
+      public override string TypeName { get { return "RequestGroup.action.condition"; } }
 
       /// <summary>
       /// applicability | start | stop
@@ -1021,14 +1019,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("RequestGroup#RelatedAction")]
-    [BackboneType("RequestGroup.action.relatedAction")]
+    [FhirType("RequestGroup.action.relatedAction", IsBackboneType=true)]
     public partial class RelatedActionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "RequestGroup#RelatedAction"; } }
+      public override string TypeName { get { return "RequestGroup.action.relatedAction"; } }
 
       /// <summary>
       /// What action this is related to
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/ResearchElementDefinition.cs b/src/Hl7.Fhir.R4B/Model/Generated/ResearchElementDefinition.cs
index b1066e4294..a9f2d40616 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/ResearchElementDefinition.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/ResearchElementDefinition.cs
@@ -125,14 +125,13 @@ public enum VariableTypeCode
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ResearchElementDefinition#Characteristic")]
-    [BackboneType("ResearchElementDefinition.characteristic")]
+    [FhirType("ResearchElementDefinition.characteristic", IsBackboneType=true)]
     public partial class CharacteristicComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ResearchElementDefinition#Characteristic"; } }
+      public override string TypeName { get { return "ResearchElementDefinition.characteristic"; } }
 
       /// <summary>
       /// What code or expression defines members?
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/ResearchStudy.cs b/src/Hl7.Fhir.R4B/Model/Generated/ResearchStudy.cs
index b7045a9e98..1679d456ab 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/ResearchStudy.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/ResearchStudy.cs
@@ -144,14 +144,13 @@ public enum ResearchStudyStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ResearchStudy#Arm")]
-    [BackboneType("ResearchStudy.arm")]
+    [FhirType("ResearchStudy.arm", IsBackboneType=true)]
     public partial class ArmComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ResearchStudy#Arm"; } }
+      public override string TypeName { get { return "ResearchStudy.arm"; } }
 
       /// <summary>
       /// Label for study arm
@@ -357,14 +356,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ResearchStudy#Objective")]
-    [BackboneType("ResearchStudy.objective")]
+    [FhirType("ResearchStudy.objective", IsBackboneType=true)]
     public partial class ObjectiveComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ResearchStudy#Objective"; } }
+      public override string TypeName { get { return "ResearchStudy.objective"; } }
 
       /// <summary>
       /// Label for the objective
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/RiskAssessment.cs b/src/Hl7.Fhir.R4B/Model/Generated/RiskAssessment.cs
index 41f00ec664..bd2b8f02cb 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/RiskAssessment.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/RiskAssessment.cs
@@ -68,14 +68,13 @@ public partial class RiskAssessment : Hl7.Fhir.Model.DomainResource, IIdentifiab
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("RiskAssessment#Prediction")]
-    [BackboneType("RiskAssessment.prediction")]
+    [FhirType("RiskAssessment.prediction", IsBackboneType=true)]
     public partial class PredictionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "RiskAssessment#Prediction"; } }
+      public override string TypeName { get { return "RiskAssessment.prediction"; } }
 
       /// <summary>
       /// Possible outcome for the subject
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/SearchParameter.cs b/src/Hl7.Fhir.R4B/Model/Generated/SearchParameter.cs
index ca2f24e104..de803db64b 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/SearchParameter.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/SearchParameter.cs
@@ -254,14 +254,13 @@ public enum SearchModifierCode
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("SearchParameter#Component")]
-    [BackboneType("SearchParameter.component")]
+    [FhirType("SearchParameter.component", IsBackboneType=true)]
     public partial class ComponentComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "SearchParameter#Component"; } }
+      public override string TypeName { get { return "SearchParameter.component"; } }
 
       /// <summary>
       /// Defines how the part works
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Specimen.cs b/src/Hl7.Fhir.R4B/Model/Generated/Specimen.cs
index ce3b4b70f6..dcd433cc4a 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/Specimen.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/Specimen.cs
@@ -101,14 +101,13 @@ public enum SpecimenStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Specimen#Collection")]
-    [BackboneType("Specimen.collection")]
+    [FhirType("Specimen.collection", IsBackboneType=true)]
     public partial class CollectionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Specimen#Collection"; } }
+      public override string TypeName { get { return "Specimen.collection"; } }
 
       /// <summary>
       /// Who collected the specimen
@@ -386,14 +385,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Specimen#Processing")]
-    [BackboneType("Specimen.processing")]
+    [FhirType("Specimen.processing", IsBackboneType=true)]
     public partial class ProcessingComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Specimen#Processing"; } }
+      public override string TypeName { get { return "Specimen.processing"; } }
 
       /// <summary>
       /// Textual description of procedure
@@ -611,14 +609,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Specimen#Container")]
-    [BackboneType("Specimen.container")]
+    [FhirType("Specimen.container", IsBackboneType=true)]
     public partial class ContainerComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Specimen#Container"; } }
+      public override string TypeName { get { return "Specimen.container"; } }
 
       /// <summary>
       /// Id for the container
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/SpecimenDefinition.cs b/src/Hl7.Fhir.R4B/Model/Generated/SpecimenDefinition.cs
index 5d3a98c84e..3d3d03604c 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/SpecimenDefinition.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/SpecimenDefinition.cs
@@ -89,14 +89,13 @@ public enum SpecimenContainedPreference
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("SpecimenDefinition#TypeTested")]
-    [BackboneType("SpecimenDefinition.typeTested")]
+    [FhirType("SpecimenDefinition.typeTested", IsBackboneType=true)]
     public partial class TypeTestedComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "SpecimenDefinition#TypeTested"; } }
+      public override string TypeName { get { return "SpecimenDefinition.typeTested"; } }
 
       /// <summary>
       /// Primary or secondary specimen
@@ -448,14 +447,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SpecimenDefinition#Container")]
-    [BackboneType("SpecimenDefinition.typeTested.container")]
+    [FhirType("SpecimenDefinition.typeTested.container", IsBackboneType=true)]
     public partial class ContainerComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "SpecimenDefinition#Container"; } }
+      public override string TypeName { get { return "SpecimenDefinition.typeTested.container"; } }
 
       /// <summary>
       /// Container material
@@ -791,14 +789,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("SpecimenDefinition#Additive")]
-    [BackboneType("SpecimenDefinition.typeTested.container.additive")]
+    [FhirType("SpecimenDefinition.typeTested.container.additive", IsBackboneType=true)]
     public partial class AdditiveComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "SpecimenDefinition#Additive"; } }
+      public override string TypeName { get { return "SpecimenDefinition.typeTested.container.additive"; } }
 
       /// <summary>
       /// Additive associated with container
@@ -922,14 +919,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("SpecimenDefinition#Handling")]
-    [BackboneType("SpecimenDefinition.typeTested.handling")]
+    [FhirType("SpecimenDefinition.typeTested.handling", IsBackboneType=true)]
     public partial class HandlingComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "SpecimenDefinition#Handling"; } }
+      public override string TypeName { get { return "SpecimenDefinition.typeTested.handling"; } }
 
       /// <summary>
       /// Temperature qualifier
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/StructureMap.cs b/src/Hl7.Fhir.R4B/Model/Generated/StructureMap.cs
index f3d2c14142..0ce4d29051 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/StructureMap.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/StructureMap.cs
@@ -357,14 +357,13 @@ public enum StructureMapTransform
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("StructureMap#Structure")]
-    [BackboneType("StructureMap.structure")]
+    [FhirType("StructureMap.structure", IsBackboneType=true)]
     public partial class StructureComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "StructureMap#Structure"; } }
+      public override string TypeName { get { return "StructureMap.structure"; } }
 
       /// <summary>
       /// Canonical reference to structure definition
@@ -634,14 +633,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("StructureMap#Group")]
-    [BackboneType("StructureMap.group")]
+    [FhirType("StructureMap.group", IsBackboneType=true)]
     public partial class GroupComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "StructureMap#Group"; } }
+      public override string TypeName { get { return "StructureMap.group"; } }
 
       /// <summary>
       /// Human-readable label
@@ -964,14 +962,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("StructureMap#Input")]
-    [BackboneType("StructureMap.group.input")]
+    [FhirType("StructureMap.group.input", IsBackboneType=true)]
     public partial class InputComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "StructureMap#Input"; } }
+      public override string TypeName { get { return "StructureMap.group.input"; } }
 
       /// <summary>
       /// Name for this instance of data
@@ -1238,14 +1235,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("StructureMap#Rule")]
-    [BackboneType("StructureMap.group.rule")]
+    [FhirType("StructureMap.group.rule", IsBackboneType=true)]
     public partial class RuleComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "StructureMap#Rule"; } }
+      public override string TypeName { get { return "StructureMap.group.rule"; } }
 
       /// <summary>
       /// Name of the rule for internal references
@@ -1527,14 +1523,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("StructureMap#Source")]
-    [BackboneType("StructureMap.group.rule.source")]
+    [FhirType("StructureMap.group.rule.source", IsBackboneType=true)]
     public partial class SourceComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "StructureMap#Source"; } }
+      public override string TypeName { get { return "StructureMap.group.rule.source"; } }
 
       /// <summary>
       /// Type or variable this rule applies to
@@ -2085,14 +2080,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("StructureMap#Target")]
-    [BackboneType("StructureMap.group.rule.target")]
+    [FhirType("StructureMap.group.rule.target", IsBackboneType=true)]
     public partial class TargetComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "StructureMap#Target"; } }
+      public override string TypeName { get { return "StructureMap.group.rule.target"; } }
 
       /// <summary>
       /// Type or variable this rule applies to
@@ -2517,14 +2511,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("StructureMap#Parameter")]
-    [BackboneType("StructureMap.group.rule.target.parameter")]
+    [FhirType("StructureMap.group.rule.target.parameter", IsBackboneType=true)]
     public partial class ParameterComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "StructureMap#Parameter"; } }
+      public override string TypeName { get { return "StructureMap.group.rule.target.parameter"; } }
 
       /// <summary>
       /// Parameter value - variable or literal
@@ -2643,14 +2636,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("StructureMap#Dependent")]
-    [BackboneType("StructureMap.group.rule.dependent")]
+    [FhirType("StructureMap.group.rule.dependent", IsBackboneType=true)]
     public partial class DependentComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "StructureMap#Dependent"; } }
+      public override string TypeName { get { return "StructureMap.group.rule.dependent"; } }
 
       /// <summary>
       /// Name of a rule or group to apply
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Subscription.cs b/src/Hl7.Fhir.R4B/Model/Generated/Subscription.cs
index bc8a887958..b5aa388622 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/Subscription.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/Subscription.cs
@@ -107,14 +107,13 @@ public enum SubscriptionChannelType
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Subscription#Channel")]
-    [BackboneType("Subscription.channel")]
+    [FhirType("Subscription.channel", IsBackboneType=true)]
     public partial class ChannelComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Subscription#Channel"; } }
+      public override string TypeName { get { return "Subscription.channel"; } }
 
       /// <summary>
       /// rest-hook | websocket | email | sms | message
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/SubscriptionStatus.cs b/src/Hl7.Fhir.R4B/Model/Generated/SubscriptionStatus.cs
index f6640920ad..1d09c73b61 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/SubscriptionStatus.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/SubscriptionStatus.cs
@@ -107,14 +107,13 @@ public enum SubscriptionNotificationType
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("SubscriptionStatus#NotificationEvent")]
-    [BackboneType("SubscriptionStatus.notificationEvent")]
+    [FhirType("SubscriptionStatus.notificationEvent", IsBackboneType=true)]
     public partial class NotificationEventComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "SubscriptionStatus#NotificationEvent"; } }
+      public override string TypeName { get { return "SubscriptionStatus.notificationEvent"; } }
 
       /// <summary>
       /// Event number
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/SubscriptionTopic.cs b/src/Hl7.Fhir.R4B/Model/Generated/SubscriptionTopic.cs
index 38a86c89c0..850db7d20f 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/SubscriptionTopic.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/SubscriptionTopic.cs
@@ -217,14 +217,13 @@ public enum SubscriptionSearchModifier
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("SubscriptionTopic#ResourceTrigger")]
-    [BackboneType("SubscriptionTopic.resourceTrigger")]
+    [FhirType("SubscriptionTopic.resourceTrigger", IsBackboneType=true)]
     public partial class ResourceTriggerComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "SubscriptionTopic#ResourceTrigger"; } }
+      public override string TypeName { get { return "SubscriptionTopic.resourceTrigger"; } }
 
       /// <summary>
       /// Text representation of the resource trigger
@@ -520,14 +519,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("SubscriptionTopic#QueryCriteria")]
-    [BackboneType("SubscriptionTopic.resourceTrigger.queryCriteria")]
+    [FhirType("SubscriptionTopic.resourceTrigger.queryCriteria", IsBackboneType=true)]
     public partial class QueryCriteriaComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "SubscriptionTopic#QueryCriteria"; } }
+      public override string TypeName { get { return "SubscriptionTopic.resourceTrigger.queryCriteria"; } }
 
       /// <summary>
       /// Rule applied to previous resource state
@@ -840,14 +838,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("SubscriptionTopic#EventTrigger")]
-    [BackboneType("SubscriptionTopic.eventTrigger")]
+    [FhirType("SubscriptionTopic.eventTrigger", IsBackboneType=true)]
     public partial class EventTriggerComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "SubscriptionTopic#EventTrigger"; } }
+      public override string TypeName { get { return "SubscriptionTopic.eventTrigger"; } }
 
       /// <summary>
       /// Text representation of the event trigger
@@ -1056,14 +1053,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("SubscriptionTopic#CanFilterBy")]
-    [BackboneType("SubscriptionTopic.canFilterBy")]
+    [FhirType("SubscriptionTopic.canFilterBy", IsBackboneType=true)]
     public partial class CanFilterByComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "SubscriptionTopic#CanFilterBy"; } }
+      public override string TypeName { get { return "SubscriptionTopic.canFilterBy"; } }
 
       /// <summary>
       /// Description of this filter parameter
@@ -1377,14 +1373,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("SubscriptionTopic#NotificationShape")]
-    [BackboneType("SubscriptionTopic.notificationShape")]
+    [FhirType("SubscriptionTopic.notificationShape", IsBackboneType=true)]
     public partial class NotificationShapeComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "SubscriptionTopic#NotificationShape"; } }
+      public override string TypeName { get { return "SubscriptionTopic.notificationShape"; } }
 
       /// <summary>
       /// URL of the Resource that is the focus (main) resource in a notification shape
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Substance.cs b/src/Hl7.Fhir.R4B/Model/Generated/Substance.cs
index 60539ede0a..b1144ba843 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/Substance.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/Substance.cs
@@ -92,14 +92,13 @@ public enum FHIRSubstanceStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Substance#Instance")]
-    [BackboneType("Substance.instance")]
+    [FhirType("Substance.instance", IsBackboneType=true)]
     public partial class InstanceComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Substance#Instance"; } }
+      public override string TypeName { get { return "Substance.instance"; } }
 
       /// <summary>
       /// Identifier of the package/container
@@ -286,14 +285,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Substance#Ingredient")]
-    [BackboneType("Substance.ingredient")]
+    [FhirType("Substance.ingredient", IsBackboneType=true)]
     public partial class IngredientComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Substance#Ingredient"; } }
+      public override string TypeName { get { return "Substance.ingredient"; } }
 
       /// <summary>
       /// Optional amount (concentration)
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/SubstanceDefinition.cs b/src/Hl7.Fhir.R4B/Model/Generated/SubstanceDefinition.cs
index 62f55d1baa..82cf699c0d 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/SubstanceDefinition.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/SubstanceDefinition.cs
@@ -61,14 +61,13 @@ public partial class SubstanceDefinition : Hl7.Fhir.Model.DomainResource, IIdent
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SubstanceDefinition#Moiety")]
-    [BackboneType("SubstanceDefinition.moiety")]
+    [FhirType("SubstanceDefinition.moiety", IsBackboneType=true)]
     public partial class MoietyComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "SubstanceDefinition#Moiety"; } }
+      public override string TypeName { get { return "SubstanceDefinition.moiety"; } }
 
       /// <summary>
       /// Role that the moiety is playing
@@ -400,14 +399,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SubstanceDefinition#Property")]
-    [BackboneType("SubstanceDefinition.property")]
+    [FhirType("SubstanceDefinition.property", IsBackboneType=true)]
     public partial class PropertyComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "SubstanceDefinition#Property"; } }
+      public override string TypeName { get { return "SubstanceDefinition.property"; } }
 
       /// <summary>
       /// A code expressing the type of property
@@ -555,14 +553,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("SubstanceDefinition#MolecularWeight")]
-    [BackboneType("SubstanceDefinition.molecularWeight")]
+    [FhirType("SubstanceDefinition.molecularWeight", IsBackboneType=true)]
     public partial class MolecularWeightComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "SubstanceDefinition#MolecularWeight"; } }
+      public override string TypeName { get { return "SubstanceDefinition.molecularWeight"; } }
 
       /// <summary>
       /// The method by which the weight was determined
@@ -731,14 +728,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SubstanceDefinition#Structure")]
-    [BackboneType("SubstanceDefinition.structure")]
+    [FhirType("SubstanceDefinition.structure", IsBackboneType=true)]
     public partial class StructureComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "SubstanceDefinition#Structure"; } }
+      public override string TypeName { get { return "SubstanceDefinition.structure"; } }
 
       /// <summary>
       /// Stereochemistry type
@@ -1073,14 +1069,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SubstanceDefinition#Representation")]
-    [BackboneType("SubstanceDefinition.structure.representation")]
+    [FhirType("SubstanceDefinition.structure.representation", IsBackboneType=true)]
     public partial class RepresentationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "SubstanceDefinition#Representation"; } }
+      public override string TypeName { get { return "SubstanceDefinition.structure.representation"; } }
 
       /// <summary>
       /// The kind of structural representation (e.g. full, partial)
@@ -1293,14 +1288,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SubstanceDefinition#Code")]
-    [BackboneType("SubstanceDefinition.code")]
+    [FhirType("SubstanceDefinition.code", IsBackboneType=true)]
     public partial class CodeComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "SubstanceDefinition#Code"; } }
+      public override string TypeName { get { return "SubstanceDefinition.code"; } }
 
       /// <summary>
       /// The specific code
@@ -1539,14 +1533,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SubstanceDefinition#Name")]
-    [BackboneType("SubstanceDefinition.name")]
+    [FhirType("SubstanceDefinition.name", IsBackboneType=true)]
     public partial class NameComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "SubstanceDefinition#Name"; } }
+      public override string TypeName { get { return "SubstanceDefinition.name"; } }
 
       /// <summary>
       /// The actual name
@@ -1963,14 +1956,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SubstanceDefinition#Official")]
-    [BackboneType("SubstanceDefinition.name.official")]
+    [FhirType("SubstanceDefinition.name.official", IsBackboneType=true)]
     public partial class OfficialComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "SubstanceDefinition#Official"; } }
+      public override string TypeName { get { return "SubstanceDefinition.name.official"; } }
 
       /// <summary>
       /// Which authority uses this official name
@@ -2159,14 +2151,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("SubstanceDefinition#Relationship")]
-    [BackboneType("SubstanceDefinition.relationship")]
+    [FhirType("SubstanceDefinition.relationship", IsBackboneType=true)]
     public partial class RelationshipComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "SubstanceDefinition#Relationship"; } }
+      public override string TypeName { get { return "SubstanceDefinition.relationship"; } }
 
       /// <summary>
       /// A pointer to another substance, as a resource or a representational code
@@ -2464,14 +2455,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("SubstanceDefinition#SourceMaterial")]
-    [BackboneType("SubstanceDefinition.sourceMaterial")]
+    [FhirType("SubstanceDefinition.sourceMaterial", IsBackboneType=true)]
     public partial class SourceMaterialComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "SubstanceDefinition#SourceMaterial"; } }
+      public override string TypeName { get { return "SubstanceDefinition.sourceMaterial"; } }
 
       /// <summary>
       /// Classification of the origin of the raw material. e.g. cat hair is an Animal source type
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/SupplyDelivery.cs b/src/Hl7.Fhir.R4B/Model/Generated/SupplyDelivery.cs
index 7697334b86..14caa83802 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/SupplyDelivery.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/SupplyDelivery.cs
@@ -123,14 +123,13 @@ public enum SupplyItemType
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("SupplyDelivery#SuppliedItem")]
-    [BackboneType("SupplyDelivery.suppliedItem")]
+    [FhirType("SupplyDelivery.suppliedItem", IsBackboneType=true)]
     public partial class SuppliedItemComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "SupplyDelivery#SuppliedItem"; } }
+      public override string TypeName { get { return "SupplyDelivery.suppliedItem"; } }
 
       /// <summary>
       /// Amount dispensed
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/SupplyRequest.cs b/src/Hl7.Fhir.R4B/Model/Generated/SupplyRequest.cs
index 5297902ca9..f498b0db21 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/SupplyRequest.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/SupplyRequest.cs
@@ -119,14 +119,13 @@ public enum SupplyRequestStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("SupplyRequest#Parameter")]
-    [BackboneType("SupplyRequest.parameter")]
+    [FhirType("SupplyRequest.parameter", IsBackboneType=true)]
     public partial class ParameterComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "SupplyRequest#Parameter"; } }
+      public override string TypeName { get { return "SupplyRequest.parameter"; } }
 
       /// <summary>
       /// Item detail
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Task.cs b/src/Hl7.Fhir.R4B/Model/Generated/Task.cs
index cf5d6b5576..cdec518284 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/Task.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/Task.cs
@@ -210,14 +210,13 @@ public enum TaskIntent
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Task#Restriction")]
-    [BackboneType("Task.restriction")]
+    [FhirType("Task.restriction", IsBackboneType=true)]
     public partial class RestrictionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Task#Restriction"; } }
+      public override string TypeName { get { return "Task.restriction"; } }
 
       /// <summary>
       /// How many times to repeat
@@ -407,14 +406,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Task#Parameter")]
-    [BackboneType("Task.input")]
+    [FhirType("Task.input", IsBackboneType=true)]
     public partial class ParameterComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Task#Parameter"; } }
+      public override string TypeName { get { return "Task.input"; } }
 
       /// <summary>
       /// Label for the input
@@ -563,14 +561,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Task#Output")]
-    [BackboneType("Task.output")]
+    [FhirType("Task.output", IsBackboneType=true)]
     public partial class OutputComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Task#Output"; } }
+      public override string TypeName { get { return "Task.output"; } }
 
       /// <summary>
       /// Label for output
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/TerminologyCapabilities.cs b/src/Hl7.Fhir.R4B/Model/Generated/TerminologyCapabilities.cs
index 3cbb7ca80e..e79c8172a3 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/TerminologyCapabilities.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/TerminologyCapabilities.cs
@@ -89,14 +89,13 @@ public enum CodeSearchSupport
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TerminologyCapabilities#Software")]
-    [BackboneType("TerminologyCapabilities.software")]
+    [FhirType("TerminologyCapabilities.software", IsBackboneType=true)]
     public partial class SoftwareComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TerminologyCapabilities#Software"; } }
+      public override string TypeName { get { return "TerminologyCapabilities.software"; } }
 
       /// <summary>
       /// A name the software is known by
@@ -277,14 +276,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TerminologyCapabilities#Implementation")]
-    [BackboneType("TerminologyCapabilities.implementation")]
+    [FhirType("TerminologyCapabilities.implementation", IsBackboneType=true)]
     public partial class ImplementationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TerminologyCapabilities#Implementation"; } }
+      public override string TypeName { get { return "TerminologyCapabilities.implementation"; } }
 
       /// <summary>
       /// Describes this specific instance
@@ -466,14 +464,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TerminologyCapabilities#CodeSystem")]
-    [BackboneType("TerminologyCapabilities.codeSystem")]
+    [FhirType("TerminologyCapabilities.codeSystem", IsBackboneType=true)]
     public partial class CodeSystemComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TerminologyCapabilities#CodeSystem"; } }
+      public override string TypeName { get { return "TerminologyCapabilities.codeSystem"; } }
 
       /// <summary>
       /// URI for the Code System
@@ -680,14 +677,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TerminologyCapabilities#Version")]
-    [BackboneType("TerminologyCapabilities.codeSystem.version")]
+    [FhirType("TerminologyCapabilities.codeSystem.version", IsBackboneType=true)]
     public partial class VersionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TerminologyCapabilities#Version"; } }
+      public override string TypeName { get { return "TerminologyCapabilities.codeSystem.version"; } }
 
       /// <summary>
       /// Version identifier for this version
@@ -1021,14 +1017,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("TerminologyCapabilities#Filter")]
-    [BackboneType("TerminologyCapabilities.codeSystem.version.filter")]
+    [FhirType("TerminologyCapabilities.codeSystem.version.filter", IsBackboneType=true)]
     public partial class FilterComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TerminologyCapabilities#Filter"; } }
+      public override string TypeName { get { return "TerminologyCapabilities.codeSystem.version.filter"; } }
 
       /// <summary>
       /// Code of the property supported
@@ -1207,14 +1202,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("TerminologyCapabilities#Expansion")]
-    [BackboneType("TerminologyCapabilities.expansion")]
+    [FhirType("TerminologyCapabilities.expansion", IsBackboneType=true)]
     public partial class ExpansionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TerminologyCapabilities#Expansion"; } }
+      public override string TypeName { get { return "TerminologyCapabilities.expansion"; } }
 
       /// <summary>
       /// Whether the server can return nested value sets
@@ -1503,14 +1497,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("TerminologyCapabilities#Parameter")]
-    [BackboneType("TerminologyCapabilities.expansion.parameter")]
+    [FhirType("TerminologyCapabilities.expansion.parameter", IsBackboneType=true)]
     public partial class ParameterComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TerminologyCapabilities#Parameter"; } }
+      public override string TypeName { get { return "TerminologyCapabilities.expansion.parameter"; } }
 
       /// <summary>
       /// Expansion Parameter name
@@ -1688,14 +1681,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("TerminologyCapabilities#ValidateCode")]
-    [BackboneType("TerminologyCapabilities.validateCode")]
+    [FhirType("TerminologyCapabilities.validateCode", IsBackboneType=true)]
     public partial class ValidateCodeComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TerminologyCapabilities#ValidateCode"; } }
+      public override string TypeName { get { return "TerminologyCapabilities.validateCode"; } }
 
       /// <summary>
       /// Whether translations are validated
@@ -1830,14 +1822,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("TerminologyCapabilities#Translation")]
-    [BackboneType("TerminologyCapabilities.translation")]
+    [FhirType("TerminologyCapabilities.translation", IsBackboneType=true)]
     public partial class TranslationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TerminologyCapabilities#Translation"; } }
+      public override string TypeName { get { return "TerminologyCapabilities.translation"; } }
 
       /// <summary>
       /// Whether the client must identify the map
@@ -1975,14 +1966,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TerminologyCapabilities#Closure")]
-    [BackboneType("TerminologyCapabilities.closure")]
+    [FhirType("TerminologyCapabilities.closure", IsBackboneType=true)]
     public partial class ClosureComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TerminologyCapabilities#Closure"; } }
+      public override string TypeName { get { return "TerminologyCapabilities.closure"; } }
 
       /// <summary>
       /// If cross-system closure is supported
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/TestReport.cs b/src/Hl7.Fhir.R4B/Model/Generated/TestReport.cs
index ff8f9479ea..03210719cb 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/TestReport.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/TestReport.cs
@@ -200,14 +200,13 @@ public enum TestReportActionResult
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("TestReport#Participant")]
-    [BackboneType("TestReport.participant")]
+    [FhirType("TestReport.participant", IsBackboneType=true)]
     public partial class ParticipantComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TestReport#Participant"; } }
+      public override string TypeName { get { return "TestReport.participant"; } }
 
       /// <summary>
       /// test-engine | client | server
@@ -431,14 +430,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("TestReport#Setup")]
-    [BackboneType("TestReport.setup")]
+    [FhirType("TestReport.setup", IsBackboneType=true)]
     public partial class SetupComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TestReport#Setup"; } }
+      public override string TypeName { get { return "TestReport.setup"; } }
 
       /// <summary>
       /// A setup operation or assert that was executed
@@ -559,14 +557,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestReport#SetupAction")]
-    [BackboneType("TestReport.setup.action")]
+    [FhirType("TestReport.setup.action", IsBackboneType=true)]
     public partial class SetupActionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TestReport#SetupAction"; } }
+      public override string TypeName { get { return "TestReport.setup.action"; } }
 
       /// <summary>
       /// The operation to perform
@@ -710,14 +707,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestReport#Operation")]
-    [BackboneType("TestReport.setup.action.operation")]
+    [FhirType("TestReport.setup.action.operation", IsBackboneType=true)]
     public partial class OperationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TestReport#Operation"; } }
+      public override string TypeName { get { return "TestReport.setup.action.operation"; } }
 
       /// <summary>
       /// pass | skip | fail | warning | error
@@ -943,14 +939,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestReport#Assert")]
-    [BackboneType("TestReport.setup.action.assert")]
+    [FhirType("TestReport.setup.action.assert", IsBackboneType=true)]
     public partial class AssertComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TestReport#Assert"; } }
+      public override string TypeName { get { return "TestReport.setup.action.assert"; } }
 
       /// <summary>
       /// pass | skip | fail | warning | error
@@ -1173,14 +1168,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("TestReport#Test")]
-    [BackboneType("TestReport.test")]
+    [FhirType("TestReport.test", IsBackboneType=true)]
     public partial class TestComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TestReport#Test"; } }
+      public override string TypeName { get { return "TestReport.test"; } }
 
       /// <summary>
       /// Tracking/logging name of this test
@@ -1387,14 +1381,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestReport#TestAction")]
-    [BackboneType("TestReport.test.action")]
+    [FhirType("TestReport.test.action", IsBackboneType=true)]
     public partial class TestActionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TestReport#TestAction"; } }
+      public override string TypeName { get { return "TestReport.test.action"; } }
 
       /// <summary>
       /// The operation performed
@@ -1538,14 +1531,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestReport#Teardown")]
-    [BackboneType("TestReport.teardown")]
+    [FhirType("TestReport.teardown", IsBackboneType=true)]
     public partial class TeardownComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TestReport#Teardown"; } }
+      public override string TypeName { get { return "TestReport.teardown"; } }
 
       /// <summary>
       /// One or more teardown operations performed
@@ -1666,14 +1658,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestReport#TeardownAction")]
-    [BackboneType("TestReport.teardown.action")]
+    [FhirType("TestReport.teardown.action", IsBackboneType=true)]
     public partial class TeardownActionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TestReport#TeardownAction"; } }
+      public override string TypeName { get { return "TestReport.teardown.action"; } }
 
       /// <summary>
       /// The teardown operation performed
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/TestScript.cs b/src/Hl7.Fhir.R4B/Model/Generated/TestScript.cs
index 70a39965ad..23645e3568 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/TestScript.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/TestScript.cs
@@ -300,14 +300,13 @@ public enum AssertionResponseTypes
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#Origin")]
-    [BackboneType("TestScript.origin")]
+    [FhirType("TestScript.origin", IsBackboneType=true)]
     public partial class OriginComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TestScript#Origin"; } }
+      public override string TypeName { get { return "TestScript.origin"; } }
 
       /// <summary>
       /// The index of the abstract origin server starting at 1
@@ -473,14 +472,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#Destination")]
-    [BackboneType("TestScript.destination")]
+    [FhirType("TestScript.destination", IsBackboneType=true)]
     public partial class DestinationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TestScript#Destination"; } }
+      public override string TypeName { get { return "TestScript.destination"; } }
 
       /// <summary>
       /// The index of the abstract destination server starting at 1
@@ -645,14 +643,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#Metadata")]
-    [BackboneType("TestScript.metadata")]
+    [FhirType("TestScript.metadata", IsBackboneType=true)]
     public partial class MetadataComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TestScript#Metadata"; } }
+      public override string TypeName { get { return "TestScript.metadata"; } }
 
       /// <summary>
       /// Links to the FHIR specification
@@ -798,14 +795,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#Link")]
-    [BackboneType("TestScript.metadata.link")]
+    [FhirType("TestScript.metadata.link", IsBackboneType=true)]
     public partial class LinkComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TestScript#Link"; } }
+      public override string TypeName { get { return "TestScript.metadata.link"; } }
 
       /// <summary>
       /// URL to the specification
@@ -987,14 +983,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#Capability")]
-    [BackboneType("TestScript.metadata.capability")]
+    [FhirType("TestScript.metadata.capability", IsBackboneType=true)]
     public partial class CapabilityComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TestScript#Capability"; } }
+      public override string TypeName { get { return "TestScript.metadata.capability"; } }
 
       /// <summary>
       /// Are the capabilities required?
@@ -1394,14 +1389,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#Fixture")]
-    [BackboneType("TestScript.fixture")]
+    [FhirType("TestScript.fixture", IsBackboneType=true)]
     public partial class FixtureComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TestScript#Fixture"; } }
+      public override string TypeName { get { return "TestScript.fixture"; } }
 
       /// <summary>
       /// Whether or not to implicitly create the fixture during setup
@@ -1611,14 +1605,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#Variable")]
-    [BackboneType("TestScript.variable")]
+    [FhirType("TestScript.variable", IsBackboneType=true)]
     public partial class VariableComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TestScript#Variable"; } }
+      public override string TypeName { get { return "TestScript.variable"; } }
 
       /// <summary>
       /// Descriptive name for this variable
@@ -2054,14 +2047,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#Setup")]
-    [BackboneType("TestScript.setup")]
+    [FhirType("TestScript.setup", IsBackboneType=true)]
     public partial class SetupComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TestScript#Setup"; } }
+      public override string TypeName { get { return "TestScript.setup"; } }
 
       /// <summary>
       /// A setup operation or assert to perform
@@ -2182,14 +2174,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#SetupAction")]
-    [BackboneType("TestScript.setup.action")]
+    [FhirType("TestScript.setup.action", IsBackboneType=true)]
     public partial class SetupActionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TestScript#SetupAction"; } }
+      public override string TypeName { get { return "TestScript.setup.action"; } }
 
       /// <summary>
       /// The setup operation to perform
@@ -2333,14 +2324,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#Operation")]
-    [BackboneType("TestScript.setup.action.operation")]
+    [FhirType("TestScript.setup.action.operation", IsBackboneType=true)]
     public partial class OperationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TestScript#Operation"; } }
+      public override string TypeName { get { return "TestScript.setup.action.operation"; } }
 
       /// <summary>
       /// The operation code type that will be executed
@@ -3139,14 +3129,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#RequestHeader")]
-    [BackboneType("TestScript.setup.action.operation.requestHeader")]
+    [FhirType("TestScript.setup.action.operation.requestHeader", IsBackboneType=true)]
     public partial class RequestHeaderComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TestScript#RequestHeader"; } }
+      public override string TypeName { get { return "TestScript.setup.action.operation.requestHeader"; } }
 
       /// <summary>
       /// HTTP header field name
@@ -3329,14 +3318,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#Assert")]
-    [BackboneType("TestScript.setup.action.assert")]
+    [FhirType("TestScript.setup.action.assert", IsBackboneType=true)]
     public partial class AssertComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TestScript#Assert"; } }
+      public override string TypeName { get { return "TestScript.setup.action.assert"; } }
 
       /// <summary>
       /// Tracking/logging assertion label
@@ -4385,14 +4373,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#Test")]
-    [BackboneType("TestScript.test")]
+    [FhirType("TestScript.test", IsBackboneType=true)]
     public partial class TestComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TestScript#Test"; } }
+      public override string TypeName { get { return "TestScript.test"; } }
 
       /// <summary>
       /// Tracking/logging name of this test
@@ -4599,14 +4586,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#TestAction")]
-    [BackboneType("TestScript.test.action")]
+    [FhirType("TestScript.test.action", IsBackboneType=true)]
     public partial class TestActionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TestScript#TestAction"; } }
+      public override string TypeName { get { return "TestScript.test.action"; } }
 
       /// <summary>
       /// The setup operation to perform
@@ -4750,14 +4736,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#Teardown")]
-    [BackboneType("TestScript.teardown")]
+    [FhirType("TestScript.teardown", IsBackboneType=true)]
     public partial class TeardownComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TestScript#Teardown"; } }
+      public override string TypeName { get { return "TestScript.teardown"; } }
 
       /// <summary>
       /// One or more teardown operations to perform
@@ -4878,14 +4863,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#TeardownAction")]
-    [BackboneType("TestScript.teardown.action")]
+    [FhirType("TestScript.teardown.action", IsBackboneType=true)]
     public partial class TeardownActionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TestScript#TeardownAction"; } }
+      public override string TypeName { get { return "TestScript.teardown.action"; } }
 
       /// <summary>
       /// The teardown operation to perform
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Timing.cs b/src/Hl7.Fhir.R4B/Model/Generated/Timing.cs
index c2da5044de..019d7fcef4 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/Timing.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/Timing.cs
@@ -287,14 +287,13 @@ public enum EventTiming
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Timing#Repeat")]
-    [BackboneType("Timing.repeat")]
+    [FhirType("Timing.repeat", IsBackboneType=true)]
     public partial class RepeatComponent : Hl7.Fhir.Model.Element
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Timing#Repeat"; } }
+      public override string TypeName { get { return "Timing.repeat"; } }
 
       /// <summary>
       /// Length/Range of lengths, or (Start and/or end) limits
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/VerificationResult.cs b/src/Hl7.Fhir.R4B/Model/Generated/VerificationResult.cs
index 5faade4f52..84bb7be7d1 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/VerificationResult.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/VerificationResult.cs
@@ -107,14 +107,13 @@ public enum StatusCode
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("VerificationResult#PrimarySource")]
-    [BackboneType("VerificationResult.primarySource")]
+    [FhirType("VerificationResult.primarySource", IsBackboneType=true)]
     public partial class PrimarySourceComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "VerificationResult#PrimarySource"; } }
+      public override string TypeName { get { return "VerificationResult.primarySource"; } }
 
       /// <summary>
       /// Reference to the primary source
@@ -408,14 +407,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("VerificationResult#Attestation")]
-    [BackboneType("VerificationResult.attestation")]
+    [FhirType("VerificationResult.attestation", IsBackboneType=true)]
     public partial class AttestationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "VerificationResult#Attestation"; } }
+      public override string TypeName { get { return "VerificationResult.attestation"; } }
 
       /// <summary>
       /// The individual or organization attesting to information
@@ -765,14 +763,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("VerificationResult#Validator")]
-    [BackboneType("VerificationResult.validator")]
+    [FhirType("VerificationResult.validator", IsBackboneType=true)]
     public partial class ValidatorComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "VerificationResult#Validator"; } }
+      public override string TypeName { get { return "VerificationResult.validator"; } }
 
       /// <summary>
       /// Reference to the organization validating information
diff --git a/src/Hl7.Fhir.R4B/Model/Generated/VisionPrescription.cs b/src/Hl7.Fhir.R4B/Model/Generated/VisionPrescription.cs
index c54e9636f3..9ff8590b27 100644
--- a/src/Hl7.Fhir.R4B/Model/Generated/VisionPrescription.cs
+++ b/src/Hl7.Fhir.R4B/Model/Generated/VisionPrescription.cs
@@ -123,14 +123,13 @@ public enum VisionBase
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("VisionPrescription#LensSpecification")]
-    [BackboneType("VisionPrescription.lensSpecification")]
+    [FhirType("VisionPrescription.lensSpecification", IsBackboneType=true)]
     public partial class LensSpecificationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "VisionPrescription#LensSpecification"; } }
+      public override string TypeName { get { return "VisionPrescription.lensSpecification"; } }
 
       /// <summary>
       /// Product to be supplied
@@ -761,14 +760,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("VisionPrescription#Prism")]
-    [BackboneType("VisionPrescription.lensSpecification.prism")]
+    [FhirType("VisionPrescription.lensSpecification.prism", IsBackboneType=true)]
     public partial class PrismComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "VisionPrescription#Prism"; } }
+      public override string TypeName { get { return "VisionPrescription.lensSpecification.prism"; } }
 
       /// <summary>
       /// Amount of adjustment
diff --git a/src/Hl7.Fhir.R5/Model/Generated/Account.cs b/src/Hl7.Fhir.R5/Model/Generated/Account.cs
index fceee09945..3230d42e63 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/Account.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/Account.cs
@@ -109,14 +109,13 @@ public enum AccountStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Account#Coverage")]
-    [BackboneType("Account.coverage")]
+    [FhirType("Account.coverage", IsBackboneType=true)]
     public partial class CoverageComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Account#Coverage"; } }
+      public override string TypeName { get { return "Account.coverage"; } }
 
       /// <summary>
       /// The party(s), such as insurances, that may contribute to the payment of this account
@@ -281,14 +280,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Account#Guarantor")]
-    [BackboneType("Account.guarantor")]
+    [FhirType("Account.guarantor", IsBackboneType=true)]
     public partial class GuarantorComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Account#Guarantor"; } }
+      public override string TypeName { get { return "Account.guarantor"; } }
 
       /// <summary>
       /// Responsible entity
@@ -478,14 +476,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Account#Diagnosis")]
-    [BackboneType("Account.diagnosis")]
+    [FhirType("Account.diagnosis", IsBackboneType=true)]
     public partial class DiagnosisComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Account#Diagnosis"; } }
+      public override string TypeName { get { return "Account.diagnosis"; } }
 
       /// <summary>
       /// Ranking of the diagnosis (for each type)
@@ -789,14 +786,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Account#Procedure")]
-    [BackboneType("Account.procedure")]
+    [FhirType("Account.procedure", IsBackboneType=true)]
     public partial class ProcedureComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Account#Procedure"; } }
+      public override string TypeName { get { return "Account.procedure"; } }
 
       /// <summary>
       /// Ranking of the procedure (for each type)
@@ -1081,14 +1077,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Account#RelatedAccount")]
-    [BackboneType("Account.relatedAccount")]
+    [FhirType("Account.relatedAccount", IsBackboneType=true)]
     public partial class RelatedAccountComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Account#RelatedAccount"; } }
+      public override string TypeName { get { return "Account.relatedAccount"; } }
 
       /// <summary>
       /// Relationship of the associated Account
@@ -1237,14 +1232,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Account#Balance")]
-    [BackboneType("Account.balance")]
+    [FhirType("Account.balance", IsBackboneType=true)]
     public partial class BalanceComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Account#Balance"; } }
+      public override string TypeName { get { return "Account.balance"; } }
 
       /// <summary>
       /// Who is expected to pay this part of the balance
diff --git a/src/Hl7.Fhir.R5/Model/Generated/ActivityDefinition.cs b/src/Hl7.Fhir.R5/Model/Generated/ActivityDefinition.cs
index 7f64ecaa13..c7793d167f 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/ActivityDefinition.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/ActivityDefinition.cs
@@ -179,14 +179,13 @@ public enum RequestResourceTypes
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ActivityDefinition#Participant")]
-    [BackboneType("ActivityDefinition.participant")]
+    [FhirType("ActivityDefinition.participant", IsBackboneType=true)]
     public partial class ParticipantComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ActivityDefinition#Participant"; } }
+      public override string TypeName { get { return "ActivityDefinition.participant"; } }
 
       /// <summary>
       /// careteam | device | group | healthcareservice | location | organization | patient | practitioner | practitionerrole | relatedperson
@@ -448,14 +447,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ActivityDefinition#DynamicValue")]
-    [BackboneType("ActivityDefinition.dynamicValue")]
+    [FhirType("ActivityDefinition.dynamicValue", IsBackboneType=true)]
     public partial class DynamicValueComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ActivityDefinition#DynamicValue"; } }
+      public override string TypeName { get { return "ActivityDefinition.dynamicValue"; } }
 
       /// <summary>
       /// The path to the element to be set dynamically
diff --git a/src/Hl7.Fhir.R5/Model/Generated/AdministrableProductDefinition.cs b/src/Hl7.Fhir.R5/Model/Generated/AdministrableProductDefinition.cs
index 1887e38a3c..e57806f883 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/AdministrableProductDefinition.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/AdministrableProductDefinition.cs
@@ -64,14 +64,13 @@ public partial class AdministrableProductDefinition : Hl7.Fhir.Model.DomainResou
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("AdministrableProductDefinition#Property")]
-    [BackboneType("AdministrableProductDefinition.property")]
+    [FhirType("AdministrableProductDefinition.property", IsBackboneType=true)]
     public partial class PropertyComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "AdministrableProductDefinition#Property"; } }
+      public override string TypeName { get { return "AdministrableProductDefinition.property"; } }
 
       /// <summary>
       /// A code expressing the type of characteristic
@@ -246,14 +245,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("AdministrableProductDefinition#RouteOfAdministration")]
-    [BackboneType("AdministrableProductDefinition.routeOfAdministration")]
+    [FhirType("AdministrableProductDefinition.routeOfAdministration", IsBackboneType=true)]
     public partial class RouteOfAdministrationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "AdministrableProductDefinition#RouteOfAdministration"; } }
+      public override string TypeName { get { return "AdministrableProductDefinition.routeOfAdministration"; } }
 
       /// <summary>
       /// Coded expression for the route
@@ -522,14 +520,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("AdministrableProductDefinition#TargetSpecies")]
-    [BackboneType("AdministrableProductDefinition.routeOfAdministration.targetSpecies")]
+    [FhirType("AdministrableProductDefinition.routeOfAdministration.targetSpecies", IsBackboneType=true)]
     public partial class TargetSpeciesComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "AdministrableProductDefinition#TargetSpecies"; } }
+      public override string TypeName { get { return "AdministrableProductDefinition.routeOfAdministration.targetSpecies"; } }
 
       /// <summary>
       /// Coded expression for the species
@@ -673,14 +670,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("AdministrableProductDefinition#WithdrawalPeriod")]
-    [BackboneType("AdministrableProductDefinition.routeOfAdministration.targetSpecies.withdrawalPeriod")]
+    [FhirType("AdministrableProductDefinition.routeOfAdministration.targetSpecies.withdrawalPeriod", IsBackboneType=true)]
     public partial class WithdrawalPeriodComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "AdministrableProductDefinition#WithdrawalPeriod"; } }
+      public override string TypeName { get { return "AdministrableProductDefinition.routeOfAdministration.targetSpecies.withdrawalPeriod"; } }
 
       /// <summary>
       /// The type of tissue for which the withdrawal period applies, e.g. meat, milk
diff --git a/src/Hl7.Fhir.R5/Model/Generated/AdverseEvent.cs b/src/Hl7.Fhir.R5/Model/Generated/AdverseEvent.cs
index 9d62ac7bba..2b88cf4f6b 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/AdverseEvent.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/AdverseEvent.cs
@@ -123,14 +123,13 @@ public enum AdverseEventActuality
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("AdverseEvent#Participant")]
-    [BackboneType("AdverseEvent.participant")]
+    [FhirType("AdverseEvent.participant", IsBackboneType=true)]
     public partial class ParticipantComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "AdverseEvent#Participant"; } }
+      public override string TypeName { get { return "AdverseEvent.participant"; } }
 
       /// <summary>
       /// Type of involvement
@@ -278,14 +277,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("AdverseEvent#SuspectEntity")]
-    [BackboneType("AdverseEvent.suspectEntity")]
+    [FhirType("AdverseEvent.suspectEntity", IsBackboneType=true)]
     public partial class SuspectEntityComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "AdverseEvent#SuspectEntity"; } }
+      public override string TypeName { get { return "AdverseEvent.suspectEntity"; } }
 
       /// <summary>
       /// Refers to the specific entity that caused the adverse event
@@ -430,14 +428,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("AdverseEvent#Causality")]
-    [BackboneType("AdverseEvent.suspectEntity.causality")]
+    [FhirType("AdverseEvent.suspectEntity.causality", IsBackboneType=true)]
     public partial class CausalityComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "AdverseEvent#Causality"; } }
+      public override string TypeName { get { return "AdverseEvent.suspectEntity.causality"; } }
 
       /// <summary>
       /// Method of evaluating the relatedness of the suspected entity to the event
@@ -610,14 +607,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("AdverseEvent#ContributingFactor")]
-    [BackboneType("AdverseEvent.contributingFactor")]
+    [FhirType("AdverseEvent.contributingFactor", IsBackboneType=true)]
     public partial class ContributingFactorComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "AdverseEvent#ContributingFactor"; } }
+      public override string TypeName { get { return "AdverseEvent.contributingFactor"; } }
 
       /// <summary>
       /// Item suspected to have increased the probability or severity of the adverse event
@@ -738,14 +734,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("AdverseEvent#PreventiveAction")]
-    [BackboneType("AdverseEvent.preventiveAction")]
+    [FhirType("AdverseEvent.preventiveAction", IsBackboneType=true)]
     public partial class PreventiveActionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "AdverseEvent#PreventiveAction"; } }
+      public override string TypeName { get { return "AdverseEvent.preventiveAction"; } }
 
       /// <summary>
       /// Action that contributed to avoiding the adverse event
@@ -869,14 +864,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("AdverseEvent#MitigatingAction")]
-    [BackboneType("AdverseEvent.mitigatingAction")]
+    [FhirType("AdverseEvent.mitigatingAction", IsBackboneType=true)]
     public partial class MitigatingActionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "AdverseEvent#MitigatingAction"; } }
+      public override string TypeName { get { return "AdverseEvent.mitigatingAction"; } }
 
       /// <summary>
       /// Ameliorating action taken after the adverse event occured in order to reduce the extent of harm
@@ -997,14 +991,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("AdverseEvent#SupportingInfo")]
-    [BackboneType("AdverseEvent.supportingInfo")]
+    [FhirType("AdverseEvent.supportingInfo", IsBackboneType=true)]
     public partial class SupportingInfoComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "AdverseEvent#SupportingInfo"; } }
+      public override string TypeName { get { return "AdverseEvent.supportingInfo"; } }
 
       /// <summary>
       /// Subject medical history or document relevant to this adverse event
diff --git a/src/Hl7.Fhir.R5/Model/Generated/AllergyIntolerance.cs b/src/Hl7.Fhir.R5/Model/Generated/AllergyIntolerance.cs
index a638ea57cd..a533d020de 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/AllergyIntolerance.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/AllergyIntolerance.cs
@@ -226,14 +226,13 @@ public enum AllergyIntoleranceSeverity
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("AllergyIntolerance#Participant")]
-    [BackboneType("AllergyIntolerance.participant")]
+    [FhirType("AllergyIntolerance.participant", IsBackboneType=true)]
     public partial class ParticipantComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "AllergyIntolerance#Participant"; } }
+      public override string TypeName { get { return "AllergyIntolerance.participant"; } }
 
       /// <summary>
       /// Type of involvement
@@ -381,14 +380,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("AllergyIntolerance#Reaction")]
-    [BackboneType("AllergyIntolerance.reaction")]
+    [FhirType("AllergyIntolerance.reaction", IsBackboneType=true)]
     public partial class ReactionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "AllergyIntolerance#Reaction"; } }
+      public override string TypeName { get { return "AllergyIntolerance.reaction"; } }
 
       /// <summary>
       /// Specific substance or pharmaceutical product considered to be responsible for event
diff --git a/src/Hl7.Fhir.R5/Model/Generated/Appointment.cs b/src/Hl7.Fhir.R5/Model/Generated/Appointment.cs
index baf6afebfb..8e2b95cde2 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/Appointment.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/Appointment.cs
@@ -3032,14 +3032,13 @@ public enum WeekOfMonth
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Appointment#Participant")]
-    [BackboneType("Appointment.participant")]
+    [FhirType("Appointment.participant", IsBackboneType=true)]
     public partial class ParticipantComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Appointment#Participant"; } }
+      public override string TypeName { get { return "Appointment.participant"; } }
 
       /// <summary>
       /// Role of participant in the appointment
@@ -3301,14 +3300,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Appointment#RecurrenceTemplate")]
-    [BackboneType("Appointment.recurrenceTemplate")]
+    [FhirType("Appointment.recurrenceTemplate", IsBackboneType=true)]
     public partial class RecurrenceTemplateComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Appointment#RecurrenceTemplate"; } }
+      public override string TypeName { get { return "Appointment.recurrenceTemplate"; } }
 
       /// <summary>
       /// The timezone of the occurrences
@@ -3745,14 +3743,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Appointment#WeeklyTemplate")]
-    [BackboneType("Appointment.recurrenceTemplate.weeklyTemplate")]
+    [FhirType("Appointment.recurrenceTemplate.weeklyTemplate", IsBackboneType=true)]
     public partial class WeeklyTemplateComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Appointment#WeeklyTemplate"; } }
+      public override string TypeName { get { return "Appointment.recurrenceTemplate.weeklyTemplate"; } }
 
       /// <summary>
       /// Recurs on Mondays
@@ -4187,14 +4184,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Appointment#MonthlyTemplate")]
-    [BackboneType("Appointment.recurrenceTemplate.monthlyTemplate")]
+    [FhirType("Appointment.recurrenceTemplate.monthlyTemplate", IsBackboneType=true)]
     public partial class MonthlyTemplateComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Appointment#MonthlyTemplate"; } }
+      public override string TypeName { get { return "Appointment.recurrenceTemplate.monthlyTemplate"; } }
 
       /// <summary>
       /// Recurs on a specific day of the month
@@ -4424,14 +4420,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Appointment#YearlyTemplate")]
-    [BackboneType("Appointment.recurrenceTemplate.yearlyTemplate")]
+    [FhirType("Appointment.recurrenceTemplate.yearlyTemplate", IsBackboneType=true)]
     public partial class YearlyTemplateComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Appointment#YearlyTemplate"; } }
+      public override string TypeName { get { return "Appointment.recurrenceTemplate.yearlyTemplate"; } }
 
       /// <summary>
       /// Recurs every nth year
diff --git a/src/Hl7.Fhir.R5/Model/Generated/ArtifactAssessment.cs b/src/Hl7.Fhir.R5/Model/Generated/ArtifactAssessment.cs
index 4c547a3230..42f032a91a 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/ArtifactAssessment.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/ArtifactAssessment.cs
@@ -223,14 +223,13 @@ public enum ArtifactAssessmentInformationType
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ArtifactAssessment#Content")]
-    [BackboneType("ArtifactAssessment.content")]
+    [FhirType("ArtifactAssessment.content", IsBackboneType=true)]
     public partial class ContentComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ArtifactAssessment#Content"; } }
+      public override string TypeName { get { return "ArtifactAssessment.content"; } }
 
       /// <summary>
       /// comment | classifier | rating | container | response | change-request
diff --git a/src/Hl7.Fhir.R5/Model/Generated/AuditEvent.cs b/src/Hl7.Fhir.R5/Model/Generated/AuditEvent.cs
index d5537e8222..1db229fa24 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/AuditEvent.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/AuditEvent.cs
@@ -167,14 +167,13 @@ public enum AuditEventSeverity
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("AuditEvent#Outcome")]
-    [BackboneType("AuditEvent.outcome")]
+    [FhirType("AuditEvent.outcome", IsBackboneType=true)]
     public partial class OutcomeComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "AuditEvent#Outcome"; } }
+      public override string TypeName { get { return "AuditEvent.outcome"; } }
 
       /// <summary>
       /// Whether the event succeeded or failed
@@ -325,14 +324,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("AuditEvent#Agent")]
-    [BackboneType("AuditEvent.agent")]
+    [FhirType("AuditEvent.agent", IsBackboneType=true)]
     public partial class AgentComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "AuditEvent#Agent"; } }
+      public override string TypeName { get { return "AuditEvent.agent"; } }
 
       /// <summary>
       /// How agent participated
@@ -677,14 +675,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("AuditEvent#Source")]
-    [BackboneType("AuditEvent.source")]
+    [FhirType("AuditEvent.source", IsBackboneType=true)]
     public partial class SourceComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "AuditEvent#Source"; } }
+      public override string TypeName { get { return "AuditEvent.source"; } }
 
       /// <summary>
       /// Logical source location within the enterprise
@@ -861,14 +858,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("AuditEvent#Entity")]
-    [BackboneType("AuditEvent.entity")]
+    [FhirType("AuditEvent.entity", IsBackboneType=true)]
     public partial class EntityComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "AuditEvent#Entity"; } }
+      public override string TypeName { get { return "AuditEvent.entity"; } }
 
       /// <summary>
       /// Specific instance of resource
@@ -1137,14 +1133,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("AuditEvent#Detail")]
-    [BackboneType("AuditEvent.entity.detail")]
+    [FhirType("AuditEvent.entity.detail", IsBackboneType=true)]
     public partial class DetailComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "AuditEvent#Detail"; } }
+      public override string TypeName { get { return "AuditEvent.entity.detail"; } }
 
       /// <summary>
       /// Name of the property
diff --git a/src/Hl7.Fhir.R5/Model/Generated/Availability.cs b/src/Hl7.Fhir.R5/Model/Generated/Availability.cs
index e2408f8076..1a63e805e9 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/Availability.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/Availability.cs
@@ -61,14 +61,13 @@ public partial class Availability : Hl7.Fhir.Model.DataType
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Availability#AvailableTime")]
-    [BackboneType("Availability.availableTime")]
+    [FhirType("Availability.availableTime", IsBackboneType=true)]
     public partial class AvailableTimeComponent : Hl7.Fhir.Model.Element
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Availability#AvailableTime"; } }
+      public override string TypeName { get { return "Availability.availableTime"; } }
 
       /// <summary>
       /// mon | tue | wed | thu | fri | sat | sun
@@ -334,14 +333,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Availability#NotAvailableTime")]
-    [BackboneType("Availability.notAvailableTime")]
+    [FhirType("Availability.notAvailableTime", IsBackboneType=true)]
     public partial class NotAvailableTimeComponent : Hl7.Fhir.Model.Element
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Availability#NotAvailableTime"; } }
+      public override string TypeName { get { return "Availability.notAvailableTime"; } }
 
       /// <summary>
       /// Reason presented to the user explaining why time not available
diff --git a/src/Hl7.Fhir.R5/Model/Generated/BiologicallyDerivedProduct.cs b/src/Hl7.Fhir.R5/Model/Generated/BiologicallyDerivedProduct.cs
index 719f7d2910..f2f73cfd3d 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/BiologicallyDerivedProduct.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/BiologicallyDerivedProduct.cs
@@ -66,14 +66,13 @@ public partial class BiologicallyDerivedProduct : Hl7.Fhir.Model.DomainResource,
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("BiologicallyDerivedProduct#Collection")]
-    [BackboneType("BiologicallyDerivedProduct.collection")]
+    [FhirType("BiologicallyDerivedProduct.collection", IsBackboneType=true)]
     public partial class CollectionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "BiologicallyDerivedProduct#Collection"; } }
+      public override string TypeName { get { return "BiologicallyDerivedProduct.collection"; } }
 
       /// <summary>
       /// Individual performing collection
@@ -248,14 +247,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("BiologicallyDerivedProduct#Property")]
-    [BackboneType("BiologicallyDerivedProduct.property")]
+    [FhirType("BiologicallyDerivedProduct.property", IsBackboneType=true)]
     public partial class PropertyComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "BiologicallyDerivedProduct#Property"; } }
+      public override string TypeName { get { return "BiologicallyDerivedProduct.property"; } }
 
       /// <summary>
       /// Code that specifies the property
diff --git a/src/Hl7.Fhir.R5/Model/Generated/BiologicallyDerivedProductDispense.cs b/src/Hl7.Fhir.R5/Model/Generated/BiologicallyDerivedProductDispense.cs
index 51fd2b9b7f..26070cc7df 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/BiologicallyDerivedProductDispense.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/BiologicallyDerivedProductDispense.cs
@@ -122,14 +122,13 @@ public enum BiologicallyDerivedProductDispenseCodes
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("BiologicallyDerivedProductDispense#Performer")]
-    [BackboneType("BiologicallyDerivedProductDispense.performer")]
+    [FhirType("BiologicallyDerivedProductDispense.performer", IsBackboneType=true)]
     public partial class PerformerComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "BiologicallyDerivedProductDispense#Performer"; } }
+      public override string TypeName { get { return "BiologicallyDerivedProductDispense.performer"; } }
 
       /// <summary>
       /// Identifies the function of the performer during the dispense
diff --git a/src/Hl7.Fhir.R5/Model/Generated/BodyStructure.cs b/src/Hl7.Fhir.R5/Model/Generated/BodyStructure.cs
index 144db9ccc0..abfcaa4b76 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/BodyStructure.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/BodyStructure.cs
@@ -67,14 +67,13 @@ public partial class BodyStructure : Hl7.Fhir.Model.DomainResource, IIdentifiabl
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("BodyStructure#IncludedStructure")]
-    [BackboneType("BodyStructure.includedStructure")]
+    [FhirType("BodyStructure.includedStructure", IsBackboneType=true)]
     public partial class IncludedStructureComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "BodyStructure#IncludedStructure"; } }
+      public override string TypeName { get { return "BodyStructure.includedStructure"; } }
 
       /// <summary>
       /// Code that represents the included structure
@@ -302,14 +301,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("BodyStructure#BodyLandmarkOrientation")]
-    [BackboneType("BodyStructure.includedStructure.bodyLandmarkOrientation")]
+    [FhirType("BodyStructure.includedStructure.bodyLandmarkOrientation", IsBackboneType=true)]
     public partial class BodyLandmarkOrientationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "BodyStructure#BodyLandmarkOrientation"; } }
+      public override string TypeName { get { return "BodyStructure.includedStructure.bodyLandmarkOrientation"; } }
 
       /// <summary>
       /// Body ]andmark description
@@ -510,14 +508,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("BodyStructure#DistanceFromLandmark")]
-    [BackboneType("BodyStructure.includedStructure.bodyLandmarkOrientation.distanceFromLandmark")]
+    [FhirType("BodyStructure.includedStructure.bodyLandmarkOrientation.distanceFromLandmark", IsBackboneType=true)]
     public partial class DistanceFromLandmarkComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "BodyStructure#DistanceFromLandmark"; } }
+      public override string TypeName { get { return "BodyStructure.includedStructure.bodyLandmarkOrientation.distanceFromLandmark"; } }
 
       /// <summary>
       /// Measurement device
diff --git a/src/Hl7.Fhir.R5/Model/Generated/CarePlan.cs b/src/Hl7.Fhir.R5/Model/Generated/CarePlan.cs
index 5e7ad63097..85aedb510d 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/CarePlan.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/CarePlan.cs
@@ -107,14 +107,13 @@ public enum CarePlanIntent
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CarePlan#Activity")]
-    [BackboneType("CarePlan.activity")]
+    [FhirType("CarePlan.activity", IsBackboneType=true)]
     public partial class ActivityComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "CarePlan#Activity"; } }
+      public override string TypeName { get { return "CarePlan.activity"; } }
 
       /// <summary>
       /// Results of the activity (concept, or Appointment, Encounter, Procedure, etc.)
diff --git a/src/Hl7.Fhir.R5/Model/Generated/CareTeam.cs b/src/Hl7.Fhir.R5/Model/Generated/CareTeam.cs
index f7da5ed914..500b9a6100 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/CareTeam.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/CareTeam.cs
@@ -107,14 +107,13 @@ public enum CareTeamStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CareTeam#Participant")]
-    [BackboneType("CareTeam.participant")]
+    [FhirType("CareTeam.participant", IsBackboneType=true)]
     public partial class ParticipantComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "CareTeam#Participant"; } }
+      public override string TypeName { get { return "CareTeam.participant"; } }
 
       /// <summary>
       /// Type of involvement
diff --git a/src/Hl7.Fhir.R5/Model/Generated/ChargeItem.cs b/src/Hl7.Fhir.R5/Model/Generated/ChargeItem.cs
index dbcae2b832..f2ccc88301 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/ChargeItem.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/ChargeItem.cs
@@ -119,14 +119,13 @@ public enum ChargeItemStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ChargeItem#Performer")]
-    [BackboneType("ChargeItem.performer")]
+    [FhirType("ChargeItem.performer", IsBackboneType=true)]
     public partial class PerformerComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ChargeItem#Performer"; } }
+      public override string TypeName { get { return "ChargeItem.performer"; } }
 
       /// <summary>
       /// What type of performance was done
diff --git a/src/Hl7.Fhir.R5/Model/Generated/ChargeItemDefinition.cs b/src/Hl7.Fhir.R5/Model/Generated/ChargeItemDefinition.cs
index ae79d4d890..bb1a905071 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/ChargeItemDefinition.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/ChargeItemDefinition.cs
@@ -68,14 +68,13 @@ public partial class ChargeItemDefinition : Hl7.Fhir.Model.DomainResource, IIden
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ChargeItemDefinition#Applicability")]
-    [BackboneType("ChargeItemDefinition.applicability")]
+    [FhirType("ChargeItemDefinition.applicability", IsBackboneType=true)]
     public partial class ApplicabilityComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ChargeItemDefinition#Applicability"; } }
+      public override string TypeName { get { return "ChargeItemDefinition.applicability"; } }
 
       /// <summary>
       /// Boolean-valued expression
@@ -244,14 +243,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ChargeItemDefinition#PropertyGroup")]
-    [BackboneType("ChargeItemDefinition.propertyGroup")]
+    [FhirType("ChargeItemDefinition.propertyGroup", IsBackboneType=true)]
     public partial class PropertyGroupComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ChargeItemDefinition#PropertyGroup"; } }
+      public override string TypeName { get { return "ChargeItemDefinition.propertyGroup"; } }
 
       /// <summary>
       /// Conditions under which the priceComponent is applicable
diff --git a/src/Hl7.Fhir.R5/Model/Generated/Citation.cs b/src/Hl7.Fhir.R5/Model/Generated/Citation.cs
index 76ec8bf1f1..62fa855045 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/Citation.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/Citation.cs
@@ -302,14 +302,13 @@ public enum RelatedArtifactTypeExpanded
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Citation#Summary")]
-    [BackboneType("Citation.summary")]
+    [FhirType("Citation.summary", IsBackboneType=true)]
     public partial class SummaryComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Citation#Summary"; } }
+      public override string TypeName { get { return "Citation.summary"; } }
 
       /// <summary>
       /// Format for display of the citation summary
@@ -473,14 +472,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Citation#Classification")]
-    [BackboneType("Citation.classification")]
+    [FhirType("Citation.classification", IsBackboneType=true)]
     public partial class ClassificationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Citation#Classification"; } }
+      public override string TypeName { get { return "Citation.classification"; } }
 
       /// <summary>
       /// The kind of classifier (e.g. publication type, keyword)
@@ -628,14 +626,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Citation#StatusDate")]
-    [BackboneType("Citation.statusDate")]
+    [FhirType("Citation.statusDate", IsBackboneType=true)]
     public partial class StatusDateComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Citation#StatusDate"; } }
+      public override string TypeName { get { return "Citation.statusDate"; } }
 
       /// <summary>
       /// Classification of the status
@@ -822,14 +819,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Citation#CitedArtifact")]
-    [BackboneType("Citation.citedArtifact")]
+    [FhirType("Citation.citedArtifact", IsBackboneType=true)]
     public partial class CitedArtifactComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Citation#CitedArtifact"; } }
+      public override string TypeName { get { return "Citation.citedArtifact"; } }
 
       /// <summary>
       /// Unique identifier. May include DOI, PMID, PMCID, etc
@@ -1325,14 +1321,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Citation#CitedArtifactVersion")]
-    [BackboneType("Citation.citedArtifact.version")]
+    [FhirType("Citation.citedArtifact.version", IsBackboneType=true)]
     public partial class CitedArtifactVersionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Citation#CitedArtifactVersion"; } }
+      public override string TypeName { get { return "Citation.citedArtifact.version"; } }
 
       /// <summary>
       /// The version number or other version identifier
@@ -1497,14 +1492,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Citation#CitedArtifactStatusDate")]
-    [BackboneType("Citation.citedArtifact.statusDate")]
+    [FhirType("Citation.citedArtifact.statusDate", IsBackboneType=true)]
     public partial class CitedArtifactStatusDateComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Citation#CitedArtifactStatusDate"; } }
+      public override string TypeName { get { return "Citation.citedArtifact.statusDate"; } }
 
       /// <summary>
       /// Classification of the status
@@ -1691,14 +1685,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Citation#CitedArtifactTitle")]
-    [BackboneType("Citation.citedArtifact.title")]
+    [FhirType("Citation.citedArtifact.title", IsBackboneType=true)]
     public partial class CitedArtifactTitleComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Citation#CitedArtifactTitle"; } }
+      public override string TypeName { get { return "Citation.citedArtifact.title"; } }
 
       /// <summary>
       /// The kind of title
@@ -1889,14 +1882,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Citation#CitedArtifactAbstract")]
-    [BackboneType("Citation.citedArtifact.abstract")]
+    [FhirType("Citation.citedArtifact.abstract", IsBackboneType=true)]
     public partial class CitedArtifactAbstractComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Citation#CitedArtifactAbstract"; } }
+      public override string TypeName { get { return "Citation.citedArtifact.abstract"; } }
 
       /// <summary>
       /// The kind of abstract
@@ -2126,14 +2118,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Citation#CitedArtifactPart")]
-    [BackboneType("Citation.citedArtifact.part")]
+    [FhirType("Citation.citedArtifact.part", IsBackboneType=true)]
     public partial class CitedArtifactPartComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Citation#CitedArtifactPart"; } }
+      public override string TypeName { get { return "Citation.citedArtifact.part"; } }
 
       /// <summary>
       /// The kind of component
@@ -2323,14 +2314,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Citation#CitedArtifactRelatesTo")]
-    [BackboneType("Citation.citedArtifact.relatesTo")]
+    [FhirType("Citation.citedArtifact.relatesTo", IsBackboneType=true)]
     public partial class CitedArtifactRelatesToComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Citation#CitedArtifactRelatesTo"; } }
+      public override string TypeName { get { return "Citation.citedArtifact.relatesTo"; } }
 
       /// <summary>
       /// documentation | justification | citation | predecessor | successor | derived-from | depends-on | composed-of | part-of | amends | amended-with | appends | appended-with | cites | cited-by | comments-on | comment-in | contains | contained-in | corrects | correction-in | replaces | replaced-with | retracts | retracted-by | signs | similar-to | supports | supported-with | transforms | transformed-into | transformed-with | documents | specification-of | created-with | cite-as | reprint | reprint-of
@@ -2719,14 +2709,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Citation#CitedArtifactPublicationForm")]
-    [BackboneType("Citation.citedArtifact.publicationForm")]
+    [FhirType("Citation.citedArtifact.publicationForm", IsBackboneType=true)]
     public partial class CitedArtifactPublicationFormComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Citation#CitedArtifactPublicationForm"; } }
+      public override string TypeName { get { return "Citation.citedArtifact.publicationForm"; } }
 
       /// <summary>
       /// The collection the cited article or artifact is published in
@@ -3411,14 +3400,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Citation#CitedArtifactPublicationFormPublishedIn")]
-    [BackboneType("Citation.citedArtifact.publicationForm.publishedIn")]
+    [FhirType("Citation.citedArtifact.publicationForm.publishedIn", IsBackboneType=true)]
     public partial class CitedArtifactPublicationFormPublishedInComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Citation#CitedArtifactPublicationFormPublishedIn"; } }
+      public override string TypeName { get { return "Citation.citedArtifact.publicationForm.publishedIn"; } }
 
       /// <summary>
       /// Kind of container (e.g. Periodical, database, or book)
@@ -3674,14 +3662,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Citation#CitedArtifactWebLocation")]
-    [BackboneType("Citation.citedArtifact.webLocation")]
+    [FhirType("Citation.citedArtifact.webLocation", IsBackboneType=true)]
     public partial class CitedArtifactWebLocationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Citation#CitedArtifactWebLocation"; } }
+      public override string TypeName { get { return "Citation.citedArtifact.webLocation"; } }
 
       /// <summary>
       /// Code the reason for different URLs, e.g. abstract and full-text
@@ -3842,14 +3829,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Citation#CitedArtifactClassification")]
-    [BackboneType("Citation.citedArtifact.classification")]
+    [FhirType("Citation.citedArtifact.classification", IsBackboneType=true)]
     public partial class CitedArtifactClassificationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Citation#CitedArtifactClassification"; } }
+      public override string TypeName { get { return "Citation.citedArtifact.classification"; } }
 
       /// <summary>
       /// The kind of classifier (e.g. publication type, keyword)
@@ -4024,14 +4010,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Citation#CitedArtifactContributorship")]
-    [BackboneType("Citation.citedArtifact.contributorship")]
+    [FhirType("Citation.citedArtifact.contributorship", IsBackboneType=true)]
     public partial class CitedArtifactContributorshipComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Citation#CitedArtifactContributorship"; } }
+      public override string TypeName { get { return "Citation.citedArtifact.contributorship"; } }
 
       /// <summary>
       /// Indicates if the list includes all authors and/or contributors
@@ -4221,14 +4206,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Citation#CitedArtifactContributorshipEntry")]
-    [BackboneType("Citation.citedArtifact.contributorship.entry")]
+    [FhirType("Citation.citedArtifact.contributorship.entry", IsBackboneType=true)]
     public partial class CitedArtifactContributorshipEntryComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Citation#CitedArtifactContributorshipEntry"; } }
+      public override string TypeName { get { return "Citation.citedArtifact.contributorship.entry"; } }
 
       /// <summary>
       /// The identity of the individual contributor
@@ -4583,14 +4567,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Citation#CitedArtifactContributorshipEntryContributionInstance")]
-    [BackboneType("Citation.citedArtifact.contributorship.entry.contributionInstance")]
+    [FhirType("Citation.citedArtifact.contributorship.entry.contributionInstance", IsBackboneType=true)]
     public partial class CitedArtifactContributorshipEntryContributionInstanceComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Citation#CitedArtifactContributorshipEntryContributionInstance"; } }
+      public override string TypeName { get { return "Citation.citedArtifact.contributorship.entry.contributionInstance"; } }
 
       /// <summary>
       /// The specific contribution
@@ -4751,14 +4734,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Citation#CitedArtifactContributorshipSummary")]
-    [BackboneType("Citation.citedArtifact.contributorship.summary")]
+    [FhirType("Citation.citedArtifact.contributorship.summary", IsBackboneType=true)]
     public partial class CitedArtifactContributorshipSummaryComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Citation#CitedArtifactContributorshipSummary"; } }
+      public override string TypeName { get { return "Citation.citedArtifact.contributorship.summary"; } }
 
       /// <summary>
       /// Such as author list, contributorship statement, funding statement, acknowledgements statement, or conflicts of interest statement
diff --git a/src/Hl7.Fhir.R5/Model/Generated/Claim.cs b/src/Hl7.Fhir.R5/Model/Generated/Claim.cs
index f6e793eda8..bdcd0162b2 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/Claim.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/Claim.cs
@@ -69,14 +69,13 @@ public partial class Claim : Hl7.Fhir.Model.DomainResource, IIdentifiable<List<I
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Claim#RelatedClaim")]
-    [BackboneType("Claim.related")]
+    [FhirType("Claim.related", IsBackboneType=true)]
     public partial class RelatedClaimComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Claim#RelatedClaim"; } }
+      public override string TypeName { get { return "Claim.related"; } }
 
       /// <summary>
       /// Reference to the related claim
@@ -249,14 +248,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Claim#Payee")]
-    [BackboneType("Claim.payee")]
+    [FhirType("Claim.payee", IsBackboneType=true)]
     public partial class PayeeComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Claim#Payee"; } }
+      public override string TypeName { get { return "Claim.payee"; } }
 
       /// <summary>
       /// Category of recipient
@@ -404,14 +402,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Claim#Event")]
-    [BackboneType("Claim.event")]
+    [FhirType("Claim.event", IsBackboneType=true)]
     public partial class EventComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Claim#Event"; } }
+      public override string TypeName { get { return "Claim.event"; } }
 
       /// <summary>
       /// Specific event
@@ -560,14 +557,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Claim#CareTeam")]
-    [BackboneType("Claim.careTeam")]
+    [FhirType("Claim.careTeam", IsBackboneType=true)]
     public partial class CareTeamComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Claim#CareTeam"; } }
+      public override string TypeName { get { return "Claim.careTeam"; } }
 
       /// <summary>
       /// Order of care team
@@ -829,14 +825,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Claim#SupportingInformation")]
-    [BackboneType("Claim.supportingInfo")]
+    [FhirType("Claim.supportingInfo", IsBackboneType=true)]
     public partial class SupportingInformationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Claim#SupportingInformation"; } }
+      public override string TypeName { get { return "Claim.supportingInfo"; } }
 
       /// <summary>
       /// Information instance identifier
@@ -1108,14 +1103,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Claim#Diagnosis")]
-    [BackboneType("Claim.diagnosis")]
+    [FhirType("Claim.diagnosis", IsBackboneType=true)]
     public partial class DiagnosisComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Claim#Diagnosis"; } }
+      public override string TypeName { get { return "Claim.diagnosis"; } }
 
       /// <summary>
       /// Diagnosis instance identifier
@@ -1336,14 +1330,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Claim#Procedure")]
-    [BackboneType("Claim.procedure")]
+    [FhirType("Claim.procedure", IsBackboneType=true)]
     public partial class ProcedureComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Claim#Procedure"; } }
+      public override string TypeName { get { return "Claim.procedure"; } }
 
       /// <summary>
       /// Procedure instance identifier
@@ -1610,14 +1603,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Claim#Insurance")]
-    [BackboneType("Claim.insurance")]
+    [FhirType("Claim.insurance", IsBackboneType=true)]
     public partial class InsuranceComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Claim#Insurance"; } }
+      public override string TypeName { get { return "Claim.insurance"; } }
 
       /// <summary>
       /// Insurance instance identifier
@@ -1966,14 +1958,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Claim#Accident")]
-    [BackboneType("Claim.accident")]
+    [FhirType("Claim.accident", IsBackboneType=true)]
     public partial class AccidentComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Claim#Accident"; } }
+      public override string TypeName { get { return "Claim.accident"; } }
 
       /// <summary>
       /// When the incident occurred
@@ -2165,14 +2156,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Claim#Item")]
-    [BackboneType("Claim.item")]
+    [FhirType("Claim.item", IsBackboneType=true)]
     public partial class ItemComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Claim#Item"; } }
+      public override string TypeName { get { return "Claim.item"; } }
 
       /// <summary>
       /// Item instance identifier
@@ -3030,14 +3020,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Claim#BodySite")]
-    [BackboneType("Claim.item.bodySite")]
+    [FhirType("Claim.item.bodySite", IsBackboneType=true)]
     public partial class BodySiteComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Claim#BodySite"; } }
+      public override string TypeName { get { return "Claim.item.bodySite"; } }
 
       /// <summary>
       /// Location
@@ -3185,14 +3174,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Claim#Detail")]
-    [BackboneType("Claim.item.detail")]
+    [FhirType("Claim.item.detail", IsBackboneType=true)]
     public partial class DetailComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Claim#Detail"; } }
+      public override string TypeName { get { return "Claim.item.detail"; } }
 
       /// <summary>
       /// Item instance identifier
@@ -3736,14 +3724,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Claim#SubDetail")]
-    [BackboneType("Claim.item.detail.subDetail")]
+    [FhirType("Claim.item.detail.subDetail", IsBackboneType=true)]
     public partial class SubDetailComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Claim#SubDetail"; } }
+      public override string TypeName { get { return "Claim.item.detail.subDetail"; } }
 
       /// <summary>
       /// Item instance identifier
diff --git a/src/Hl7.Fhir.R5/Model/Generated/ClaimResponse.cs b/src/Hl7.Fhir.R5/Model/Generated/ClaimResponse.cs
index 22dac58785..c9f0693ff0 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/ClaimResponse.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/ClaimResponse.cs
@@ -67,14 +67,13 @@ public partial class ClaimResponse : Hl7.Fhir.Model.DomainResource, IIdentifiabl
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ClaimResponse#Event")]
-    [BackboneType("ClaimResponse.event")]
+    [FhirType("ClaimResponse.event", IsBackboneType=true)]
     public partial class EventComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ClaimResponse#Event"; } }
+      public override string TypeName { get { return "ClaimResponse.event"; } }
 
       /// <summary>
       /// Specific event
@@ -223,14 +222,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ClaimResponse#Item")]
-    [BackboneType("ClaimResponse.item")]
+    [FhirType("ClaimResponse.item", IsBackboneType=true)]
     public partial class ItemComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ClaimResponse#Item"; } }
+      public override string TypeName { get { return "ClaimResponse.item"; } }
 
       /// <summary>
       /// Claim item instance identifier
@@ -515,14 +513,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ClaimResponse#ReviewOutcome")]
-    [BackboneType("ClaimResponse.item.reviewOutcome")]
+    [FhirType("ClaimResponse.item.reviewOutcome", IsBackboneType=true)]
     public partial class ReviewOutcomeComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ClaimResponse#ReviewOutcome"; } }
+      public override string TypeName { get { return "ClaimResponse.item.reviewOutcome"; } }
 
       /// <summary>
       /// Result of the adjudication
@@ -737,14 +734,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ClaimResponse#Adjudication")]
-    [BackboneType("ClaimResponse.item.adjudication")]
+    [FhirType("ClaimResponse.item.adjudication", IsBackboneType=true)]
     public partial class AdjudicationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ClaimResponse#Adjudication"; } }
+      public override string TypeName { get { return "ClaimResponse.item.adjudication"; } }
 
       /// <summary>
       /// Type of adjudication information
@@ -941,14 +937,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ClaimResponse#ItemDetail")]
-    [BackboneType("ClaimResponse.item.detail")]
+    [FhirType("ClaimResponse.item.detail", IsBackboneType=true)]
     public partial class ItemDetailComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ClaimResponse#ItemDetail"; } }
+      public override string TypeName { get { return "ClaimResponse.item.detail"; } }
 
       /// <summary>
       /// Claim detail instance identifier
@@ -1233,14 +1228,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ClaimResponse#SubDetail")]
-    [BackboneType("ClaimResponse.item.detail.subDetail")]
+    [FhirType("ClaimResponse.item.detail.subDetail", IsBackboneType=true)]
     public partial class SubDetailComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ClaimResponse#SubDetail"; } }
+      public override string TypeName { get { return "ClaimResponse.item.detail.subDetail"; } }
 
       /// <summary>
       /// Claim sub-detail instance identifier
@@ -1499,14 +1493,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ClaimResponse#AddedItem")]
-    [BackboneType("ClaimResponse.addItem")]
+    [FhirType("ClaimResponse.addItem", IsBackboneType=true)]
     public partial class AddedItemComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ClaimResponse#AddedItem"; } }
+      public override string TypeName { get { return "ClaimResponse.addItem"; } }
 
       /// <summary>
       /// Item sequence number
@@ -2292,14 +2285,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ClaimResponse#BodySite")]
-    [BackboneType("ClaimResponse.addItem.bodySite")]
+    [FhirType("ClaimResponse.addItem.bodySite", IsBackboneType=true)]
     public partial class BodySiteComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ClaimResponse#BodySite"; } }
+      public override string TypeName { get { return "ClaimResponse.addItem.bodySite"; } }
 
       /// <summary>
       /// Location
@@ -2447,14 +2439,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ClaimResponse#AddedItemDetail")]
-    [BackboneType("ClaimResponse.addItem.detail")]
+    [FhirType("ClaimResponse.addItem.detail", IsBackboneType=true)]
     public partial class AddedItemDetailComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ClaimResponse#AddedItemDetail"; } }
+      public override string TypeName { get { return "ClaimResponse.addItem.detail"; } }
 
       /// <summary>
       /// Number for tracking
@@ -2943,14 +2934,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ClaimResponse#AddedItemSubDetail")]
-    [BackboneType("ClaimResponse.addItem.detail.subDetail")]
+    [FhirType("ClaimResponse.addItem.detail.subDetail", IsBackboneType=true)]
     public partial class AddedItemSubDetailComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ClaimResponse#AddedItemSubDetail"; } }
+      public override string TypeName { get { return "ClaimResponse.addItem.detail.subDetail"; } }
 
       /// <summary>
       /// Number for tracking
@@ -3414,14 +3404,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ClaimResponse#Total")]
-    [BackboneType("ClaimResponse.total")]
+    [FhirType("ClaimResponse.total", IsBackboneType=true)]
     public partial class TotalComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ClaimResponse#Total"; } }
+      public override string TypeName { get { return "ClaimResponse.total"; } }
 
       /// <summary>
       /// Type of adjudication information
@@ -3568,14 +3557,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ClaimResponse#Payment")]
-    [BackboneType("ClaimResponse.payment")]
+    [FhirType("ClaimResponse.payment", IsBackboneType=true)]
     public partial class PaymentComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ClaimResponse#Payment"; } }
+      public override string TypeName { get { return "ClaimResponse.payment"; } }
 
       /// <summary>
       /// Partial or complete payment
@@ -3841,14 +3829,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ClaimResponse#Note")]
-    [BackboneType("ClaimResponse.processNote")]
+    [FhirType("ClaimResponse.processNote", IsBackboneType=true)]
     public partial class NoteComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ClaimResponse#Note"; } }
+      public override string TypeName { get { return "ClaimResponse.processNote"; } }
 
       /// <summary>
       /// Note instance identifier
@@ -4082,14 +4069,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ClaimResponse#Insurance")]
-    [BackboneType("ClaimResponse.insurance")]
+    [FhirType("ClaimResponse.insurance", IsBackboneType=true)]
     public partial class InsuranceComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ClaimResponse#Insurance"; } }
+      public override string TypeName { get { return "ClaimResponse.insurance"; } }
 
       /// <summary>
       /// Insurance instance identifier
@@ -4370,14 +4356,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ClaimResponse#Error")]
-    [BackboneType("ClaimResponse.error")]
+    [FhirType("ClaimResponse.error", IsBackboneType=true)]
     public partial class ErrorComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ClaimResponse#Error"; } }
+      public override string TypeName { get { return "ClaimResponse.error"; } }
 
       /// <summary>
       /// Item sequence number
diff --git a/src/Hl7.Fhir.R5/Model/Generated/ClinicalImpression.cs b/src/Hl7.Fhir.R5/Model/Generated/ClinicalImpression.cs
index 786c87bd1b..73815fdf04 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/ClinicalImpression.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/ClinicalImpression.cs
@@ -67,14 +67,13 @@ public partial class ClinicalImpression : Hl7.Fhir.Model.DomainResource, IIdenti
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ClinicalImpression#Finding")]
-    [BackboneType("ClinicalImpression.finding")]
+    [FhirType("ClinicalImpression.finding", IsBackboneType=true)]
     public partial class FindingComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ClinicalImpression#Finding"; } }
+      public override string TypeName { get { return "ClinicalImpression.finding"; } }
 
       /// <summary>
       /// What was found
diff --git a/src/Hl7.Fhir.R5/Model/Generated/ClinicalUseDefinition.cs b/src/Hl7.Fhir.R5/Model/Generated/ClinicalUseDefinition.cs
index 3619ad5e49..28201c8681 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/ClinicalUseDefinition.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/ClinicalUseDefinition.cs
@@ -101,14 +101,13 @@ public enum ClinicalUseDefinitionType
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("ClinicalUseDefinition#Contraindication")]
-    [BackboneType("ClinicalUseDefinition.contraindication")]
+    [FhirType("ClinicalUseDefinition.contraindication", IsBackboneType=true)]
     public partial class ContraindicationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ClinicalUseDefinition#Contraindication"; } }
+      public override string TypeName { get { return "ClinicalUseDefinition.contraindication"; } }
 
       /// <summary>
       /// The situation that is being documented as contraindicating against this item
@@ -360,14 +359,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ClinicalUseDefinition#OtherTherapy")]
-    [BackboneType("ClinicalUseDefinition.contraindication.otherTherapy")]
+    [FhirType("ClinicalUseDefinition.contraindication.otherTherapy", IsBackboneType=true)]
     public partial class OtherTherapyComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ClinicalUseDefinition#OtherTherapy"; } }
+      public override string TypeName { get { return "ClinicalUseDefinition.contraindication.otherTherapy"; } }
 
       /// <summary>
       /// The type of relationship between the product indication/contraindication and another therapy
@@ -512,14 +510,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("ClinicalUseDefinition#Indication")]
-    [BackboneType("ClinicalUseDefinition.indication")]
+    [FhirType("ClinicalUseDefinition.indication", IsBackboneType=true)]
     public partial class IndicationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ClinicalUseDefinition#Indication"; } }
+      public override string TypeName { get { return "ClinicalUseDefinition.indication"; } }
 
       /// <summary>
       /// The situation that is being documented as an indicaton for this item
@@ -821,14 +818,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("ClinicalUseDefinition#Interaction")]
-    [BackboneType("ClinicalUseDefinition.interaction")]
+    [FhirType("ClinicalUseDefinition.interaction", IsBackboneType=true)]
     public partial class InteractionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ClinicalUseDefinition#Interaction"; } }
+      public override string TypeName { get { return "ClinicalUseDefinition.interaction"; } }
 
       /// <summary>
       /// The specific medication, product, food etc. or laboratory test that interacts
@@ -1053,14 +1049,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ClinicalUseDefinition#Interactant")]
-    [BackboneType("ClinicalUseDefinition.interaction.interactant")]
+    [FhirType("ClinicalUseDefinition.interaction.interactant", IsBackboneType=true)]
     public partial class InteractantComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ClinicalUseDefinition#Interactant"; } }
+      public override string TypeName { get { return "ClinicalUseDefinition.interaction.interactant"; } }
 
       /// <summary>
       /// The specific medication, product, food etc. or laboratory test that interacts
@@ -1184,14 +1179,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ClinicalUseDefinition#UndesirableEffect")]
-    [BackboneType("ClinicalUseDefinition.undesirableEffect")]
+    [FhirType("ClinicalUseDefinition.undesirableEffect", IsBackboneType=true)]
     public partial class UndesirableEffectComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ClinicalUseDefinition#UndesirableEffect"; } }
+      public override string TypeName { get { return "ClinicalUseDefinition.undesirableEffect"; } }
 
       /// <summary>
       /// The situation in which the undesirable effect may manifest
@@ -1363,14 +1357,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ClinicalUseDefinition#Warning")]
-    [BackboneType("ClinicalUseDefinition.warning")]
+    [FhirType("ClinicalUseDefinition.warning", IsBackboneType=true)]
     public partial class WarningComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ClinicalUseDefinition#Warning"; } }
+      public override string TypeName { get { return "ClinicalUseDefinition.warning"; } }
 
       /// <summary>
       /// A textual definition of this warning, with formatting
diff --git a/src/Hl7.Fhir.R5/Model/Generated/Communication.cs b/src/Hl7.Fhir.R5/Model/Generated/Communication.cs
index 580da3157d..91fa2c3d1b 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/Communication.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/Communication.cs
@@ -67,14 +67,13 @@ public partial class Communication : Hl7.Fhir.Model.DomainResource, IIdentifiabl
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Communication#Payload")]
-    [BackboneType("Communication.payload")]
+    [FhirType("Communication.payload", IsBackboneType=true)]
     public partial class PayloadComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Communication#Payload"; } }
+      public override string TypeName { get { return "Communication.payload"; } }
 
       /// <summary>
       /// Message part content
diff --git a/src/Hl7.Fhir.R5/Model/Generated/CommunicationRequest.cs b/src/Hl7.Fhir.R5/Model/Generated/CommunicationRequest.cs
index ac57c8d8eb..cb39bb9a66 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/CommunicationRequest.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/CommunicationRequest.cs
@@ -67,14 +67,13 @@ public partial class CommunicationRequest : Hl7.Fhir.Model.DomainResource, IIden
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CommunicationRequest#Payload")]
-    [BackboneType("CommunicationRequest.payload")]
+    [FhirType("CommunicationRequest.payload", IsBackboneType=true)]
     public partial class PayloadComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "CommunicationRequest#Payload"; } }
+      public override string TypeName { get { return "CommunicationRequest.payload"; } }
 
       /// <summary>
       /// Message part content
diff --git a/src/Hl7.Fhir.R5/Model/Generated/CompartmentDefinition.cs b/src/Hl7.Fhir.R5/Model/Generated/CompartmentDefinition.cs
index 6b2e68e77e..c2787ca659 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/CompartmentDefinition.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/CompartmentDefinition.cs
@@ -68,14 +68,13 @@ public partial class CompartmentDefinition : Hl7.Fhir.Model.DomainResource
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CompartmentDefinition#Resource")]
-    [BackboneType("CompartmentDefinition.resource")]
+    [FhirType("CompartmentDefinition.resource", IsBackboneType=true)]
     public partial class ResourceComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "CompartmentDefinition#Resource"; } }
+      public override string TypeName { get { return "CompartmentDefinition.resource"; } }
 
       /// <summary>
       /// Name of resource type
diff --git a/src/Hl7.Fhir.R5/Model/Generated/Composition.cs b/src/Hl7.Fhir.R5/Model/Generated/Composition.cs
index b13c5d32cb..72bd990dc3 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/Composition.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/Composition.cs
@@ -69,14 +69,13 @@ public partial class Composition : Hl7.Fhir.Model.DomainResource, IIdentifiable<
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Composition#Attester")]
-    [BackboneType("Composition.attester")]
+    [FhirType("Composition.attester", IsBackboneType=true)]
     public partial class AttesterComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Composition#Attester"; } }
+      public override string TypeName { get { return "Composition.attester"; } }
 
       /// <summary>
       /// personal | professional | legal | official
@@ -268,14 +267,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Composition#Event")]
-    [BackboneType("Composition.event")]
+    [FhirType("Composition.event", IsBackboneType=true)]
     public partial class EventComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Composition#Event"; } }
+      public override string TypeName { get { return "Composition.event"; } }
 
       /// <summary>
       /// The period covered by the documentation
@@ -421,14 +419,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Composition#Section")]
-    [BackboneType("Composition.section")]
+    [FhirType("Composition.section", IsBackboneType=true)]
     public partial class SectionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Composition#Section"; } }
+      public override string TypeName { get { return "Composition.section"; } }
 
       /// <summary>
       /// Label for section (e.g. for ToC)
diff --git a/src/Hl7.Fhir.R5/Model/Generated/ConceptMap.cs b/src/Hl7.Fhir.R5/Model/Generated/ConceptMap.cs
index c2c3b60af0..dcd1841456 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/ConceptMap.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/ConceptMap.cs
@@ -228,14 +228,13 @@ public enum ConceptMapGroupUnmappedMode
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ConceptMap#Property")]
-    [BackboneType("ConceptMap.property")]
+    [FhirType("ConceptMap.property", IsBackboneType=true)]
     public partial class PropertyComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ConceptMap#Property"; } }
+      public override string TypeName { get { return "ConceptMap.property"; } }
 
       /// <summary>
       /// Identifies the property on the mappings, and when referred to in the $translate operation
@@ -549,14 +548,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ConceptMap#AdditionalAttribute")]
-    [BackboneType("ConceptMap.additionalAttribute")]
+    [FhirType("ConceptMap.additionalAttribute", IsBackboneType=true)]
     public partial class AdditionalAttributeComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ConceptMap#AdditionalAttribute"; } }
+      public override string TypeName { get { return "ConceptMap.additionalAttribute"; } }
 
       /// <summary>
       /// Identifies this additional attribute through this resource
@@ -826,14 +824,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ConceptMap#Group")]
-    [BackboneType("ConceptMap.group")]
+    [FhirType("ConceptMap.group", IsBackboneType=true)]
     public partial class GroupComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ConceptMap#Group"; } }
+      public override string TypeName { get { return "ConceptMap.group"; } }
 
       /// <summary>
       /// Source system where concepts to be mapped are defined
@@ -1065,14 +1062,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ConceptMap#SourceElement")]
-    [BackboneType("ConceptMap.group.element")]
+    [FhirType("ConceptMap.group.element", IsBackboneType=true)]
     public partial class SourceElementComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ConceptMap#SourceElement"; } }
+      public override string TypeName { get { return "ConceptMap.group.element"; } }
 
       /// <summary>
       /// Identifies element being mapped
@@ -1365,14 +1361,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ConceptMap#TargetElement")]
-    [BackboneType("ConceptMap.group.element.target")]
+    [FhirType("ConceptMap.group.element.target", IsBackboneType=true)]
     public partial class TargetElementComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ConceptMap#TargetElement"; } }
+      public override string TypeName { get { return "ConceptMap.group.element.target"; } }
 
       /// <summary>
       /// Code that identifies the target element
@@ -1762,14 +1757,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ConceptMap#MappingProperty")]
-    [BackboneType("ConceptMap.group.element.target.property")]
+    [FhirType("ConceptMap.group.element.target.property", IsBackboneType=true)]
     public partial class MappingPropertyComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ConceptMap#MappingProperty"; } }
+      public override string TypeName { get { return "ConceptMap.group.element.target.property"; } }
 
       /// <summary>
       /// Reference to ConceptMap.property.code
@@ -1935,14 +1929,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ConceptMap#OtherElement")]
-    [BackboneType("ConceptMap.group.element.target.dependsOn")]
+    [FhirType("ConceptMap.group.element.target.dependsOn", IsBackboneType=true)]
     public partial class OtherElementComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ConceptMap#OtherElement"; } }
+      public override string TypeName { get { return "ConceptMap.group.element.target.dependsOn"; } }
 
       /// <summary>
       /// A reference to a mapping attribute defined in ConceptMap.additionalAttribute
@@ -2151,14 +2144,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ConceptMap#Unmapped")]
-    [BackboneType("ConceptMap.group.unmapped")]
+    [FhirType("ConceptMap.group.unmapped", IsBackboneType=true)]
     public partial class UnmappedComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ConceptMap#Unmapped"; } }
+      public override string TypeName { get { return "ConceptMap.group.unmapped"; } }
 
       /// <summary>
       /// use-source-code | fixed | other-map
diff --git a/src/Hl7.Fhir.R5/Model/Generated/Condition.cs b/src/Hl7.Fhir.R5/Model/Generated/Condition.cs
index 00f5d9d5a9..209528f3fd 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/Condition.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/Condition.cs
@@ -165,14 +165,13 @@ public enum ConditionVerificationStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Condition#Participant")]
-    [BackboneType("Condition.participant")]
+    [FhirType("Condition.participant", IsBackboneType=true)]
     public partial class ParticipantComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Condition#Participant"; } }
+      public override string TypeName { get { return "Condition.participant"; } }
 
       /// <summary>
       /// Type of involvement
@@ -320,14 +319,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Condition#Stage")]
-    [BackboneType("Condition.stage")]
+    [FhirType("Condition.stage", IsBackboneType=true)]
     public partial class StageComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Condition#Stage"; } }
+      public override string TypeName { get { return "Condition.stage"; } }
 
       /// <summary>
       /// Simple summary (disease specific)
diff --git a/src/Hl7.Fhir.R5/Model/Generated/ConditionDefinition.cs b/src/Hl7.Fhir.R5/Model/Generated/ConditionDefinition.cs
index 5484dc0077..c543b5d591 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/ConditionDefinition.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/ConditionDefinition.cs
@@ -114,14 +114,13 @@ public enum ConditionQuestionnairePurpose
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("ConditionDefinition#Observation")]
-    [BackboneType("ConditionDefinition.observation")]
+    [FhirType("ConditionDefinition.observation", IsBackboneType=true)]
     public partial class ObservationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ConditionDefinition#Observation"; } }
+      public override string TypeName { get { return "ConditionDefinition.observation"; } }
 
       /// <summary>
       /// Category that is relevant
@@ -264,14 +263,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("ConditionDefinition#Medication")]
-    [BackboneType("ConditionDefinition.medication")]
+    [FhirType("ConditionDefinition.medication", IsBackboneType=true)]
     public partial class MedicationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ConditionDefinition#Medication"; } }
+      public override string TypeName { get { return "ConditionDefinition.medication"; } }
 
       /// <summary>
       /// Category that is relevant
@@ -417,14 +415,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ConditionDefinition#Precondition")]
-    [BackboneType("ConditionDefinition.precondition")]
+    [FhirType("ConditionDefinition.precondition", IsBackboneType=true)]
     public partial class PreconditionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ConditionDefinition#Precondition"; } }
+      public override string TypeName { get { return "ConditionDefinition.precondition"; } }
 
       /// <summary>
       /// sensitive | specific
@@ -615,14 +612,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("ConditionDefinition#Questionnaire")]
-    [BackboneType("ConditionDefinition.questionnaire")]
+    [FhirType("ConditionDefinition.questionnaire", IsBackboneType=true)]
     public partial class QuestionnaireComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ConditionDefinition#Questionnaire"; } }
+      public override string TypeName { get { return "ConditionDefinition.questionnaire"; } }
 
       /// <summary>
       /// preadmit | diff-diagnosis | outcome
@@ -787,14 +783,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("ConditionDefinition#Plan")]
-    [BackboneType("ConditionDefinition.plan")]
+    [FhirType("ConditionDefinition.plan", IsBackboneType=true)]
     public partial class PlanComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ConditionDefinition#Plan"; } }
+      public override string TypeName { get { return "ConditionDefinition.plan"; } }
 
       /// <summary>
       /// Use for the plan
diff --git a/src/Hl7.Fhir.R5/Model/Generated/Consent.cs b/src/Hl7.Fhir.R5/Model/Generated/Consent.cs
index 74ff771583..daa29d66d0 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/Consent.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/Consent.cs
@@ -114,14 +114,13 @@ public enum ConsentState
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Consent#PolicyBasis")]
-    [BackboneType("Consent.policyBasis")]
+    [FhirType("Consent.policyBasis", IsBackboneType=true)]
     public partial class PolicyBasisComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Consent#PolicyBasis"; } }
+      public override string TypeName { get { return "Consent.policyBasis"; } }
 
       /// <summary>
       /// Reference backing policy resource
@@ -285,14 +284,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Consent#Verification")]
-    [BackboneType("Consent.verification")]
+    [FhirType("Consent.verification", IsBackboneType=true)]
     public partial class VerificationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Consent#Verification"; } }
+      public override string TypeName { get { return "Consent.verification"; } }
 
       /// <summary>
       /// Has been verified
@@ -554,14 +552,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Consent#provision")]
-    [BackboneType("Consent.provision")]
+    [FhirType("Consent.provision", IsBackboneType=true)]
     public partial class provisionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Consent#provision"; } }
+      public override string TypeName { get { return "Consent.provision"; } }
 
       /// <summary>
       /// Timeframe for this provision
@@ -970,14 +967,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Consent#provisionActor")]
-    [BackboneType("Consent.provision.actor")]
+    [FhirType("Consent.provision.actor", IsBackboneType=true)]
     public partial class provisionActorComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Consent#provisionActor"; } }
+      public override string TypeName { get { return "Consent.provision.actor"; } }
 
       /// <summary>
       /// How the actor is involved
@@ -1124,14 +1120,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Consent#provisionData")]
-    [BackboneType("Consent.provision.data")]
+    [FhirType("Consent.provision.data", IsBackboneType=true)]
     public partial class provisionDataComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Consent#provisionData"; } }
+      public override string TypeName { get { return "Consent.provision.data"; } }
 
       /// <summary>
       /// instance | related | dependents | authoredby
diff --git a/src/Hl7.Fhir.R5/Model/Generated/Contract.cs b/src/Hl7.Fhir.R5/Model/Generated/Contract.cs
index d28fa86307..7e96670667 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/Contract.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/Contract.cs
@@ -267,14 +267,13 @@ public enum ContractResourcePublicationStatusCodes
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Contract#ContentDefinition")]
-    [BackboneType("Contract.contentDefinition")]
+    [FhirType("Contract.contentDefinition", IsBackboneType=true)]
     public partial class ContentDefinitionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Contract#ContentDefinition"; } }
+      public override string TypeName { get { return "Contract.contentDefinition"; } }
 
       /// <summary>
       /// Content structure and use
@@ -580,14 +579,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Contract#Term")]
-    [BackboneType("Contract.term")]
+    [FhirType("Contract.term", IsBackboneType=true)]
     public partial class TermComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Contract#Term"; } }
+      public override string TypeName { get { return "Contract.term"; } }
 
       /// <summary>
       /// Contract Term Number
@@ -1029,14 +1027,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Contract#SecurityLabel")]
-    [BackboneType("Contract.term.securityLabel")]
+    [FhirType("Contract.term.securityLabel", IsBackboneType=true)]
     public partial class SecurityLabelComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Contract#SecurityLabel"; } }
+      public override string TypeName { get { return "Contract.term.securityLabel"; } }
 
       /// <summary>
       /// Link to Security Labels
@@ -1255,14 +1252,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Contract#ContractOffer")]
-    [BackboneType("Contract.term.offer")]
+    [FhirType("Contract.term.offer", IsBackboneType=true)]
     public partial class ContractOfferComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Contract#ContractOffer"; } }
+      public override string TypeName { get { return "Contract.term.offer"; } }
 
       /// <summary>
       /// Offer business ID
@@ -1668,14 +1664,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Contract#ContractParty")]
-    [BackboneType("Contract.term.offer.party")]
+    [FhirType("Contract.term.offer.party", IsBackboneType=true)]
     public partial class ContractPartyComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Contract#ContractParty"; } }
+      public override string TypeName { get { return "Contract.term.offer.party"; } }
 
       /// <summary>
       /// Referenced entity
@@ -1821,14 +1816,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Contract#Answer")]
-    [BackboneType("Contract.term.offer.answer")]
+    [FhirType("Contract.term.offer.answer", IsBackboneType=true)]
     public partial class AnswerComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Contract#Answer"; } }
+      public override string TypeName { get { return "Contract.term.offer.answer"; } }
 
       /// <summary>
       /// The actual answer response
@@ -1948,14 +1942,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Contract#ContractAsset")]
-    [BackboneType("Contract.term.asset")]
+    [FhirType("Contract.term.asset", IsBackboneType=true)]
     public partial class ContractAssetComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Contract#ContractAsset"; } }
+      public override string TypeName { get { return "Contract.term.asset"; } }
 
       /// <summary>
       /// Range of asset
@@ -2511,14 +2504,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Contract#AssetContext")]
-    [BackboneType("Contract.term.asset.context")]
+    [FhirType("Contract.term.asset.context", IsBackboneType=true)]
     public partial class AssetContextComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Contract#AssetContext"; } }
+      public override string TypeName { get { return "Contract.term.asset.context"; } }
 
       /// <summary>
       /// Creator,custodian or owner
@@ -2706,14 +2698,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Contract#ValuedItem")]
-    [BackboneType("Contract.term.asset.valuedItem")]
+    [FhirType("Contract.term.asset.valuedItem", IsBackboneType=true)]
     public partial class ValuedItemComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Contract#ValuedItem"; } }
+      public override string TypeName { get { return "Contract.term.asset.valuedItem"; } }
 
       /// <summary>
       /// Contract Valued Item Type
@@ -3294,14 +3285,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Contract#Action")]
-    [BackboneType("Contract.term.action")]
+    [FhirType("Contract.term.action", IsBackboneType=true)]
     public partial class ActionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Contract#Action"; } }
+      public override string TypeName { get { return "Contract.term.action"; } }
 
       /// <summary>
       /// True if the term prohibits the  action
@@ -4021,14 +4011,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Contract#ActionSubject")]
-    [BackboneType("Contract.term.action.subject")]
+    [FhirType("Contract.term.action.subject", IsBackboneType=true)]
     public partial class ActionSubjectComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Contract#ActionSubject"; } }
+      public override string TypeName { get { return "Contract.term.action.subject"; } }
 
       /// <summary>
       /// Entity of the action
@@ -4178,14 +4167,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Contract#Signatory")]
-    [BackboneType("Contract.signer")]
+    [FhirType("Contract.signer", IsBackboneType=true)]
     public partial class SignatoryComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Contract#Signatory"; } }
+      public override string TypeName { get { return "Contract.signer"; } }
 
       /// <summary>
       /// Contract Signatory Role
@@ -4360,14 +4348,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Contract#FriendlyLanguage")]
-    [BackboneType("Contract.friendly")]
+    [FhirType("Contract.friendly", IsBackboneType=true)]
     public partial class FriendlyLanguageComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Contract#FriendlyLanguage"; } }
+      public override string TypeName { get { return "Contract.friendly"; } }
 
       /// <summary>
       /// Easily comprehended representation of this Contract
@@ -4490,14 +4477,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Contract#LegalLanguage")]
-    [BackboneType("Contract.legal")]
+    [FhirType("Contract.legal", IsBackboneType=true)]
     public partial class LegalLanguageComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Contract#LegalLanguage"; } }
+      public override string TypeName { get { return "Contract.legal"; } }
 
       /// <summary>
       /// Contract Legal Text
@@ -4620,14 +4606,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Contract#ComputableLanguage")]
-    [BackboneType("Contract.rule")]
+    [FhirType("Contract.rule", IsBackboneType=true)]
     public partial class ComputableLanguageComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Contract#ComputableLanguage"; } }
+      public override string TypeName { get { return "Contract.rule"; } }
 
       /// <summary>
       /// Computable Contract Rules
diff --git a/src/Hl7.Fhir.R5/Model/Generated/Coverage.cs b/src/Hl7.Fhir.R5/Model/Generated/Coverage.cs
index b1ef3e4ffe..1155ea6953 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/Coverage.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/Coverage.cs
@@ -96,14 +96,13 @@ public enum CoverageKindCode
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Coverage#PaymentBy")]
-    [BackboneType("Coverage.paymentBy")]
+    [FhirType("Coverage.paymentBy", IsBackboneType=true)]
     public partial class PaymentByComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Coverage#PaymentBy"; } }
+      public override string TypeName { get { return "Coverage.paymentBy"; } }
 
       /// <summary>
       /// Parties performing self-payment
@@ -269,14 +268,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Coverage#Class")]
-    [BackboneType("Coverage.class")]
+    [FhirType("Coverage.class", IsBackboneType=true)]
     public partial class ClassComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Coverage#Class"; } }
+      public override string TypeName { get { return "Coverage.class"; } }
 
       /// <summary>
       /// Type of class such as 'group' or 'plan'
@@ -467,14 +465,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Coverage#CostToBeneficiary")]
-    [BackboneType("Coverage.costToBeneficiary")]
+    [FhirType("Coverage.costToBeneficiary", IsBackboneType=true)]
     public partial class CostToBeneficiaryComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Coverage#CostToBeneficiary"; } }
+      public override string TypeName { get { return "Coverage.costToBeneficiary"; } }
 
       /// <summary>
       /// Cost category
@@ -751,14 +748,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Coverage#Exemption")]
-    [BackboneType("Coverage.costToBeneficiary.exception")]
+    [FhirType("Coverage.costToBeneficiary.exception", IsBackboneType=true)]
     public partial class ExemptionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Coverage#Exemption"; } }
+      public override string TypeName { get { return "Coverage.costToBeneficiary.exception"; } }
 
       /// <summary>
       /// Exception category
diff --git a/src/Hl7.Fhir.R5/Model/Generated/CoverageEligibilityRequest.cs b/src/Hl7.Fhir.R5/Model/Generated/CoverageEligibilityRequest.cs
index 27b7677692..324eff3969 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/CoverageEligibilityRequest.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/CoverageEligibilityRequest.cs
@@ -101,14 +101,13 @@ public enum EligibilityRequestPurpose
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CoverageEligibilityRequest#Event")]
-    [BackboneType("CoverageEligibilityRequest.event")]
+    [FhirType("CoverageEligibilityRequest.event", IsBackboneType=true)]
     public partial class EventComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "CoverageEligibilityRequest#Event"; } }
+      public override string TypeName { get { return "CoverageEligibilityRequest.event"; } }
 
       /// <summary>
       /// Specific event
@@ -258,14 +257,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CoverageEligibilityRequest#SupportingInformation")]
-    [BackboneType("CoverageEligibilityRequest.supportingInfo")]
+    [FhirType("CoverageEligibilityRequest.supportingInfo", IsBackboneType=true)]
     public partial class SupportingInformationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "CoverageEligibilityRequest#SupportingInformation"; } }
+      public override string TypeName { get { return "CoverageEligibilityRequest.supportingInfo"; } }
 
       /// <summary>
       /// Information instance identifier
@@ -475,14 +473,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CoverageEligibilityRequest#Insurance")]
-    [BackboneType("CoverageEligibilityRequest.insurance")]
+    [FhirType("CoverageEligibilityRequest.insurance", IsBackboneType=true)]
     public partial class InsuranceComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "CoverageEligibilityRequest#Insurance"; } }
+      public override string TypeName { get { return "CoverageEligibilityRequest.insurance"; } }
 
       /// <summary>
       /// Applicable coverage
@@ -690,14 +687,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CoverageEligibilityRequest#Details")]
-    [BackboneType("CoverageEligibilityRequest.item")]
+    [FhirType("CoverageEligibilityRequest.item", IsBackboneType=true)]
     public partial class DetailsComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "CoverageEligibilityRequest#Details"; } }
+      public override string TypeName { get { return "CoverageEligibilityRequest.item"; } }
 
       /// <summary>
       /// Applicable exception or supporting information
@@ -1072,14 +1068,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CoverageEligibilityRequest#Diagnosis")]
-    [BackboneType("CoverageEligibilityRequest.item.diagnosis")]
+    [FhirType("CoverageEligibilityRequest.item.diagnosis", IsBackboneType=true)]
     public partial class DiagnosisComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "CoverageEligibilityRequest#Diagnosis"; } }
+      public override string TypeName { get { return "CoverageEligibilityRequest.item.diagnosis"; } }
 
       /// <summary>
       /// Nature of illness or problem
diff --git a/src/Hl7.Fhir.R5/Model/Generated/CoverageEligibilityResponse.cs b/src/Hl7.Fhir.R5/Model/Generated/CoverageEligibilityResponse.cs
index ed108d0884..a350274366 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/CoverageEligibilityResponse.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/CoverageEligibilityResponse.cs
@@ -135,14 +135,13 @@ public enum EligibilityOutcome
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CoverageEligibilityResponse#Event")]
-    [BackboneType("CoverageEligibilityResponse.event")]
+    [FhirType("CoverageEligibilityResponse.event", IsBackboneType=true)]
     public partial class EventComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "CoverageEligibilityResponse#Event"; } }
+      public override string TypeName { get { return "CoverageEligibilityResponse.event"; } }
 
       /// <summary>
       /// Specific event
@@ -292,14 +291,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CoverageEligibilityResponse#Insurance")]
-    [BackboneType("CoverageEligibilityResponse.insurance")]
+    [FhirType("CoverageEligibilityResponse.insurance", IsBackboneType=true)]
     public partial class InsuranceComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "CoverageEligibilityResponse#Insurance"; } }
+      public override string TypeName { get { return "CoverageEligibilityResponse.insurance"; } }
 
       /// <summary>
       /// Insurance information
@@ -515,14 +513,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CoverageEligibilityResponse#Items")]
-    [BackboneType("CoverageEligibilityResponse.insurance.item")]
+    [FhirType("CoverageEligibilityResponse.insurance.item", IsBackboneType=true)]
     public partial class ItemsComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "CoverageEligibilityResponse#Items"; } }
+      public override string TypeName { get { return "CoverageEligibilityResponse.insurance.item"; } }
 
       /// <summary>
       /// Benefit classification
@@ -1068,14 +1065,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CoverageEligibilityResponse#Benefit")]
-    [BackboneType("CoverageEligibilityResponse.insurance.item.benefit")]
+    [FhirType("CoverageEligibilityResponse.insurance.item.benefit", IsBackboneType=true)]
     public partial class BenefitComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "CoverageEligibilityResponse#Benefit"; } }
+      public override string TypeName { get { return "CoverageEligibilityResponse.insurance.item.benefit"; } }
 
       /// <summary>
       /// Benefit classification
@@ -1250,14 +1246,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CoverageEligibilityResponse#Errors")]
-    [BackboneType("CoverageEligibilityResponse.error")]
+    [FhirType("CoverageEligibilityResponse.error", IsBackboneType=true)]
     public partial class ErrorsComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "CoverageEligibilityResponse#Errors"; } }
+      public override string TypeName { get { return "CoverageEligibilityResponse.error"; } }
 
       /// <summary>
       /// Error code detailing processing issues
diff --git a/src/Hl7.Fhir.R5/Model/Generated/DataRequirement.cs b/src/Hl7.Fhir.R5/Model/Generated/DataRequirement.cs
index 3c2107b3cf..d9a1d26473 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/DataRequirement.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/DataRequirement.cs
@@ -141,14 +141,13 @@ public enum SortDirection
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("DataRequirement#CodeFilter")]
-    [BackboneType("DataRequirement.codeFilter")]
+    [FhirType("DataRequirement.codeFilter", IsBackboneType=true)]
     public partial class CodeFilterComponent : Hl7.Fhir.Model.Element
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "DataRequirement#CodeFilter"; } }
+      public override string TypeName { get { return "DataRequirement.codeFilter"; } }
 
       /// <summary>
       /// A code-valued attribute to filter on
@@ -397,14 +396,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("DataRequirement#DateFilter")]
-    [BackboneType("DataRequirement.dateFilter")]
+    [FhirType("DataRequirement.dateFilter", IsBackboneType=true)]
     public partial class DateFilterComponent : Hl7.Fhir.Model.Element
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "DataRequirement#DateFilter"; } }
+      public override string TypeName { get { return "DataRequirement.dateFilter"; } }
 
       /// <summary>
       /// A date-valued attribute to filter on
@@ -611,14 +609,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("DataRequirement#ValueFilter")]
-    [BackboneType("DataRequirement.valueFilter")]
+    [FhirType("DataRequirement.valueFilter", IsBackboneType=true)]
     public partial class ValueFilterComponent : Hl7.Fhir.Model.Element
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "DataRequirement#ValueFilter"; } }
+      public override string TypeName { get { return "DataRequirement.valueFilter"; } }
 
       /// <summary>
       /// An attribute to filter on
@@ -871,14 +868,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("DataRequirement#Sort")]
-    [BackboneType("DataRequirement.sort")]
+    [FhirType("DataRequirement.sort", IsBackboneType=true)]
     public partial class SortComponent : Hl7.Fhir.Model.Element
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "DataRequirement#Sort"; } }
+      public override string TypeName { get { return "DataRequirement.sort"; } }
 
       /// <summary>
       /// The name of the attribute to perform the sort
diff --git a/src/Hl7.Fhir.R5/Model/Generated/DetectedIssue.cs b/src/Hl7.Fhir.R5/Model/Generated/DetectedIssue.cs
index 6428dd0d75..9dfe431de9 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/DetectedIssue.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/DetectedIssue.cs
@@ -129,14 +129,13 @@ public enum DetectedIssueSeverity
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("DetectedIssue#Evidence")]
-    [BackboneType("DetectedIssue.evidence")]
+    [FhirType("DetectedIssue.evidence", IsBackboneType=true)]
     public partial class EvidenceComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "DetectedIssue#Evidence"; } }
+      public override string TypeName { get { return "DetectedIssue.evidence"; } }
 
       /// <summary>
       /// Manifestation
@@ -285,14 +284,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("DetectedIssue#Mitigation")]
-    [BackboneType("DetectedIssue.mitigation")]
+    [FhirType("DetectedIssue.mitigation", IsBackboneType=true)]
     public partial class MitigationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "DetectedIssue#Mitigation"; } }
+      public override string TypeName { get { return "DetectedIssue.mitigation"; } }
 
       /// <summary>
       /// What mitigation?
diff --git a/src/Hl7.Fhir.R5/Model/Generated/Device.cs b/src/Hl7.Fhir.R5/Model/Generated/Device.cs
index 3be1b04d3e..736dfbac61 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/Device.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/Device.cs
@@ -148,14 +148,13 @@ public enum UDIEntryType
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Device#UdiCarrier")]
-    [BackboneType("Device.udiCarrier")]
+    [FhirType("Device.udiCarrier", IsBackboneType=true)]
     public partial class UdiCarrierComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Device#UdiCarrier"; } }
+      public override string TypeName { get { return "Device.udiCarrier"; } }
 
       /// <summary>
       /// Mandatory fixed portion of UDI
@@ -511,14 +510,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Device#Name")]
-    [BackboneType("Device.name")]
+    [FhirType("Device.name", IsBackboneType=true)]
     public partial class NameComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Device#Name"; } }
+      public override string TypeName { get { return "Device.name"; } }
 
       /// <summary>
       /// The term that names the device
@@ -742,14 +740,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Device#Version")]
-    [BackboneType("Device.version")]
+    [FhirType("Device.version", IsBackboneType=true)]
     public partial class VersionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Device#Version"; } }
+      public override string TypeName { get { return "Device.version"; } }
 
       /// <summary>
       /// The type of the device version, e.g. manufacturer, approved, internal
@@ -981,14 +978,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Device#ConformsTo")]
-    [BackboneType("Device.conformsTo")]
+    [FhirType("Device.conformsTo", IsBackboneType=true)]
     public partial class ConformsToComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Device#ConformsTo"; } }
+      public override string TypeName { get { return "Device.conformsTo"; } }
 
       /// <summary>
       /// Describes the common type of the standard, specification, or formal guidance.  communication | performance | measurement
@@ -1179,14 +1175,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Device#Property")]
-    [BackboneType("Device.property")]
+    [FhirType("Device.property", IsBackboneType=true)]
     public partial class PropertyComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Device#Property"; } }
+      public override string TypeName { get { return "Device.property"; } }
 
       /// <summary>
       /// Code that specifies the property being represented
diff --git a/src/Hl7.Fhir.R5/Model/Generated/DeviceAssociation.cs b/src/Hl7.Fhir.R5/Model/Generated/DeviceAssociation.cs
index 7f2242b790..9e49f32a36 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/DeviceAssociation.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/DeviceAssociation.cs
@@ -101,14 +101,13 @@ public enum DeviceAssociationCodes
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("DeviceAssociation#Operation")]
-    [BackboneType("DeviceAssociation.operation")]
+    [FhirType("DeviceAssociation.operation", IsBackboneType=true)]
     public partial class OperationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "DeviceAssociation#Operation"; } }
+      public override string TypeName { get { return "DeviceAssociation.operation"; } }
 
       /// <summary>
       /// Device operational condition
diff --git a/src/Hl7.Fhir.R5/Model/Generated/DeviceDefinition.cs b/src/Hl7.Fhir.R5/Model/Generated/DeviceDefinition.cs
index cec1bc628e..59ae062fc0 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/DeviceDefinition.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/DeviceDefinition.cs
@@ -170,14 +170,13 @@ public enum DeviceCorrectiveActionScope
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("DeviceDefinition#UdiDeviceIdentifier")]
-    [BackboneType("DeviceDefinition.udiDeviceIdentifier")]
+    [FhirType("DeviceDefinition.udiDeviceIdentifier", IsBackboneType=true)]
     public partial class UdiDeviceIdentifierComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "DeviceDefinition#UdiDeviceIdentifier"; } }
+      public override string TypeName { get { return "DeviceDefinition.udiDeviceIdentifier"; } }
 
       /// <summary>
       /// The identifier that is to be associated with every Device that references this DeviceDefintiion for the issuer and jurisdiction provided in the DeviceDefinition.udiDeviceIdentifier
@@ -429,14 +428,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("DeviceDefinition#UdiDeviceIdentifierMarketDistribution")]
-    [BackboneType("DeviceDefinition.udiDeviceIdentifier.marketDistribution")]
+    [FhirType("DeviceDefinition.udiDeviceIdentifier.marketDistribution", IsBackboneType=true)]
     public partial class UdiDeviceIdentifierMarketDistributionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "DeviceDefinition#UdiDeviceIdentifierMarketDistribution"; } }
+      public override string TypeName { get { return "DeviceDefinition.udiDeviceIdentifier.marketDistribution"; } }
 
       /// <summary>
       /// Begin and end dates for the commercial distribution of the device
@@ -601,14 +599,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("DeviceDefinition#RegulatoryIdentifier")]
-    [BackboneType("DeviceDefinition.regulatoryIdentifier")]
+    [FhirType("DeviceDefinition.regulatoryIdentifier", IsBackboneType=true)]
     public partial class RegulatoryIdentifierComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "DeviceDefinition#RegulatoryIdentifier"; } }
+      public override string TypeName { get { return "DeviceDefinition.regulatoryIdentifier"; } }
 
       /// <summary>
       /// basic | master | license
@@ -877,14 +874,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("DeviceDefinition#DeviceName")]
-    [BackboneType("DeviceDefinition.deviceName")]
+    [FhirType("DeviceDefinition.deviceName", IsBackboneType=true)]
     public partial class DeviceNameComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "DeviceDefinition#DeviceName"; } }
+      public override string TypeName { get { return "DeviceDefinition.deviceName"; } }
 
       /// <summary>
       /// A name that is used to refer to the device
@@ -1068,14 +1064,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("DeviceDefinition#Classification")]
-    [BackboneType("DeviceDefinition.classification")]
+    [FhirType("DeviceDefinition.classification", IsBackboneType=true)]
     public partial class ClassificationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "DeviceDefinition#Classification"; } }
+      public override string TypeName { get { return "DeviceDefinition.classification"; } }
 
       /// <summary>
       /// A classification or risk class of the device model
@@ -1222,14 +1217,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("DeviceDefinition#ConformsTo")]
-    [BackboneType("DeviceDefinition.conformsTo")]
+    [FhirType("DeviceDefinition.conformsTo", IsBackboneType=true)]
     public partial class ConformsToComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "DeviceDefinition#ConformsTo"; } }
+      public override string TypeName { get { return "DeviceDefinition.conformsTo"; } }
 
       /// <summary>
       /// Describes the common type of the standard, specification, or formal guidance
@@ -1446,14 +1440,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("DeviceDefinition#HasPart")]
-    [BackboneType("DeviceDefinition.hasPart")]
+    [FhirType("DeviceDefinition.hasPart", IsBackboneType=true)]
     public partial class HasPartComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "DeviceDefinition#HasPart"; } }
+      public override string TypeName { get { return "DeviceDefinition.hasPart"; } }
 
       /// <summary>
       /// Reference to the part
@@ -1615,14 +1608,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("DeviceDefinition#Packaging")]
-    [BackboneType("DeviceDefinition.packaging")]
+    [FhirType("DeviceDefinition.packaging", IsBackboneType=true)]
     public partial class PackagingComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "DeviceDefinition#Packaging"; } }
+      public override string TypeName { get { return "DeviceDefinition.packaging"; } }
 
       /// <summary>
       /// Business identifier of the packaged medication
@@ -1884,14 +1876,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("DeviceDefinition#PackagingDistributor")]
-    [BackboneType("DeviceDefinition.packaging.distributor")]
+    [FhirType("DeviceDefinition.packaging.distributor", IsBackboneType=true)]
     public partial class PackagingDistributorComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "DeviceDefinition#PackagingDistributor"; } }
+      public override string TypeName { get { return "DeviceDefinition.packaging.distributor"; } }
 
       /// <summary>
       /// Distributor's human-readable name
@@ -2053,14 +2044,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("DeviceDefinition#Version")]
-    [BackboneType("DeviceDefinition.version")]
+    [FhirType("DeviceDefinition.version", IsBackboneType=true)]
     public partial class VersionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "DeviceDefinition#Version"; } }
+      public override string TypeName { get { return "DeviceDefinition.version"; } }
 
       /// <summary>
       /// The type of the device version, e.g. manufacturer, approved, internal
@@ -2249,14 +2239,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("DeviceDefinition#Property")]
-    [BackboneType("DeviceDefinition.property")]
+    [FhirType("DeviceDefinition.property", IsBackboneType=true)]
     public partial class PropertyComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "DeviceDefinition#Property"; } }
+      public override string TypeName { get { return "DeviceDefinition.property"; } }
 
       /// <summary>
       /// Code that specifies the property being represented
@@ -2402,14 +2391,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("DeviceDefinition#Link")]
-    [BackboneType("DeviceDefinition.link")]
+    [FhirType("DeviceDefinition.link", IsBackboneType=true)]
     public partial class LinkComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "DeviceDefinition#Link"; } }
+      public override string TypeName { get { return "DeviceDefinition.link"; } }
 
       /// <summary>
       /// The type indicates the relationship of the related device to the device instance
@@ -2553,14 +2541,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("DeviceDefinition#Material")]
-    [BackboneType("DeviceDefinition.material")]
+    [FhirType("DeviceDefinition.material", IsBackboneType=true)]
     public partial class MaterialComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "DeviceDefinition#Material"; } }
+      public override string TypeName { get { return "DeviceDefinition.material"; } }
 
       /// <summary>
       /// A relevant substance that the device contains, may contain, or is made of
@@ -2766,14 +2753,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("DeviceDefinition#Guideline")]
-    [BackboneType("DeviceDefinition.guideline")]
+    [FhirType("DeviceDefinition.guideline", IsBackboneType=true)]
     public partial class GuidelineComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "DeviceDefinition#Guideline"; } }
+      public override string TypeName { get { return "DeviceDefinition.guideline"; } }
 
       /// <summary>
       /// The circumstances that form the setting for using the device
@@ -3080,14 +3066,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("DeviceDefinition#CorrectiveAction")]
-    [BackboneType("DeviceDefinition.correctiveAction")]
+    [FhirType("DeviceDefinition.correctiveAction", IsBackboneType=true)]
     public partial class CorrectiveActionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "DeviceDefinition#CorrectiveAction"; } }
+      public override string TypeName { get { return "DeviceDefinition.correctiveAction"; } }
 
       /// <summary>
       /// Whether the corrective action was a recall
@@ -3293,14 +3278,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("DeviceDefinition#ChargeItem")]
-    [BackboneType("DeviceDefinition.chargeItem")]
+    [FhirType("DeviceDefinition.chargeItem", IsBackboneType=true)]
     public partial class ChargeItemComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "DeviceDefinition#ChargeItem"; } }
+      public override string TypeName { get { return "DeviceDefinition.chargeItem"; } }
 
       /// <summary>
       /// The code or reference for the charge item
diff --git a/src/Hl7.Fhir.R5/Model/Generated/DeviceDispense.cs b/src/Hl7.Fhir.R5/Model/Generated/DeviceDispense.cs
index b39a7bd441..869e265088 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/DeviceDispense.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/DeviceDispense.cs
@@ -131,14 +131,13 @@ public enum DeviceDispenseStatusCodes
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("DeviceDispense#Performer")]
-    [BackboneType("DeviceDispense.performer")]
+    [FhirType("DeviceDispense.performer", IsBackboneType=true)]
     public partial class PerformerComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "DeviceDispense#Performer"; } }
+      public override string TypeName { get { return "DeviceDispense.performer"; } }
 
       /// <summary>
       /// Who performed the dispense and what they did
diff --git a/src/Hl7.Fhir.R5/Model/Generated/DeviceMetric.cs b/src/Hl7.Fhir.R5/Model/Generated/DeviceMetric.cs
index 2a1e608eaf..b35d9509cd 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/DeviceMetric.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/DeviceMetric.cs
@@ -201,14 +201,13 @@ public enum DeviceMetricCalibrationState
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("DeviceMetric#Calibration")]
-    [BackboneType("DeviceMetric.calibration")]
+    [FhirType("DeviceMetric.calibration", IsBackboneType=true)]
     public partial class CalibrationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "DeviceMetric#Calibration"; } }
+      public override string TypeName { get { return "DeviceMetric.calibration"; } }
 
       /// <summary>
       /// unspecified | offset | gain | two-point
diff --git a/src/Hl7.Fhir.R5/Model/Generated/DeviceRequest.cs b/src/Hl7.Fhir.R5/Model/Generated/DeviceRequest.cs
index 2caa6886b5..99682d6e16 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/DeviceRequest.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/DeviceRequest.cs
@@ -67,14 +67,13 @@ public partial class DeviceRequest : Hl7.Fhir.Model.DomainResource, IIdentifiabl
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("DeviceRequest#Parameter")]
-    [BackboneType("DeviceRequest.parameter")]
+    [FhirType("DeviceRequest.parameter", IsBackboneType=true)]
     public partial class ParameterComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "DeviceRequest#Parameter"; } }
+      public override string TypeName { get { return "DeviceRequest.parameter"; } }
 
       /// <summary>
       /// Device detail
diff --git a/src/Hl7.Fhir.R5/Model/Generated/DeviceUsage.cs b/src/Hl7.Fhir.R5/Model/Generated/DeviceUsage.cs
index dbd28e8d87..55918b3339 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/DeviceUsage.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/DeviceUsage.cs
@@ -119,14 +119,13 @@ public enum DeviceUsageStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("DeviceUsage#Adherence")]
-    [BackboneType("DeviceUsage.adherence")]
+    [FhirType("DeviceUsage.adherence", IsBackboneType=true)]
     public partial class AdherenceComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "DeviceUsage#Adherence"; } }
+      public override string TypeName { get { return "DeviceUsage.adherence"; } }
 
       /// <summary>
       /// always | never | sometimes
diff --git a/src/Hl7.Fhir.R5/Model/Generated/DiagnosticReport.cs b/src/Hl7.Fhir.R5/Model/Generated/DiagnosticReport.cs
index 7385765f2e..51718c0809 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/DiagnosticReport.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/DiagnosticReport.cs
@@ -144,14 +144,13 @@ public enum DiagnosticReportStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("DiagnosticReport#SupportingInfo")]
-    [BackboneType("DiagnosticReport.supportingInfo")]
+    [FhirType("DiagnosticReport.supportingInfo", IsBackboneType=true)]
     public partial class SupportingInfoComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "DiagnosticReport#SupportingInfo"; } }
+      public override string TypeName { get { return "DiagnosticReport.supportingInfo"; } }
 
       /// <summary>
       /// Supporting information role code
@@ -300,14 +299,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("DiagnosticReport#Media")]
-    [BackboneType("DiagnosticReport.media")]
+    [FhirType("DiagnosticReport.media", IsBackboneType=true)]
     public partial class MediaComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "DiagnosticReport#Media"; } }
+      public override string TypeName { get { return "DiagnosticReport.media"; } }
 
       /// <summary>
       /// Comment about the image or data (e.g. explanation)
diff --git a/src/Hl7.Fhir.R5/Model/Generated/DocumentReference.cs b/src/Hl7.Fhir.R5/Model/Generated/DocumentReference.cs
index 74443fcb32..78278700a3 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/DocumentReference.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/DocumentReference.cs
@@ -97,14 +97,13 @@ public enum DocumentReferenceStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("DocumentReference#Attester")]
-    [BackboneType("DocumentReference.attester")]
+    [FhirType("DocumentReference.attester", IsBackboneType=true)]
     public partial class AttesterComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "DocumentReference#Attester"; } }
+      public override string TypeName { get { return "DocumentReference.attester"; } }
 
       /// <summary>
       /// personal | professional | legal | official
@@ -296,14 +295,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("DocumentReference#RelatesTo")]
-    [BackboneType("DocumentReference.relatesTo")]
+    [FhirType("DocumentReference.relatesTo", IsBackboneType=true)]
     public partial class RelatesToComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "DocumentReference#RelatesTo"; } }
+      public override string TypeName { get { return "DocumentReference.relatesTo"; } }
 
       /// <summary>
       /// The relationship type with another document
@@ -453,14 +451,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("DocumentReference#Content")]
-    [BackboneType("DocumentReference.content")]
+    [FhirType("DocumentReference.content", IsBackboneType=true)]
     public partial class ContentComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "DocumentReference#Content"; } }
+      public override string TypeName { get { return "DocumentReference.content"; } }
 
       /// <summary>
       /// Where to access the document
@@ -608,14 +605,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("DocumentReference#Profile")]
-    [BackboneType("DocumentReference.content.profile")]
+    [FhirType("DocumentReference.content.profile", IsBackboneType=true)]
     public partial class ProfileComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "DocumentReference#Profile"; } }
+      public override string TypeName { get { return "DocumentReference.content.profile"; } }
 
       /// <summary>
       /// Code|uri|canonical
diff --git a/src/Hl7.Fhir.R5/Model/Generated/Dosage.cs b/src/Hl7.Fhir.R5/Model/Generated/Dosage.cs
index b8cf6fcb8c..8cddb0447e 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/Dosage.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/Dosage.cs
@@ -67,14 +67,13 @@ public partial class Dosage : Hl7.Fhir.Model.BackboneType
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Dosage#DoseAndRate")]
-    [BackboneType("Dosage.doseAndRate")]
+    [FhirType("Dosage.doseAndRate", IsBackboneType=true)]
     public partial class DoseAndRateComponent : Hl7.Fhir.Model.Element
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Dosage#DoseAndRate"; } }
+      public override string TypeName { get { return "Dosage.doseAndRate"; } }
 
       /// <summary>
       /// The kind of dose or rate specified
diff --git a/src/Hl7.Fhir.R5/Model/Generated/Encounter.cs b/src/Hl7.Fhir.R5/Model/Generated/Encounter.cs
index f34fc61d7c..01366c5a5b 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/Encounter.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/Encounter.cs
@@ -104,14 +104,13 @@ public enum EncounterLocationStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Encounter#Participant")]
-    [BackboneType("Encounter.participant")]
+    [FhirType("Encounter.participant", IsBackboneType=true)]
     public partial class ParticipantComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Encounter#Participant"; } }
+      public override string TypeName { get { return "Encounter.participant"; } }
 
       /// <summary>
       /// Role of participant in encounter
@@ -287,14 +286,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Encounter#Reason")]
-    [BackboneType("Encounter.reason")]
+    [FhirType("Encounter.reason", IsBackboneType=true)]
     public partial class ReasonComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Encounter#Reason"; } }
+      public override string TypeName { get { return "Encounter.reason"; } }
 
       /// <summary>
       /// What the reason value should be used for/as
@@ -442,14 +440,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Encounter#Diagnosis")]
-    [BackboneType("Encounter.diagnosis")]
+    [FhirType("Encounter.diagnosis", IsBackboneType=true)]
     public partial class DiagnosisComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Encounter#Diagnosis"; } }
+      public override string TypeName { get { return "Encounter.diagnosis"; } }
 
       /// <summary>
       /// The diagnosis relevant to the encounter
@@ -600,14 +597,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Encounter#Admission")]
-    [BackboneType("Encounter.admission")]
+    [FhirType("Encounter.admission", IsBackboneType=true)]
     public partial class AdmissionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Encounter#Admission"; } }
+      public override string TypeName { get { return "Encounter.admission"; } }
 
       /// <summary>
       /// Pre-admission identifier
@@ -859,14 +855,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Encounter#Location")]
-    [BackboneType("Encounter.location")]
+    [FhirType("Encounter.location", IsBackboneType=true)]
     public partial class LocationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Encounter#Location"; } }
+      public override string TypeName { get { return "Encounter.location"; } }
 
       /// <summary>
       /// Location the encounter takes place
diff --git a/src/Hl7.Fhir.R5/Model/Generated/EncounterHistory.cs b/src/Hl7.Fhir.R5/Model/Generated/EncounterHistory.cs
index fdf3f3f93e..c184ea1470 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/EncounterHistory.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/EncounterHistory.cs
@@ -68,14 +68,13 @@ public partial class EncounterHistory : Hl7.Fhir.Model.DomainResource, IIdentifi
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("EncounterHistory#Location")]
-    [BackboneType("EncounterHistory.location")]
+    [FhirType("EncounterHistory.location", IsBackboneType=true)]
     public partial class LocationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "EncounterHistory#Location"; } }
+      public override string TypeName { get { return "EncounterHistory.location"; } }
 
       /// <summary>
       /// Location the encounter takes place
diff --git a/src/Hl7.Fhir.R5/Model/Generated/Endpoint.cs b/src/Hl7.Fhir.R5/Model/Generated/Endpoint.cs
index 6c239e496b..30e9d15290 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/Endpoint.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/Endpoint.cs
@@ -108,14 +108,13 @@ public enum EndpointStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Endpoint#Payload")]
-    [BackboneType("Endpoint.payload")]
+    [FhirType("Endpoint.payload", IsBackboneType=true)]
     public partial class PayloadComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Endpoint#Payload"; } }
+      public override string TypeName { get { return "Endpoint.payload"; } }
 
       /// <summary>
       /// The type of content that may be used at this endpoint (e.g. XDS Discharge summaries)
diff --git a/src/Hl7.Fhir.R5/Model/Generated/EpisodeOfCare.cs b/src/Hl7.Fhir.R5/Model/Generated/EpisodeOfCare.cs
index b31694a882..3d30b9ce02 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/EpisodeOfCare.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/EpisodeOfCare.cs
@@ -119,14 +119,13 @@ public enum EpisodeOfCareStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("EpisodeOfCare#StatusHistory")]
-    [BackboneType("EpisodeOfCare.statusHistory")]
+    [FhirType("EpisodeOfCare.statusHistory", IsBackboneType=true)]
     public partial class StatusHistoryComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "EpisodeOfCare#StatusHistory"; } }
+      public override string TypeName { get { return "EpisodeOfCare.statusHistory"; } }
 
       /// <summary>
       /// planned | waitlist | active | onhold | finished | cancelled | entered-in-error
@@ -295,14 +294,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("EpisodeOfCare#Reason")]
-    [BackboneType("EpisodeOfCare.reason")]
+    [FhirType("EpisodeOfCare.reason", IsBackboneType=true)]
     public partial class ReasonComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "EpisodeOfCare#Reason"; } }
+      public override string TypeName { get { return "EpisodeOfCare.reason"; } }
 
       /// <summary>
       /// What the reason value should be used for/as
@@ -450,14 +448,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("EpisodeOfCare#Diagnosis")]
-    [BackboneType("EpisodeOfCare.diagnosis")]
+    [FhirType("EpisodeOfCare.diagnosis", IsBackboneType=true)]
     public partial class DiagnosisComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "EpisodeOfCare#Diagnosis"; } }
+      public override string TypeName { get { return "EpisodeOfCare.diagnosis"; } }
 
       /// <summary>
       /// The medical condition that was addressed during the episode of care
diff --git a/src/Hl7.Fhir.R5/Model/Generated/Evidence.cs b/src/Hl7.Fhir.R5/Model/Generated/Evidence.cs
index 18e037ec6a..085f59c07c 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/Evidence.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/Evidence.cs
@@ -64,14 +64,13 @@ public partial class Evidence : Hl7.Fhir.Model.DomainResource, IIdentifiable<Lis
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Evidence#VariableDefinition")]
-    [BackboneType("Evidence.variableDefinition")]
+    [FhirType("Evidence.variableDefinition", IsBackboneType=true)]
     public partial class VariableDefinitionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Evidence#VariableDefinition"; } }
+      public override string TypeName { get { return "Evidence.variableDefinition"; } }
 
       /// <summary>
       /// A text description or summary of the variable
@@ -338,14 +337,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Evidence#Statistic")]
-    [BackboneType("Evidence.statistic")]
+    [FhirType("Evidence.statistic", IsBackboneType=true)]
     public partial class StatisticComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Evidence#Statistic"; } }
+      public override string TypeName { get { return "Evidence.statistic"; } }
 
       /// <summary>
       /// Description of content
@@ -744,14 +742,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Evidence#SampleSize")]
-    [BackboneType("Evidence.statistic.sampleSize")]
+    [FhirType("Evidence.statistic.sampleSize", IsBackboneType=true)]
     public partial class SampleSizeComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Evidence#SampleSize"; } }
+      public override string TypeName { get { return "Evidence.statistic.sampleSize"; } }
 
       /// <summary>
       /// Textual description of sample size for statistic
@@ -1043,14 +1040,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Evidence#AttributeEstimate")]
-    [BackboneType("Evidence.statistic.attributeEstimate")]
+    [FhirType("Evidence.statistic.attributeEstimate", IsBackboneType=true)]
     public partial class AttributeEstimateComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Evidence#AttributeEstimate"; } }
+      public override string TypeName { get { return "Evidence.statistic.attributeEstimate"; } }
 
       /// <summary>
       /// Textual description of the attribute estimate
@@ -1358,14 +1354,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Evidence#ModelCharacteristic")]
-    [BackboneType("Evidence.statistic.modelCharacteristic")]
+    [FhirType("Evidence.statistic.modelCharacteristic", IsBackboneType=true)]
     public partial class ModelCharacteristicComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Evidence#ModelCharacteristic"; } }
+      public override string TypeName { get { return "Evidence.statistic.modelCharacteristic"; } }
 
       /// <summary>
       /// Model specification
@@ -1560,14 +1555,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Evidence#Variable")]
-    [BackboneType("Evidence.statistic.modelCharacteristic.variable")]
+    [FhirType("Evidence.statistic.modelCharacteristic.variable", IsBackboneType=true)]
     public partial class VariableComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Evidence#Variable"; } }
+      public override string TypeName { get { return "Evidence.statistic.modelCharacteristic.variable"; } }
 
       /// <summary>
       /// Description of the variable
@@ -1812,14 +1806,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Evidence#Certainty")]
-    [BackboneType("Evidence.certainty")]
+    [FhirType("Evidence.certainty", IsBackboneType=true)]
     public partial class CertaintyComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Evidence#Certainty"; } }
+      public override string TypeName { get { return "Evidence.certainty"; } }
 
       /// <summary>
       /// Textual description of certainty
diff --git a/src/Hl7.Fhir.R5/Model/Generated/EvidenceReport.cs b/src/Hl7.Fhir.R5/Model/Generated/EvidenceReport.cs
index 70794b658c..0bd861e8bb 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/EvidenceReport.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/EvidenceReport.cs
@@ -126,14 +126,13 @@ public enum ReportRelationshipType
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("EvidenceReport#Subject")]
-    [BackboneType("EvidenceReport.subject")]
+    [FhirType("EvidenceReport.subject", IsBackboneType=true)]
     public partial class SubjectComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "EvidenceReport#Subject"; } }
+      public override string TypeName { get { return "EvidenceReport.subject"; } }
 
       /// <summary>
       /// Characteristic
@@ -276,14 +275,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("EvidenceReport#Characteristic")]
-    [BackboneType("EvidenceReport.subject.characteristic")]
+    [FhirType("EvidenceReport.subject.characteristic", IsBackboneType=true)]
     public partial class CharacteristicComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "EvidenceReport#Characteristic"; } }
+      public override string TypeName { get { return "EvidenceReport.subject.characteristic"; } }
 
       /// <summary>
       /// Characteristic code
@@ -502,14 +500,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("EvidenceReport#RelatesTo")]
-    [BackboneType("EvidenceReport.relatesTo")]
+    [FhirType("EvidenceReport.relatesTo", IsBackboneType=true)]
     public partial class RelatesToComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "EvidenceReport#RelatesTo"; } }
+      public override string TypeName { get { return "EvidenceReport.relatesTo"; } }
 
       /// <summary>
       /// replaces | amends | appends | transforms | replacedWith | amendedWith | appendedWith | transformedWith
@@ -675,14 +672,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("EvidenceReport#Target")]
-    [BackboneType("EvidenceReport.relatesTo.target")]
+    [FhirType("EvidenceReport.relatesTo.target", IsBackboneType=true)]
     public partial class TargetComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "EvidenceReport#Target"; } }
+      public override string TypeName { get { return "EvidenceReport.relatesTo.target"; } }
 
       /// <summary>
       /// Target of the relationship URL
@@ -914,14 +910,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("EvidenceReport#Section")]
-    [BackboneType("EvidenceReport.section")]
+    [FhirType("EvidenceReport.section", IsBackboneType=true)]
     public partial class SectionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "EvidenceReport#Section"; } }
+      public override string TypeName { get { return "EvidenceReport.section"; } }
 
       /// <summary>
       /// Label for section (e.g. for ToC)
diff --git a/src/Hl7.Fhir.R5/Model/Generated/EvidenceVariable.cs b/src/Hl7.Fhir.R5/Model/Generated/EvidenceVariable.cs
index 0f201135ee..19291b108f 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/EvidenceVariable.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/EvidenceVariable.cs
@@ -121,14 +121,13 @@ public enum CharacteristicCombinationCode
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("EvidenceVariable#Characteristic")]
-    [BackboneType("EvidenceVariable.characteristic")]
+    [FhirType("EvidenceVariable.characteristic", IsBackboneType=true)]
     public partial class CharacteristicComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "EvidenceVariable#Characteristic"; } }
+      public override string TypeName { get { return "EvidenceVariable.characteristic"; } }
 
       /// <summary>
       /// Label for internal linking
@@ -670,14 +669,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("EvidenceVariable#DefinitionByTypeAndValue")]
-    [BackboneType("EvidenceVariable.characteristic.definitionByTypeAndValue")]
+    [FhirType("EvidenceVariable.characteristic.definitionByTypeAndValue", IsBackboneType=true)]
     public partial class DefinitionByTypeAndValueComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "EvidenceVariable#DefinitionByTypeAndValue"; } }
+      public override string TypeName { get { return "EvidenceVariable.characteristic.definitionByTypeAndValue"; } }
 
       /// <summary>
       /// Expresses the type of characteristic
@@ -906,14 +904,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("EvidenceVariable#DefinitionByCombination")]
-    [BackboneType("EvidenceVariable.characteristic.definitionByCombination")]
+    [FhirType("EvidenceVariable.characteristic.definitionByCombination", IsBackboneType=true)]
     public partial class DefinitionByCombinationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "EvidenceVariable#DefinitionByCombination"; } }
+      public override string TypeName { get { return "EvidenceVariable.characteristic.definitionByCombination"; } }
 
       /// <summary>
       /// all-of | any-of | at-least | at-most | statistical | net-effect | dataset
@@ -1119,14 +1116,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("EvidenceVariable#TimeFromEvent")]
-    [BackboneType("EvidenceVariable.characteristic.timeFromEvent")]
+    [FhirType("EvidenceVariable.characteristic.timeFromEvent", IsBackboneType=true)]
     public partial class TimeFromEventComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "EvidenceVariable#TimeFromEvent"; } }
+      public override string TypeName { get { return "EvidenceVariable.characteristic.timeFromEvent"; } }
 
       /// <summary>
       /// Human readable description
@@ -1364,14 +1360,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("EvidenceVariable#Category")]
-    [BackboneType("EvidenceVariable.category")]
+    [FhirType("EvidenceVariable.category", IsBackboneType=true)]
     public partial class CategoryComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "EvidenceVariable#Category"; } }
+      public override string TypeName { get { return "EvidenceVariable.category"; } }
 
       /// <summary>
       /// Description of the grouping
diff --git a/src/Hl7.Fhir.R5/Model/Generated/ExampleScenario.cs b/src/Hl7.Fhir.R5/Model/Generated/ExampleScenario.cs
index f19e784c06..6ce5ac6d92 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/ExampleScenario.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/ExampleScenario.cs
@@ -64,14 +64,13 @@ public partial class ExampleScenario : Hl7.Fhir.Model.DomainResource, IIdentifia
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExampleScenario#Actor")]
-    [BackboneType("ExampleScenario.actor")]
+    [FhirType("ExampleScenario.actor", IsBackboneType=true)]
     public partial class ActorComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ExampleScenario#Actor"; } }
+      public override string TypeName { get { return "ExampleScenario.actor"; } }
 
       /// <summary>
       /// ID or acronym of the actor
@@ -342,14 +341,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExampleScenario#Instance")]
-    [BackboneType("ExampleScenario.instance")]
+    [FhirType("ExampleScenario.instance", IsBackboneType=true)]
     public partial class InstanceComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ExampleScenario#Instance"; } }
+      public override string TypeName { get { return "ExampleScenario.instance"; } }
 
       /// <summary>
       /// ID or acronym of the instance
@@ -749,14 +747,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExampleScenario#Version")]
-    [BackboneType("ExampleScenario.instance.version")]
+    [FhirType("ExampleScenario.instance.version", IsBackboneType=true)]
     public partial class VersionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ExampleScenario#Version"; } }
+      public override string TypeName { get { return "ExampleScenario.instance.version"; } }
 
       /// <summary>
       /// ID or acronym of the version
@@ -1006,14 +1003,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExampleScenario#ContainedInstance")]
-    [BackboneType("ExampleScenario.instance.containedInstance")]
+    [FhirType("ExampleScenario.instance.containedInstance", IsBackboneType=true)]
     public partial class ContainedInstanceComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ExampleScenario#ContainedInstance"; } }
+      public override string TypeName { get { return "ExampleScenario.instance.containedInstance"; } }
 
       /// <summary>
       /// Key of contained instance
@@ -1195,14 +1191,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExampleScenario#Process")]
-    [BackboneType("ExampleScenario.process")]
+    [FhirType("ExampleScenario.process", IsBackboneType=true)]
     public partial class ProcessComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ExampleScenario#Process"; } }
+      public override string TypeName { get { return "ExampleScenario.process"; } }
 
       /// <summary>
       /// Label for procss
@@ -1495,14 +1490,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExampleScenario#Step")]
-    [BackboneType("ExampleScenario.process.step")]
+    [FhirType("ExampleScenario.process.step", IsBackboneType=true)]
     public partial class StepComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ExampleScenario#Step"; } }
+      public override string TypeName { get { return "ExampleScenario.process.step"; } }
 
       /// <summary>
       /// Sequential number of the step
@@ -1801,14 +1795,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExampleScenario#Operation")]
-    [BackboneType("ExampleScenario.process.step.operation")]
+    [FhirType("ExampleScenario.process.step.operation", IsBackboneType=true)]
     public partial class OperationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ExampleScenario#Operation"; } }
+      public override string TypeName { get { return "ExampleScenario.process.step.operation"; } }
 
       /// <summary>
       /// Kind of action
@@ -2236,14 +2229,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExampleScenario#Alternative")]
-    [BackboneType("ExampleScenario.process.step.alternative")]
+    [FhirType("ExampleScenario.process.step.alternative", IsBackboneType=true)]
     public partial class AlternativeComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ExampleScenario#Alternative"; } }
+      public override string TypeName { get { return "ExampleScenario.process.step.alternative"; } }
 
       /// <summary>
       /// Label for alternative
diff --git a/src/Hl7.Fhir.R5/Model/Generated/ExplanationOfBenefit.cs b/src/Hl7.Fhir.R5/Model/Generated/ExplanationOfBenefit.cs
index bb1aa1a95a..335ac4cf54 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/ExplanationOfBenefit.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/ExplanationOfBenefit.cs
@@ -102,14 +102,13 @@ public enum ExplanationOfBenefitStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#RelatedClaim")]
-    [BackboneType("ExplanationOfBenefit.related")]
+    [FhirType("ExplanationOfBenefit.related", IsBackboneType=true)]
     public partial class RelatedClaimComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ExplanationOfBenefit#RelatedClaim"; } }
+      public override string TypeName { get { return "ExplanationOfBenefit.related"; } }
 
       /// <summary>
       /// Reference to the related claim
@@ -281,14 +280,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#Event")]
-    [BackboneType("ExplanationOfBenefit.event")]
+    [FhirType("ExplanationOfBenefit.event", IsBackboneType=true)]
     public partial class EventComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ExplanationOfBenefit#Event"; } }
+      public override string TypeName { get { return "ExplanationOfBenefit.event"; } }
 
       /// <summary>
       /// Specific event
@@ -438,14 +436,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#Payee")]
-    [BackboneType("ExplanationOfBenefit.payee")]
+    [FhirType("ExplanationOfBenefit.payee", IsBackboneType=true)]
     public partial class PayeeComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ExplanationOfBenefit#Payee"; } }
+      public override string TypeName { get { return "ExplanationOfBenefit.payee"; } }
 
       /// <summary>
       /// Category of recipient
@@ -592,14 +589,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#CareTeam")]
-    [BackboneType("ExplanationOfBenefit.careTeam")]
+    [FhirType("ExplanationOfBenefit.careTeam", IsBackboneType=true)]
     public partial class CareTeamComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ExplanationOfBenefit#CareTeam"; } }
+      public override string TypeName { get { return "ExplanationOfBenefit.careTeam"; } }
 
       /// <summary>
       /// Order of care team
@@ -861,14 +857,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#SupportingInformation")]
-    [BackboneType("ExplanationOfBenefit.supportingInfo")]
+    [FhirType("ExplanationOfBenefit.supportingInfo", IsBackboneType=true)]
     public partial class SupportingInformationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ExplanationOfBenefit#SupportingInformation"; } }
+      public override string TypeName { get { return "ExplanationOfBenefit.supportingInfo"; } }
 
       /// <summary>
       /// Information instance identifier
@@ -1140,14 +1135,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#Diagnosis")]
-    [BackboneType("ExplanationOfBenefit.diagnosis")]
+    [FhirType("ExplanationOfBenefit.diagnosis", IsBackboneType=true)]
     public partial class DiagnosisComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ExplanationOfBenefit#Diagnosis"; } }
+      public override string TypeName { get { return "ExplanationOfBenefit.diagnosis"; } }
 
       /// <summary>
       /// Diagnosis instance identifier
@@ -1368,14 +1362,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#Procedure")]
-    [BackboneType("ExplanationOfBenefit.procedure")]
+    [FhirType("ExplanationOfBenefit.procedure", IsBackboneType=true)]
     public partial class ProcedureComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ExplanationOfBenefit#Procedure"; } }
+      public override string TypeName { get { return "ExplanationOfBenefit.procedure"; } }
 
       /// <summary>
       /// Procedure instance identifier
@@ -1642,14 +1635,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#Insurance")]
-    [BackboneType("ExplanationOfBenefit.insurance")]
+    [FhirType("ExplanationOfBenefit.insurance", IsBackboneType=true)]
     public partial class InsuranceComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ExplanationOfBenefit#Insurance"; } }
+      public override string TypeName { get { return "ExplanationOfBenefit.insurance"; } }
 
       /// <summary>
       /// Coverage to be used for adjudication
@@ -1859,14 +1851,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#Accident")]
-    [BackboneType("ExplanationOfBenefit.accident")]
+    [FhirType("ExplanationOfBenefit.accident", IsBackboneType=true)]
     public partial class AccidentComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ExplanationOfBenefit#Accident"; } }
+      public override string TypeName { get { return "ExplanationOfBenefit.accident"; } }
 
       /// <summary>
       /// When the incident occurred
@@ -2057,14 +2048,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#Item")]
-    [BackboneType("ExplanationOfBenefit.item")]
+    [FhirType("ExplanationOfBenefit.item", IsBackboneType=true)]
     public partial class ItemComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ExplanationOfBenefit#Item"; } }
+      public override string TypeName { get { return "ExplanationOfBenefit.item"; } }
 
       /// <summary>
       /// Item instance identifier
@@ -3017,14 +3007,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#ItemBodySite")]
-    [BackboneType("ExplanationOfBenefit.item.bodySite")]
+    [FhirType("ExplanationOfBenefit.item.bodySite", IsBackboneType=true)]
     public partial class ItemBodySiteComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ExplanationOfBenefit#ItemBodySite"; } }
+      public override string TypeName { get { return "ExplanationOfBenefit.item.bodySite"; } }
 
       /// <summary>
       /// Location
@@ -3172,14 +3161,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#ReviewOutcome")]
-    [BackboneType("ExplanationOfBenefit.item.reviewOutcome")]
+    [FhirType("ExplanationOfBenefit.item.reviewOutcome", IsBackboneType=true)]
     public partial class ReviewOutcomeComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ExplanationOfBenefit#ReviewOutcome"; } }
+      public override string TypeName { get { return "ExplanationOfBenefit.item.reviewOutcome"; } }
 
       /// <summary>
       /// Result of the adjudication
@@ -3394,14 +3382,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#Adjudication")]
-    [BackboneType("ExplanationOfBenefit.item.adjudication")]
+    [FhirType("ExplanationOfBenefit.item.adjudication", IsBackboneType=true)]
     public partial class AdjudicationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ExplanationOfBenefit#Adjudication"; } }
+      public override string TypeName { get { return "ExplanationOfBenefit.item.adjudication"; } }
 
       /// <summary>
       /// Type of adjudication information
@@ -3598,14 +3585,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#Detail")]
-    [BackboneType("ExplanationOfBenefit.item.detail")]
+    [FhirType("ExplanationOfBenefit.item.detail", IsBackboneType=true)]
     public partial class DetailComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ExplanationOfBenefit#Detail"; } }
+      public override string TypeName { get { return "ExplanationOfBenefit.item.detail"; } }
 
       /// <summary>
       /// Product or service provided
@@ -4244,14 +4230,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#SubDetail")]
-    [BackboneType("ExplanationOfBenefit.item.detail.subDetail")]
+    [FhirType("ExplanationOfBenefit.item.detail.subDetail", IsBackboneType=true)]
     public partial class SubDetailComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ExplanationOfBenefit#SubDetail"; } }
+      public override string TypeName { get { return "ExplanationOfBenefit.item.detail.subDetail"; } }
 
       /// <summary>
       /// Product or service provided
@@ -4864,14 +4849,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#AddedItem")]
-    [BackboneType("ExplanationOfBenefit.addItem")]
+    [FhirType("ExplanationOfBenefit.addItem", IsBackboneType=true)]
     public partial class AddedItemComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ExplanationOfBenefit#AddedItem"; } }
+      public override string TypeName { get { return "ExplanationOfBenefit.addItem"; } }
 
       /// <summary>
       /// Item sequence number
@@ -5682,14 +5666,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#AddedItemBodySite")]
-    [BackboneType("ExplanationOfBenefit.addItem.bodySite")]
+    [FhirType("ExplanationOfBenefit.addItem.bodySite", IsBackboneType=true)]
     public partial class AddedItemBodySiteComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ExplanationOfBenefit#AddedItemBodySite"; } }
+      public override string TypeName { get { return "ExplanationOfBenefit.addItem.bodySite"; } }
 
       /// <summary>
       /// Location
@@ -5837,14 +5820,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#AddedItemDetail")]
-    [BackboneType("ExplanationOfBenefit.addItem.detail")]
+    [FhirType("ExplanationOfBenefit.addItem.detail", IsBackboneType=true)]
     public partial class AddedItemDetailComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ExplanationOfBenefit#AddedItemDetail"; } }
+      public override string TypeName { get { return "ExplanationOfBenefit.addItem.detail"; } }
 
       /// <summary>
       /// Number for tracking
@@ -6358,14 +6340,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#AddedItemDetailSubDetail")]
-    [BackboneType("ExplanationOfBenefit.addItem.detail.subDetail")]
+    [FhirType("ExplanationOfBenefit.addItem.detail.subDetail", IsBackboneType=true)]
     public partial class AddedItemDetailSubDetailComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ExplanationOfBenefit#AddedItemDetailSubDetail"; } }
+      public override string TypeName { get { return "ExplanationOfBenefit.addItem.detail.subDetail"; } }
 
       /// <summary>
       /// Number for tracking
@@ -6854,14 +6835,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#Total")]
-    [BackboneType("ExplanationOfBenefit.total")]
+    [FhirType("ExplanationOfBenefit.total", IsBackboneType=true)]
     public partial class TotalComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ExplanationOfBenefit#Total"; } }
+      public override string TypeName { get { return "ExplanationOfBenefit.total"; } }
 
       /// <summary>
       /// Type of adjudication information
@@ -7008,14 +6988,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#Payment")]
-    [BackboneType("ExplanationOfBenefit.payment")]
+    [FhirType("ExplanationOfBenefit.payment", IsBackboneType=true)]
     public partial class PaymentComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ExplanationOfBenefit#Payment"; } }
+      public override string TypeName { get { return "ExplanationOfBenefit.payment"; } }
 
       /// <summary>
       /// Partial or complete payment
@@ -7279,14 +7258,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#Note")]
-    [BackboneType("ExplanationOfBenefit.processNote")]
+    [FhirType("ExplanationOfBenefit.processNote", IsBackboneType=true)]
     public partial class NoteComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ExplanationOfBenefit#Note"; } }
+      public override string TypeName { get { return "ExplanationOfBenefit.processNote"; } }
 
       /// <summary>
       /// Note instance identifier
@@ -7515,14 +7493,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#BenefitBalance")]
-    [BackboneType("ExplanationOfBenefit.benefitBalance")]
+    [FhirType("ExplanationOfBenefit.benefitBalance", IsBackboneType=true)]
     public partial class BenefitBalanceComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ExplanationOfBenefit#BenefitBalance"; } }
+      public override string TypeName { get { return "ExplanationOfBenefit.benefitBalance"; } }
 
       /// <summary>
       /// Benefit classification
@@ -7876,14 +7853,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#Benefit")]
-    [BackboneType("ExplanationOfBenefit.benefitBalance.financial")]
+    [FhirType("ExplanationOfBenefit.benefitBalance.financial", IsBackboneType=true)]
     public partial class BenefitComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ExplanationOfBenefit#Benefit"; } }
+      public override string TypeName { get { return "ExplanationOfBenefit.benefitBalance.financial"; } }
 
       /// <summary>
       /// Benefit classification
diff --git a/src/Hl7.Fhir.R5/Model/Generated/FamilyMemberHistory.cs b/src/Hl7.Fhir.R5/Model/Generated/FamilyMemberHistory.cs
index 5f58d4bbbd..90ea1ad342 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/FamilyMemberHistory.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/FamilyMemberHistory.cs
@@ -101,14 +101,13 @@ public enum FamilyHistoryStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("FamilyMemberHistory#Participant")]
-    [BackboneType("FamilyMemberHistory.participant")]
+    [FhirType("FamilyMemberHistory.participant", IsBackboneType=true)]
     public partial class ParticipantComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "FamilyMemberHistory#Participant"; } }
+      public override string TypeName { get { return "FamilyMemberHistory.participant"; } }
 
       /// <summary>
       /// Type of involvement
@@ -256,14 +255,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("FamilyMemberHistory#Condition")]
-    [BackboneType("FamilyMemberHistory.condition")]
+    [FhirType("FamilyMemberHistory.condition", IsBackboneType=true)]
     public partial class ConditionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "FamilyMemberHistory#Condition"; } }
+      public override string TypeName { get { return "FamilyMemberHistory.condition"; } }
 
       /// <summary>
       /// Condition suffered by relation
@@ -506,14 +504,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("FamilyMemberHistory#Procedure")]
-    [BackboneType("FamilyMemberHistory.procedure")]
+    [FhirType("FamilyMemberHistory.procedure", IsBackboneType=true)]
     public partial class ProcedureComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "FamilyMemberHistory#Procedure"; } }
+      public override string TypeName { get { return "FamilyMemberHistory.procedure"; } }
 
       /// <summary>
       /// Procedures performed on the related person
diff --git a/src/Hl7.Fhir.R5/Model/Generated/GenomicStudy.cs b/src/Hl7.Fhir.R5/Model/Generated/GenomicStudy.cs
index dab3012389..ee0994767c 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/GenomicStudy.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/GenomicStudy.cs
@@ -107,14 +107,13 @@ public enum GenomicStudyStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("GenomicStudy#Analysis")]
-    [BackboneType("GenomicStudy.analysis")]
+    [FhirType("GenomicStudy.analysis", IsBackboneType=true)]
     public partial class AnalysisComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "GenomicStudy#Analysis"; } }
+      public override string TypeName { get { return "GenomicStudy.analysis"; } }
 
       /// <summary>
       /// Identifiers for the analysis event
@@ -752,14 +751,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("GenomicStudy#Input")]
-    [BackboneType("GenomicStudy.analysis.input")]
+    [FhirType("GenomicStudy.analysis.input", IsBackboneType=true)]
     public partial class InputComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "GenomicStudy#Input"; } }
+      public override string TypeName { get { return "GenomicStudy.analysis.input"; } }
 
       /// <summary>
       /// File containing input data
@@ -931,14 +929,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("GenomicStudy#Output")]
-    [BackboneType("GenomicStudy.analysis.output")]
+    [FhirType("GenomicStudy.analysis.output", IsBackboneType=true)]
     public partial class OutputComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "GenomicStudy#Output"; } }
+      public override string TypeName { get { return "GenomicStudy.analysis.output"; } }
 
       /// <summary>
       /// File containing output data
@@ -1082,14 +1079,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("GenomicStudy#Performer")]
-    [BackboneType("GenomicStudy.analysis.performer")]
+    [FhirType("GenomicStudy.analysis.performer", IsBackboneType=true)]
     public partial class PerformerComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "GenomicStudy#Performer"; } }
+      public override string TypeName { get { return "GenomicStudy.analysis.performer"; } }
 
       /// <summary>
       /// The organization, healthcare professional, or others who participated in performing this analysis
@@ -1232,14 +1228,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("GenomicStudy#Device")]
-    [BackboneType("GenomicStudy.analysis.device")]
+    [FhirType("GenomicStudy.analysis.device", IsBackboneType=true)]
     public partial class DeviceComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "GenomicStudy#Device"; } }
+      public override string TypeName { get { return "GenomicStudy.analysis.device"; } }
 
       /// <summary>
       /// Device used for the analysis
diff --git a/src/Hl7.Fhir.R5/Model/Generated/Goal.cs b/src/Hl7.Fhir.R5/Model/Generated/Goal.cs
index 93b5a5acf7..441647a3a6 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/Goal.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/Goal.cs
@@ -133,14 +133,13 @@ public enum GoalLifecycleStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Goal#Target")]
-    [BackboneType("Goal.target")]
+    [FhirType("Goal.target", IsBackboneType=true)]
     public partial class TargetComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Goal#Target"; } }
+      public override string TypeName { get { return "Goal.target"; } }
 
       /// <summary>
       /// The parameter whose value is being tracked
diff --git a/src/Hl7.Fhir.R5/Model/Generated/GraphDefinition.cs b/src/Hl7.Fhir.R5/Model/Generated/GraphDefinition.cs
index c0c0902bdb..d3f2e7febc 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/GraphDefinition.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/GraphDefinition.cs
@@ -120,14 +120,13 @@ public enum GraphCompartmentRule
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("GraphDefinition#Node")]
-    [BackboneType("GraphDefinition.node")]
+    [FhirType("GraphDefinition.node", IsBackboneType=true)]
     public partial class NodeComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "GraphDefinition#Node"; } }
+      public override string TypeName { get { return "GraphDefinition.node"; } }
 
       /// <summary>
       /// Internal ID - target for link references
@@ -394,14 +393,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("GraphDefinition#Link")]
-    [BackboneType("GraphDefinition.link")]
+    [FhirType("GraphDefinition.link", IsBackboneType=true)]
     public partial class LinkComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "GraphDefinition#Link"; } }
+      public override string TypeName { get { return "GraphDefinition.link"; } }
 
       /// <summary>
       /// Why this link is specified
@@ -864,14 +862,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("GraphDefinition#Compartment")]
-    [BackboneType("GraphDefinition.link.compartment")]
+    [FhirType("GraphDefinition.link.compartment", IsBackboneType=true)]
     public partial class CompartmentComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "GraphDefinition#Compartment"; } }
+      public override string TypeName { get { return "GraphDefinition.link.compartment"; } }
 
       /// <summary>
       /// where | requires
diff --git a/src/Hl7.Fhir.R5/Model/Generated/Group.cs b/src/Hl7.Fhir.R5/Model/Generated/Group.cs
index 2307147cca..92addf61ba 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/Group.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/Group.cs
@@ -161,14 +161,13 @@ public enum GroupMembershipBasis
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Group#Characteristic")]
-    [BackboneType("Group.characteristic")]
+    [FhirType("Group.characteristic", IsBackboneType=true)]
     public partial class CharacteristicComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Group#Characteristic"; } }
+      public override string TypeName { get { return "Group.characteristic"; } }
 
       /// <summary>
       /// Kind of characteristic
@@ -387,14 +386,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Group#Member")]
-    [BackboneType("Group.member")]
+    [FhirType("Group.member", IsBackboneType=true)]
     public partial class MemberComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Group#Member"; } }
+      public override string TypeName { get { return "Group.member"; } }
 
       /// <summary>
       /// Reference to the group member
diff --git a/src/Hl7.Fhir.R5/Model/Generated/HealthcareService.cs b/src/Hl7.Fhir.R5/Model/Generated/HealthcareService.cs
index 42d496c7aa..4b65a5a40d 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/HealthcareService.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/HealthcareService.cs
@@ -64,14 +64,13 @@ public partial class HealthcareService : Hl7.Fhir.Model.DomainResource, IIdentif
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("HealthcareService#Eligibility")]
-    [BackboneType("HealthcareService.eligibility")]
+    [FhirType("HealthcareService.eligibility", IsBackboneType=true)]
     public partial class EligibilityComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "HealthcareService#Eligibility"; } }
+      public override string TypeName { get { return "HealthcareService.eligibility"; } }
 
       /// <summary>
       /// Coded value for the eligibility
diff --git a/src/Hl7.Fhir.R5/Model/Generated/ImagingSelection.cs b/src/Hl7.Fhir.R5/Model/Generated/ImagingSelection.cs
index cd58aae8b9..c190c1a61b 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/ImagingSelection.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/ImagingSelection.cs
@@ -181,14 +181,13 @@ public enum ImagingSelection3DGraphicType
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ImagingSelection#Performer")]
-    [BackboneType("ImagingSelection.performer")]
+    [FhirType("ImagingSelection.performer", IsBackboneType=true)]
     public partial class PerformerComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ImagingSelection#Performer"; } }
+      public override string TypeName { get { return "ImagingSelection.performer"; } }
 
       /// <summary>
       /// Type of performer
@@ -335,14 +334,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ImagingSelection#Instance")]
-    [BackboneType("ImagingSelection.instance")]
+    [FhirType("ImagingSelection.instance", IsBackboneType=true)]
     public partial class InstanceComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ImagingSelection#Instance"; } }
+      public override string TypeName { get { return "ImagingSelection.instance"; } }
 
       /// <summary>
       /// DICOM SOP Instance UID
@@ -646,14 +644,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ImagingSelection#ImageRegion2D")]
-    [BackboneType("ImagingSelection.instance.imageRegion2D")]
+    [FhirType("ImagingSelection.instance.imageRegion2D", IsBackboneType=true)]
     public partial class ImageRegion2DComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ImagingSelection#ImageRegion2D"; } }
+      public override string TypeName { get { return "ImagingSelection.instance.imageRegion2D"; } }
 
       /// <summary>
       /// point | polyline | interpolated | circle | ellipse
@@ -837,14 +834,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ImagingSelection#ImageRegion3D")]
-    [BackboneType("ImagingSelection.instance.imageRegion3D")]
+    [FhirType("ImagingSelection.instance.imageRegion3D", IsBackboneType=true)]
     public partial class ImageRegion3DComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ImagingSelection#ImageRegion3D"; } }
+      public override string TypeName { get { return "ImagingSelection.instance.imageRegion3D"; } }
 
       /// <summary>
       /// point | multipoint | polyline | polygon | ellipse | ellipsoid
diff --git a/src/Hl7.Fhir.R5/Model/Generated/ImagingStudy.cs b/src/Hl7.Fhir.R5/Model/Generated/ImagingStudy.cs
index 84055dde8d..448345a2a1 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/ImagingStudy.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/ImagingStudy.cs
@@ -107,14 +107,13 @@ public enum ImagingStudyStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ImagingStudy#Series")]
-    [BackboneType("ImagingStudy.series")]
+    [FhirType("ImagingStudy.series", IsBackboneType=true)]
     public partial class SeriesComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ImagingStudy#Series"; } }
+      public override string TypeName { get { return "ImagingStudy.series"; } }
 
       /// <summary>
       /// DICOM Series Instance UID for the series
@@ -612,14 +611,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ImagingStudy#Performer")]
-    [BackboneType("ImagingStudy.series.performer")]
+    [FhirType("ImagingStudy.series.performer", IsBackboneType=true)]
     public partial class PerformerComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ImagingStudy#Performer"; } }
+      public override string TypeName { get { return "ImagingStudy.series.performer"; } }
 
       /// <summary>
       /// Type of performance
@@ -767,14 +765,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ImagingStudy#Instance")]
-    [BackboneType("ImagingStudy.series.instance")]
+    [FhirType("ImagingStudy.series.instance", IsBackboneType=true)]
     public partial class InstanceComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ImagingStudy#Instance"; } }
+      public override string TypeName { get { return "ImagingStudy.series.instance"; } }
 
       /// <summary>
       /// DICOM SOP Instance UID
diff --git a/src/Hl7.Fhir.R5/Model/Generated/Immunization.cs b/src/Hl7.Fhir.R5/Model/Generated/Immunization.cs
index 9f7ba33845..026b8b43ce 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/Immunization.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/Immunization.cs
@@ -95,14 +95,13 @@ public enum ImmunizationStatusCodes
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Immunization#Performer")]
-    [BackboneType("Immunization.performer")]
+    [FhirType("Immunization.performer", IsBackboneType=true)]
     public partial class PerformerComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Immunization#Performer"; } }
+      public override string TypeName { get { return "Immunization.performer"; } }
 
       /// <summary>
       /// What type of performance was done
@@ -250,14 +249,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Immunization#ProgramEligibility")]
-    [BackboneType("Immunization.programEligibility")]
+    [FhirType("Immunization.programEligibility", IsBackboneType=true)]
     public partial class ProgramEligibilityComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Immunization#ProgramEligibility"; } }
+      public override string TypeName { get { return "Immunization.programEligibility"; } }
 
       /// <summary>
       /// The program that eligibility is declared for
@@ -406,14 +404,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Immunization#Reaction")]
-    [BackboneType("Immunization.reaction")]
+    [FhirType("Immunization.reaction", IsBackboneType=true)]
     public partial class ReactionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Immunization#Reaction"; } }
+      public override string TypeName { get { return "Immunization.reaction"; } }
 
       /// <summary>
       /// When reaction started
@@ -618,14 +615,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Immunization#ProtocolApplied")]
-    [BackboneType("Immunization.protocolApplied")]
+    [FhirType("Immunization.protocolApplied", IsBackboneType=true)]
     public partial class ProtocolAppliedComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Immunization#ProtocolApplied"; } }
+      public override string TypeName { get { return "Immunization.protocolApplied"; } }
 
       /// <summary>
       /// Name of vaccine series
diff --git a/src/Hl7.Fhir.R5/Model/Generated/ImmunizationRecommendation.cs b/src/Hl7.Fhir.R5/Model/Generated/ImmunizationRecommendation.cs
index f4cafb7498..a19fe20850 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/ImmunizationRecommendation.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/ImmunizationRecommendation.cs
@@ -67,14 +67,13 @@ public partial class ImmunizationRecommendation : Hl7.Fhir.Model.DomainResource,
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ImmunizationRecommendation#Recommendation")]
-    [BackboneType("ImmunizationRecommendation.recommendation")]
+    [FhirType("ImmunizationRecommendation.recommendation", IsBackboneType=true)]
     public partial class RecommendationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ImmunizationRecommendation#Recommendation"; } }
+      public override string TypeName { get { return "ImmunizationRecommendation.recommendation"; } }
 
       /// <summary>
       /// Vaccine  or vaccine group recommendation applies to
@@ -557,14 +556,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ImmunizationRecommendation#DateCriterion")]
-    [BackboneType("ImmunizationRecommendation.recommendation.dateCriterion")]
+    [FhirType("ImmunizationRecommendation.recommendation.dateCriterion", IsBackboneType=true)]
     public partial class DateCriterionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ImmunizationRecommendation#DateCriterion"; } }
+      public override string TypeName { get { return "ImmunizationRecommendation.recommendation.dateCriterion"; } }
 
       /// <summary>
       /// Type of date
diff --git a/src/Hl7.Fhir.R5/Model/Generated/ImplementationGuide.cs b/src/Hl7.Fhir.R5/Model/Generated/ImplementationGuide.cs
index 57a1be61e3..8802d4f262 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/ImplementationGuide.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/ImplementationGuide.cs
@@ -2187,14 +2187,13 @@ public enum GuidePageGeneration
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ImplementationGuide#DependsOn")]
-    [BackboneType("ImplementationGuide.dependsOn")]
+    [FhirType("ImplementationGuide.dependsOn", IsBackboneType=true)]
     public partial class DependsOnComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ImplementationGuide#DependsOn"; } }
+      public override string TypeName { get { return "ImplementationGuide.dependsOn"; } }
 
       /// <summary>
       /// Identity of the IG that this depends on
@@ -2462,14 +2461,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ImplementationGuide#Global")]
-    [BackboneType("ImplementationGuide.global")]
+    [FhirType("ImplementationGuide.global", IsBackboneType=true)]
     public partial class GlobalComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ImplementationGuide#Global"; } }
+      public override string TypeName { get { return "ImplementationGuide.global"; } }
 
       /// <summary>
       /// Type this profile applies to
@@ -2654,14 +2652,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ImplementationGuide#Definition")]
-    [BackboneType("ImplementationGuide.definition")]
+    [FhirType("ImplementationGuide.definition", IsBackboneType=true)]
     public partial class DefinitionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ImplementationGuide#Definition"; } }
+      public override string TypeName { get { return "ImplementationGuide.definition"; } }
 
       /// <summary>
       /// Grouping used to present related resources in the IG
@@ -2885,14 +2882,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ImplementationGuide#Grouping")]
-    [BackboneType("ImplementationGuide.definition.grouping")]
+    [FhirType("ImplementationGuide.definition.grouping", IsBackboneType=true)]
     public partial class GroupingComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ImplementationGuide#Grouping"; } }
+      public override string TypeName { get { return "ImplementationGuide.definition.grouping"; } }
 
       /// <summary>
       /// Descriptive name for the package
@@ -3073,14 +3069,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ImplementationGuide#Resource")]
-    [BackboneType("ImplementationGuide.definition.resource")]
+    [FhirType("ImplementationGuide.definition.resource", IsBackboneType=true)]
     public partial class ResourceComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ImplementationGuide#Resource"; } }
+      public override string TypeName { get { return "ImplementationGuide.definition.resource"; } }
 
       /// <summary>
       /// Location of the resource
@@ -3465,14 +3460,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ImplementationGuide#Page")]
-    [BackboneType("ImplementationGuide.definition.page")]
+    [FhirType("ImplementationGuide.definition.page", IsBackboneType=true)]
     public partial class PageComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ImplementationGuide#Page"; } }
+      public override string TypeName { get { return "ImplementationGuide.definition.page"; } }
 
       /// <summary>
       /// Source for page
@@ -3754,14 +3748,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ImplementationGuide#Parameter")]
-    [BackboneType("ImplementationGuide.definition.parameter")]
+    [FhirType("ImplementationGuide.definition.parameter", IsBackboneType=true)]
     public partial class ParameterComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ImplementationGuide#Parameter"; } }
+      public override string TypeName { get { return "ImplementationGuide.definition.parameter"; } }
 
       /// <summary>
       /// Code that identifies parameter
@@ -3922,14 +3915,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("ImplementationGuide#Template")]
-    [BackboneType("ImplementationGuide.definition.template")]
+    [FhirType("ImplementationGuide.definition.template", IsBackboneType=true)]
     public partial class TemplateComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ImplementationGuide#Template"; } }
+      public override string TypeName { get { return "ImplementationGuide.definition.template"; } }
 
       /// <summary>
       /// Type of template specified
@@ -4154,14 +4146,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ImplementationGuide#Manifest")]
-    [BackboneType("ImplementationGuide.manifest")]
+    [FhirType("ImplementationGuide.manifest", IsBackboneType=true)]
     public partial class ManifestComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ImplementationGuide#Manifest"; } }
+      public override string TypeName { get { return "ImplementationGuide.manifest"; } }
 
       /// <summary>
       /// Location of rendered implementation guide
@@ -4438,14 +4429,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ImplementationGuide#ManifestResource")]
-    [BackboneType("ImplementationGuide.manifest.resource")]
+    [FhirType("ImplementationGuide.manifest.resource", IsBackboneType=true)]
     public partial class ManifestResourceComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ImplementationGuide#ManifestResource"; } }
+      public override string TypeName { get { return "ImplementationGuide.manifest.resource"; } }
 
       /// <summary>
       /// Location of the resource
@@ -4697,14 +4687,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ImplementationGuide#ManifestPage")]
-    [BackboneType("ImplementationGuide.manifest.page")]
+    [FhirType("ImplementationGuide.manifest.page", IsBackboneType=true)]
     public partial class ManifestPageComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ImplementationGuide#ManifestPage"; } }
+      public override string TypeName { get { return "ImplementationGuide.manifest.page"; } }
 
       /// <summary>
       /// HTML page name
diff --git a/src/Hl7.Fhir.R5/Model/Generated/Ingredient.cs b/src/Hl7.Fhir.R5/Model/Generated/Ingredient.cs
index 99e04ff3a7..a303b1e105 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/Ingredient.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/Ingredient.cs
@@ -92,14 +92,13 @@ public enum IngredientManufacturerRole
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Ingredient#Manufacturer")]
-    [BackboneType("Ingredient.manufacturer")]
+    [FhirType("Ingredient.manufacturer", IsBackboneType=true)]
     public partial class ManufacturerComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Ingredient#Manufacturer"; } }
+      public override string TypeName { get { return "Ingredient.manufacturer"; } }
 
       /// <summary>
       /// allowed | possible | actual
@@ -263,14 +262,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Ingredient#Substance")]
-    [BackboneType("Ingredient.substance")]
+    [FhirType("Ingredient.substance", IsBackboneType=true)]
     public partial class SubstanceComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Ingredient#Substance"; } }
+      public override string TypeName { get { return "Ingredient.substance"; } }
 
       /// <summary>
       /// A code or full resource that represents the ingredient substance
@@ -417,14 +415,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Ingredient#Strength")]
-    [BackboneType("Ingredient.substance.strength")]
+    [FhirType("Ingredient.substance.strength", IsBackboneType=true)]
     public partial class StrengthComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Ingredient#Strength"; } }
+      public override string TypeName { get { return "Ingredient.substance.strength"; } }
 
       /// <summary>
       /// The quantity of substance in the unit of presentation
@@ -779,14 +776,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Ingredient#ReferenceStrength")]
-    [BackboneType("Ingredient.substance.strength.referenceStrength")]
+    [FhirType("Ingredient.substance.strength.referenceStrength", IsBackboneType=true)]
     public partial class ReferenceStrengthComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Ingredient#ReferenceStrength"; } }
+      public override string TypeName { get { return "Ingredient.substance.strength.referenceStrength"; } }
 
       /// <summary>
       /// Relevant reference substance
diff --git a/src/Hl7.Fhir.R5/Model/Generated/InsurancePlan.cs b/src/Hl7.Fhir.R5/Model/Generated/InsurancePlan.cs
index 616b48c15e..3086a61cf4 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/InsurancePlan.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/InsurancePlan.cs
@@ -92,14 +92,13 @@ public enum BenefitCostApplicability
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("InsurancePlan#Coverage")]
-    [BackboneType("InsurancePlan.coverage")]
+    [FhirType("InsurancePlan.coverage", IsBackboneType=true)]
     public partial class CoverageComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "InsurancePlan#Coverage"; } }
+      public override string TypeName { get { return "InsurancePlan.coverage"; } }
 
       /// <summary>
       /// Type of coverage
@@ -273,14 +272,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("InsurancePlan#CoverageBenefit")]
-    [BackboneType("InsurancePlan.coverage.benefit")]
+    [FhirType("InsurancePlan.coverage.benefit", IsBackboneType=true)]
     public partial class CoverageBenefitComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "InsurancePlan#CoverageBenefit"; } }
+      public override string TypeName { get { return "InsurancePlan.coverage.benefit"; } }
 
       /// <summary>
       /// Type of benefit
@@ -469,14 +467,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("InsurancePlan#Limit")]
-    [BackboneType("InsurancePlan.coverage.benefit.limit")]
+    [FhirType("InsurancePlan.coverage.benefit.limit", IsBackboneType=true)]
     public partial class LimitComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "InsurancePlan#Limit"; } }
+      public override string TypeName { get { return "InsurancePlan.coverage.benefit.limit"; } }
 
       /// <summary>
       /// Maximum value allowed
@@ -620,14 +617,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("InsurancePlan#Plan")]
-    [BackboneType("InsurancePlan.plan")]
+    [FhirType("InsurancePlan.plan", IsBackboneType=true)]
     public partial class PlanComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "InsurancePlan#Plan"; } }
+      public override string TypeName { get { return "InsurancePlan.plan"; } }
 
       /// <summary>
       /// Business Identifier for Product
@@ -880,14 +876,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("InsurancePlan#GeneralCost")]
-    [BackboneType("InsurancePlan.plan.generalCost")]
+    [FhirType("InsurancePlan.plan.generalCost", IsBackboneType=true)]
     public partial class GeneralCostComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "InsurancePlan#GeneralCost"; } }
+      public override string TypeName { get { return "InsurancePlan.plan.generalCost"; } }
 
       /// <summary>
       /// Type of cost
@@ -1117,14 +1112,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("InsurancePlan#SpecificCost")]
-    [BackboneType("InsurancePlan.plan.specificCost")]
+    [FhirType("InsurancePlan.plan.specificCost", IsBackboneType=true)]
     public partial class SpecificCostComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "InsurancePlan#SpecificCost"; } }
+      public override string TypeName { get { return "InsurancePlan.plan.specificCost"; } }
 
       /// <summary>
       /// General category of benefit
@@ -1270,14 +1264,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("InsurancePlan#PlanBenefit")]
-    [BackboneType("InsurancePlan.plan.specificCost.benefit")]
+    [FhirType("InsurancePlan.plan.specificCost.benefit", IsBackboneType=true)]
     public partial class PlanBenefitComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "InsurancePlan#PlanBenefit"; } }
+      public override string TypeName { get { return "InsurancePlan.plan.specificCost.benefit"; } }
 
       /// <summary>
       /// Type of specific benefit
@@ -1423,14 +1416,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("InsurancePlan#Cost")]
-    [BackboneType("InsurancePlan.plan.specificCost.benefit.cost")]
+    [FhirType("InsurancePlan.plan.specificCost.benefit.cost", IsBackboneType=true)]
     public partial class CostComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "InsurancePlan#Cost"; } }
+      public override string TypeName { get { return "InsurancePlan.plan.specificCost.benefit.cost"; } }
 
       /// <summary>
       /// Type of cost
diff --git a/src/Hl7.Fhir.R5/Model/Generated/InventoryItem.cs b/src/Hl7.Fhir.R5/Model/Generated/InventoryItem.cs
index b97151cd22..b0249b5666 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/InventoryItem.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/InventoryItem.cs
@@ -98,14 +98,13 @@ public enum InventoryItemStatusCodes
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("InventoryItem#Name")]
-    [BackboneType("InventoryItem.name")]
+    [FhirType("InventoryItem.name", IsBackboneType=true)]
     public partial class NameComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "InventoryItem#Name"; } }
+      public override string TypeName { get { return "InventoryItem.name"; } }
 
       /// <summary>
       /// The type of name e.g. 'brand-name', 'functional-name', 'common-name'
@@ -313,14 +312,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("InventoryItem#ResponsibleOrganization")]
-    [BackboneType("InventoryItem.responsibleOrganization")]
+    [FhirType("InventoryItem.responsibleOrganization", IsBackboneType=true)]
     public partial class ResponsibleOrganizationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "InventoryItem#ResponsibleOrganization"; } }
+      public override string TypeName { get { return "InventoryItem.responsibleOrganization"; } }
 
       /// <summary>
       /// The role of the organization e.g. manufacturer, distributor, or other
@@ -468,14 +466,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("InventoryItem#Description")]
-    [BackboneType("InventoryItem.description")]
+    [FhirType("InventoryItem.description", IsBackboneType=true)]
     public partial class DescriptionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "InventoryItem#Description"; } }
+      public override string TypeName { get { return "InventoryItem.description"; } }
 
       /// <summary>
       /// The language that is used in the item description
@@ -654,14 +651,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("InventoryItem#Association")]
-    [BackboneType("InventoryItem.association")]
+    [FhirType("InventoryItem.association", IsBackboneType=true)]
     public partial class AssociationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "InventoryItem#Association"; } }
+      public override string TypeName { get { return "InventoryItem.association"; } }
 
       /// <summary>
       /// The type of association between the device and the other item
@@ -835,14 +831,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("InventoryItem#Characteristic")]
-    [BackboneType("InventoryItem.characteristic")]
+    [FhirType("InventoryItem.characteristic", IsBackboneType=true)]
     public partial class CharacteristicComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "InventoryItem#Characteristic"; } }
+      public override string TypeName { get { return "InventoryItem.characteristic"; } }
 
       /// <summary>
       /// The characteristic that is being defined
@@ -987,14 +982,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("InventoryItem#Instance")]
-    [BackboneType("InventoryItem.instance")]
+    [FhirType("InventoryItem.instance", IsBackboneType=true)]
     public partial class InstanceComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "InventoryItem#Instance"; } }
+      public override string TypeName { get { return "InventoryItem.instance"; } }
 
       /// <summary>
       /// The identifier for the physical instance, typically a serial number
diff --git a/src/Hl7.Fhir.R5/Model/Generated/InventoryReport.cs b/src/Hl7.Fhir.R5/Model/Generated/InventoryReport.cs
index fe2edd4af5..da86476d9c 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/InventoryReport.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/InventoryReport.cs
@@ -117,14 +117,13 @@ public enum InventoryCountType
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("InventoryReport#InventoryListing")]
-    [BackboneType("InventoryReport.inventoryListing")]
+    [FhirType("InventoryReport.inventoryListing", IsBackboneType=true)]
     public partial class InventoryListingComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "InventoryReport#InventoryListing"; } }
+      public override string TypeName { get { return "InventoryReport.inventoryListing"; } }
 
       /// <summary>
       /// Location of the inventory items
@@ -336,14 +335,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("InventoryReport#Item")]
-    [BackboneType("InventoryReport.inventoryListing.item")]
+    [FhirType("InventoryReport.inventoryListing.item", IsBackboneType=true)]
     public partial class ItemComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "InventoryReport#Item"; } }
+      public override string TypeName { get { return "InventoryReport.inventoryListing.item"; } }
 
       /// <summary>
       /// The inventory category or classification of the items being reported
diff --git a/src/Hl7.Fhir.R5/Model/Generated/Invoice.cs b/src/Hl7.Fhir.R5/Model/Generated/Invoice.cs
index 7b36525a22..31e5052d41 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/Invoice.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/Invoice.cs
@@ -107,14 +107,13 @@ public enum InvoiceStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Invoice#Participant")]
-    [BackboneType("Invoice.participant")]
+    [FhirType("Invoice.participant", IsBackboneType=true)]
     public partial class ParticipantComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Invoice#Participant"; } }
+      public override string TypeName { get { return "Invoice.participant"; } }
 
       /// <summary>
       /// Type of involvement in creation of this Invoice
@@ -261,14 +260,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Invoice#LineItem")]
-    [BackboneType("Invoice.lineItem")]
+    [FhirType("Invoice.lineItem", IsBackboneType=true)]
     public partial class LineItemComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Invoice#LineItem"; } }
+      public override string TypeName { get { return "Invoice.lineItem"; } }
 
       /// <summary>
       /// Sequence number of line item
diff --git a/src/Hl7.Fhir.R5/Model/Generated/Linkage.cs b/src/Hl7.Fhir.R5/Model/Generated/Linkage.cs
index edc6b976d1..30f42fd889 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/Linkage.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/Linkage.cs
@@ -95,14 +95,13 @@ public enum LinkageType
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Linkage#Item")]
-    [BackboneType("Linkage.item")]
+    [FhirType("Linkage.item", IsBackboneType=true)]
     public partial class ItemComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Linkage#Item"; } }
+      public override string TypeName { get { return "Linkage.item"; } }
 
       /// <summary>
       /// source | alternate | historical
diff --git a/src/Hl7.Fhir.R5/Model/Generated/List.cs b/src/Hl7.Fhir.R5/Model/Generated/List.cs
index 9461837628..3a22a84f32 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/List.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/List.cs
@@ -96,14 +96,13 @@ public enum ListStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("List#Entry")]
-    [BackboneType("List.entry")]
+    [FhirType("List.entry", IsBackboneType=true)]
     public partial class EntryComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "List#Entry"; } }
+      public override string TypeName { get { return "List.entry"; } }
 
       /// <summary>
       /// Status/Workflow information about this item
diff --git a/src/Hl7.Fhir.R5/Model/Generated/Location.cs b/src/Hl7.Fhir.R5/Model/Generated/Location.cs
index 1a65799a71..bcca17ac4a 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/Location.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/Location.cs
@@ -118,14 +118,13 @@ public enum LocationMode
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Location#Position")]
-    [BackboneType("Location.position")]
+    [FhirType("Location.position", IsBackboneType=true)]
     public partial class PositionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Location#Position"; } }
+      public override string TypeName { get { return "Location.position"; } }
 
       /// <summary>
       /// Longitude with WGS84 datum
diff --git a/src/Hl7.Fhir.R5/Model/Generated/ManufacturedItemDefinition.cs b/src/Hl7.Fhir.R5/Model/Generated/ManufacturedItemDefinition.cs
index 8999086d25..d8277a2ffd 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/ManufacturedItemDefinition.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/ManufacturedItemDefinition.cs
@@ -61,14 +61,13 @@ public partial class ManufacturedItemDefinition : Hl7.Fhir.Model.DomainResource,
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("ManufacturedItemDefinition#Property")]
-    [BackboneType("ManufacturedItemDefinition.property")]
+    [FhirType("ManufacturedItemDefinition.property", IsBackboneType=true)]
     public partial class PropertyComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ManufacturedItemDefinition#Property"; } }
+      public override string TypeName { get { return "ManufacturedItemDefinition.property"; } }
 
       /// <summary>
       /// A code expressing the type of characteristic
@@ -214,14 +213,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("ManufacturedItemDefinition#Component")]
-    [BackboneType("ManufacturedItemDefinition.component")]
+    [FhirType("ManufacturedItemDefinition.component", IsBackboneType=true)]
     public partial class ComponentComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ManufacturedItemDefinition#Component"; } }
+      public override string TypeName { get { return "ManufacturedItemDefinition.component"; } }
 
       /// <summary>
       /// Defining type of the component e.g. shell, layer, ink
@@ -468,14 +466,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("ManufacturedItemDefinition#Constituent")]
-    [BackboneType("ManufacturedItemDefinition.component.constituent")]
+    [FhirType("ManufacturedItemDefinition.component.constituent", IsBackboneType=true)]
     public partial class ConstituentComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ManufacturedItemDefinition#Constituent"; } }
+      public override string TypeName { get { return "ManufacturedItemDefinition.component.constituent"; } }
 
       /// <summary>
       /// The measurable amount of the substance, expressable in different ways (e.g. by mass or volume)
diff --git a/src/Hl7.Fhir.R5/Model/Generated/Measure.cs b/src/Hl7.Fhir.R5/Model/Generated/Measure.cs
index 9f2b567080..aaa2c33c57 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/Measure.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/Measure.cs
@@ -67,14 +67,13 @@ public partial class Measure : Hl7.Fhir.Model.DomainResource, IIdentifiable<List
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Measure#Term")]
-    [BackboneType("Measure.term")]
+    [FhirType("Measure.term", IsBackboneType=true)]
     public partial class TermComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Measure#Term"; } }
+      public override string TypeName { get { return "Measure.term"; } }
 
       /// <summary>
       /// What term?
@@ -237,14 +236,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Measure#Group")]
-    [BackboneType("Measure.group")]
+    [FhirType("Measure.group", IsBackboneType=true)]
     public partial class GroupComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Measure#Group"; } }
+      public override string TypeName { get { return "Measure.group"; } }
 
       /// <summary>
       /// Unique id for group in measure
@@ -768,14 +766,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Measure#Population")]
-    [BackboneType("Measure.group.population")]
+    [FhirType("Measure.group.population", IsBackboneType=true)]
     public partial class PopulationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Measure#Population"; } }
+      public override string TypeName { get { return "Measure.group.population"; } }
 
       /// <summary>
       /// Unique id for population in measure
@@ -1102,14 +1099,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Measure#Stratifier")]
-    [BackboneType("Measure.group.stratifier")]
+    [FhirType("Measure.group.stratifier", IsBackboneType=true)]
     public partial class StratifierComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Measure#Stratifier"; } }
+      public override string TypeName { get { return "Measure.group.stratifier"; } }
 
       /// <summary>
       /// Unique id for stratifier in measure
@@ -1394,14 +1390,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Measure#Component")]
-    [BackboneType("Measure.group.stratifier.component")]
+    [FhirType("Measure.group.stratifier.component", IsBackboneType=true)]
     public partial class ComponentComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Measure#Component"; } }
+      public override string TypeName { get { return "Measure.group.stratifier.component"; } }
 
       /// <summary>
       /// Unique id for stratifier component in measure
@@ -1660,14 +1655,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Measure#SupplementalData")]
-    [BackboneType("Measure.supplementalData")]
+    [FhirType("Measure.supplementalData", IsBackboneType=true)]
     public partial class SupplementalDataComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Measure#SupplementalData"; } }
+      public override string TypeName { get { return "Measure.supplementalData"; } }
 
       /// <summary>
       /// Unique id for supplementalData in measure
diff --git a/src/Hl7.Fhir.R5/Model/Generated/MeasureReport.cs b/src/Hl7.Fhir.R5/Model/Generated/MeasureReport.cs
index aec273badb..1b055bb0d8 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/MeasureReport.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/MeasureReport.cs
@@ -151,14 +151,13 @@ public enum SubmitDataUpdateType
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MeasureReport#Group")]
-    [BackboneType("MeasureReport.group")]
+    [FhirType("MeasureReport.group", IsBackboneType=true)]
     public partial class GroupComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MeasureReport#Group"; } }
+      public override string TypeName { get { return "MeasureReport.group"; } }
 
       /// <summary>
       /// Pointer to specific group from Measure
@@ -427,14 +426,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MeasureReport#Population")]
-    [BackboneType("MeasureReport.group.population")]
+    [FhirType("MeasureReport.group.population", IsBackboneType=true)]
     public partial class PopulationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MeasureReport#Population"; } }
+      public override string TypeName { get { return "MeasureReport.group.population"; } }
 
       /// <summary>
       /// Pointer to specific population from Measure
@@ -722,14 +720,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MeasureReport#Stratifier")]
-    [BackboneType("MeasureReport.group.stratifier")]
+    [FhirType("MeasureReport.group.stratifier", IsBackboneType=true)]
     public partial class StratifierComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MeasureReport#Stratifier"; } }
+      public override string TypeName { get { return "MeasureReport.group.stratifier"; } }
 
       /// <summary>
       /// Pointer to specific stratifier from Measure
@@ -918,14 +915,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MeasureReport#StratifierGroup")]
-    [BackboneType("MeasureReport.group.stratifier.stratum")]
+    [FhirType("MeasureReport.group.stratifier.stratum", IsBackboneType=true)]
     public partial class StratifierGroupComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MeasureReport#StratifierGroup"; } }
+      public override string TypeName { get { return "MeasureReport.group.stratifier.stratum"; } }
 
       /// <summary>
       /// The stratum value, e.g. male
@@ -1126,14 +1122,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MeasureReport#Component")]
-    [BackboneType("MeasureReport.group.stratifier.stratum.component")]
+    [FhirType("MeasureReport.group.stratifier.stratum.component", IsBackboneType=true)]
     public partial class ComponentComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MeasureReport#Component"; } }
+      public override string TypeName { get { return "MeasureReport.group.stratifier.stratum.component"; } }
 
       /// <summary>
       /// Pointer to specific stratifier component from Measure
@@ -1326,14 +1321,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MeasureReport#StratifierGroupPopulation")]
-    [BackboneType("MeasureReport.group.stratifier.stratum.population")]
+    [FhirType("MeasureReport.group.stratifier.stratum.population", IsBackboneType=true)]
     public partial class StratifierGroupPopulationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MeasureReport#StratifierGroupPopulation"; } }
+      public override string TypeName { get { return "MeasureReport.group.stratifier.stratum.population"; } }
 
       /// <summary>
       /// Pointer to specific population from Measure
diff --git a/src/Hl7.Fhir.R5/Model/Generated/Medication.cs b/src/Hl7.Fhir.R5/Model/Generated/Medication.cs
index 5ded0fb370..7248b00f03 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/Medication.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/Medication.cs
@@ -96,14 +96,13 @@ public enum MedicationStatusCodes
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Medication#Ingredient")]
-    [BackboneType("Medication.ingredient")]
+    [FhirType("Medication.ingredient", IsBackboneType=true)]
     public partial class IngredientComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Medication#Ingredient"; } }
+      public override string TypeName { get { return "Medication.ingredient"; } }
 
       /// <summary>
       /// The ingredient (substance or medication) that the ingredient.strength relates to
@@ -295,14 +294,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Medication#Batch")]
-    [BackboneType("Medication.batch")]
+    [FhirType("Medication.batch", IsBackboneType=true)]
     public partial class BatchComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Medication#Batch"; } }
+      public override string TypeName { get { return "Medication.batch"; } }
 
       /// <summary>
       /// Identifier assigned to batch
diff --git a/src/Hl7.Fhir.R5/Model/Generated/MedicationAdministration.cs b/src/Hl7.Fhir.R5/Model/Generated/MedicationAdministration.cs
index 1f12efd381..568ed75011 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/MedicationAdministration.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/MedicationAdministration.cs
@@ -119,14 +119,13 @@ public enum MedicationAdministrationStatusCodes
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationAdministration#Performer")]
-    [BackboneType("MedicationAdministration.performer")]
+    [FhirType("MedicationAdministration.performer", IsBackboneType=true)]
     public partial class PerformerComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MedicationAdministration#Performer"; } }
+      public override string TypeName { get { return "MedicationAdministration.performer"; } }
 
       /// <summary>
       /// Type of performance
@@ -272,14 +271,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationAdministration#Dosage")]
-    [BackboneType("MedicationAdministration.dosage")]
+    [FhirType("MedicationAdministration.dosage", IsBackboneType=true)]
     public partial class DosageComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MedicationAdministration#Dosage"; } }
+      public override string TypeName { get { return "MedicationAdministration.dosage"; } }
 
       /// <summary>
       /// Free text dosage instructions e.g. SIG
diff --git a/src/Hl7.Fhir.R5/Model/Generated/MedicationDispense.cs b/src/Hl7.Fhir.R5/Model/Generated/MedicationDispense.cs
index 1382da5988..170cfbca7b 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/MedicationDispense.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/MedicationDispense.cs
@@ -131,14 +131,13 @@ public enum MedicationDispenseStatusCodes
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationDispense#Performer")]
-    [BackboneType("MedicationDispense.performer")]
+    [FhirType("MedicationDispense.performer", IsBackboneType=true)]
     public partial class PerformerComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MedicationDispense#Performer"; } }
+      public override string TypeName { get { return "MedicationDispense.performer"; } }
 
       /// <summary>
       /// Who performed the dispense and what they did
@@ -286,14 +285,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationDispense#Substitution")]
-    [BackboneType("MedicationDispense.substitution")]
+    [FhirType("MedicationDispense.substitution", IsBackboneType=true)]
     public partial class SubstitutionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MedicationDispense#Substitution"; } }
+      public override string TypeName { get { return "MedicationDispense.substitution"; } }
 
       /// <summary>
       /// Whether a substitution was or was not performed on the dispense
diff --git a/src/Hl7.Fhir.R5/Model/Generated/MedicationKnowledge.cs b/src/Hl7.Fhir.R5/Model/Generated/MedicationKnowledge.cs
index 2d1df6a5db..9c6c633ae8 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/MedicationKnowledge.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/MedicationKnowledge.cs
@@ -95,14 +95,13 @@ public enum MedicationKnowledgeStatusCodes
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationKnowledge#RelatedMedicationKnowledge")]
-    [BackboneType("MedicationKnowledge.relatedMedicationKnowledge")]
+    [FhirType("MedicationKnowledge.relatedMedicationKnowledge", IsBackboneType=true)]
     public partial class RelatedMedicationKnowledgeComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MedicationKnowledge#RelatedMedicationKnowledge"; } }
+      public override string TypeName { get { return "MedicationKnowledge.relatedMedicationKnowledge"; } }
 
       /// <summary>
       /// Category of medicationKnowledge
@@ -247,14 +246,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationKnowledge#Monograph")]
-    [BackboneType("MedicationKnowledge.monograph")]
+    [FhirType("MedicationKnowledge.monograph", IsBackboneType=true)]
     public partial class MonographComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MedicationKnowledge#Monograph"; } }
+      public override string TypeName { get { return "MedicationKnowledge.monograph"; } }
 
       /// <summary>
       /// The category of medication document
@@ -400,14 +398,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationKnowledge#Cost")]
-    [BackboneType("MedicationKnowledge.cost")]
+    [FhirType("MedicationKnowledge.cost", IsBackboneType=true)]
     public partial class CostComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MedicationKnowledge#Cost"; } }
+      public override string TypeName { get { return "MedicationKnowledge.cost"; } }
 
       /// <summary>
       /// The date range for which the cost is effective
@@ -625,14 +622,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationKnowledge#MonitoringProgram")]
-    [BackboneType("MedicationKnowledge.monitoringProgram")]
+    [FhirType("MedicationKnowledge.monitoringProgram", IsBackboneType=true)]
     public partial class MonitoringProgramComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MedicationKnowledge#MonitoringProgram"; } }
+      public override string TypeName { get { return "MedicationKnowledge.monitoringProgram"; } }
 
       /// <summary>
       /// Type of program under which the medication is monitored
@@ -794,14 +790,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationKnowledge#IndicationGuideline")]
-    [BackboneType("MedicationKnowledge.indicationGuideline")]
+    [FhirType("MedicationKnowledge.indicationGuideline", IsBackboneType=true)]
     public partial class IndicationGuidelineComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MedicationKnowledge#IndicationGuideline"; } }
+      public override string TypeName { get { return "MedicationKnowledge.indicationGuideline"; } }
 
       /// <summary>
       /// Indication for use that applies to the specific administration guideline
@@ -947,14 +942,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationKnowledge#DosingGuideline")]
-    [BackboneType("MedicationKnowledge.indicationGuideline.dosingGuideline")]
+    [FhirType("MedicationKnowledge.indicationGuideline.dosingGuideline", IsBackboneType=true)]
     public partial class DosingGuidelineComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MedicationKnowledge#DosingGuideline"; } }
+      public override string TypeName { get { return "MedicationKnowledge.indicationGuideline.dosingGuideline"; } }
 
       /// <summary>
       /// Intention of the treatment
@@ -1147,14 +1141,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationKnowledge#Dosage")]
-    [BackboneType("MedicationKnowledge.indicationGuideline.dosingGuideline.dosage")]
+    [FhirType("MedicationKnowledge.indicationGuideline.dosingGuideline.dosage", IsBackboneType=true)]
     public partial class DosageComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MedicationKnowledge#Dosage"; } }
+      public override string TypeName { get { return "MedicationKnowledge.indicationGuideline.dosingGuideline.dosage"; } }
 
       /// <summary>
       /// Category of dosage for a medication
@@ -1300,14 +1293,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationKnowledge#PatientCharacteristic")]
-    [BackboneType("MedicationKnowledge.indicationGuideline.dosingGuideline.patientCharacteristic")]
+    [FhirType("MedicationKnowledge.indicationGuideline.dosingGuideline.patientCharacteristic", IsBackboneType=true)]
     public partial class PatientCharacteristicComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MedicationKnowledge#PatientCharacteristic"; } }
+      public override string TypeName { get { return "MedicationKnowledge.indicationGuideline.dosingGuideline.patientCharacteristic"; } }
 
       /// <summary>
       /// Categorization of specific characteristic that is relevant to the administration guideline
@@ -1451,14 +1443,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationKnowledge#MedicineClassification")]
-    [BackboneType("MedicationKnowledge.medicineClassification")]
+    [FhirType("MedicationKnowledge.medicineClassification", IsBackboneType=true)]
     public partial class MedicineClassificationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MedicationKnowledge#MedicineClassification"; } }
+      public override string TypeName { get { return "MedicationKnowledge.medicineClassification"; } }
 
       /// <summary>
       /// The type of category for the medication (for example, therapeutic classification, therapeutic sub-classification)
@@ -1631,14 +1622,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationKnowledge#Packaging")]
-    [BackboneType("MedicationKnowledge.packaging")]
+    [FhirType("MedicationKnowledge.packaging", IsBackboneType=true)]
     public partial class PackagingComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MedicationKnowledge#Packaging"; } }
+      public override string TypeName { get { return "MedicationKnowledge.packaging"; } }
 
       /// <summary>
       /// Cost of the packaged medication
@@ -1785,14 +1775,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationKnowledge#StorageGuideline")]
-    [BackboneType("MedicationKnowledge.storageGuideline")]
+    [FhirType("MedicationKnowledge.storageGuideline", IsBackboneType=true)]
     public partial class StorageGuidelineComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MedicationKnowledge#StorageGuideline"; } }
+      public override string TypeName { get { return "MedicationKnowledge.storageGuideline"; } }
 
       /// <summary>
       /// Reference to additional information
@@ -2006,14 +1995,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationKnowledge#EnvironmentalSetting")]
-    [BackboneType("MedicationKnowledge.storageGuideline.environmentalSetting")]
+    [FhirType("MedicationKnowledge.storageGuideline.environmentalSetting", IsBackboneType=true)]
     public partial class EnvironmentalSettingComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MedicationKnowledge#EnvironmentalSetting"; } }
+      public override string TypeName { get { return "MedicationKnowledge.storageGuideline.environmentalSetting"; } }
 
       /// <summary>
       /// Categorization of the setting
@@ -2158,14 +2146,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationKnowledge#Regulatory")]
-    [BackboneType("MedicationKnowledge.regulatory")]
+    [FhirType("MedicationKnowledge.regulatory", IsBackboneType=true)]
     public partial class RegulatoryComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MedicationKnowledge#Regulatory"; } }
+      public override string TypeName { get { return "MedicationKnowledge.regulatory"; } }
 
       /// <summary>
       /// Specifies the authority of the regulation
@@ -2361,14 +2348,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationKnowledge#Substitution")]
-    [BackboneType("MedicationKnowledge.regulatory.substitution")]
+    [FhirType("MedicationKnowledge.regulatory.substitution", IsBackboneType=true)]
     public partial class SubstitutionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MedicationKnowledge#Substitution"; } }
+      public override string TypeName { get { return "MedicationKnowledge.regulatory.substitution"; } }
 
       /// <summary>
       /// Specifies the type of substitution allowed
@@ -2529,14 +2515,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationKnowledge#MaxDispense")]
-    [BackboneType("MedicationKnowledge.regulatory.maxDispense")]
+    [FhirType("MedicationKnowledge.regulatory.maxDispense", IsBackboneType=true)]
     public partial class MaxDispenseComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MedicationKnowledge#MaxDispense"; } }
+      public override string TypeName { get { return "MedicationKnowledge.regulatory.maxDispense"; } }
 
       /// <summary>
       /// The maximum number of units of the medication that can be dispensed
@@ -2681,14 +2666,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationKnowledge#Definitional")]
-    [BackboneType("MedicationKnowledge.definitional")]
+    [FhirType("MedicationKnowledge.definitional", IsBackboneType=true)]
     public partial class DefinitionalComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MedicationKnowledge#Definitional"; } }
+      public override string TypeName { get { return "MedicationKnowledge.definitional"; } }
 
       /// <summary>
       /// Definitional resources that provide more information about this medication
@@ -2915,14 +2899,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationKnowledge#Ingredient")]
-    [BackboneType("MedicationKnowledge.definitional.ingredient")]
+    [FhirType("MedicationKnowledge.definitional.ingredient", IsBackboneType=true)]
     public partial class IngredientComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MedicationKnowledge#Ingredient"; } }
+      public override string TypeName { get { return "MedicationKnowledge.definitional.ingredient"; } }
 
       /// <summary>
       /// Substances contained in the medication
@@ -3096,14 +3079,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationKnowledge#DrugCharacteristic")]
-    [BackboneType("MedicationKnowledge.definitional.drugCharacteristic")]
+    [FhirType("MedicationKnowledge.definitional.drugCharacteristic", IsBackboneType=true)]
     public partial class DrugCharacteristicComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MedicationKnowledge#DrugCharacteristic"; } }
+      public override string TypeName { get { return "MedicationKnowledge.definitional.drugCharacteristic"; } }
 
       /// <summary>
       /// Code specifying the type of characteristic of medication
diff --git a/src/Hl7.Fhir.R5/Model/Generated/MedicationRequest.cs b/src/Hl7.Fhir.R5/Model/Generated/MedicationRequest.cs
index 87b56d389c..9e8253c1f1 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/MedicationRequest.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/MedicationRequest.cs
@@ -189,14 +189,13 @@ public enum MedicationRequestIntent
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationRequest#DispenseRequest")]
-    [BackboneType("MedicationRequest.dispenseRequest")]
+    [FhirType("MedicationRequest.dispenseRequest", IsBackboneType=true)]
     public partial class DispenseRequestComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MedicationRequest#DispenseRequest"; } }
+      public override string TypeName { get { return "MedicationRequest.dispenseRequest"; } }
 
       /// <summary>
       /// First fill details
@@ -538,14 +537,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationRequest#InitialFill")]
-    [BackboneType("MedicationRequest.dispenseRequest.initialFill")]
+    [FhirType("MedicationRequest.dispenseRequest.initialFill", IsBackboneType=true)]
     public partial class InitialFillComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MedicationRequest#InitialFill"; } }
+      public override string TypeName { get { return "MedicationRequest.dispenseRequest.initialFill"; } }
 
       /// <summary>
       /// First fill quantity
@@ -689,14 +687,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationRequest#Substitution")]
-    [BackboneType("MedicationRequest.substitution")]
+    [FhirType("MedicationRequest.substitution", IsBackboneType=true)]
     public partial class SubstitutionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MedicationRequest#Substitution"; } }
+      public override string TypeName { get { return "MedicationRequest.substitution"; } }
 
       /// <summary>
       /// Whether substitution is allowed or not
diff --git a/src/Hl7.Fhir.R5/Model/Generated/MedicationStatement.cs b/src/Hl7.Fhir.R5/Model/Generated/MedicationStatement.cs
index 7bad0808b1..c4ec09019b 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/MedicationStatement.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/MedicationStatement.cs
@@ -97,14 +97,13 @@ public enum MedicationStatementStatusCodes
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationStatement#Adherence")]
-    [BackboneType("MedicationStatement.adherence")]
+    [FhirType("MedicationStatement.adherence", IsBackboneType=true)]
     public partial class AdherenceComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MedicationStatement#Adherence"; } }
+      public override string TypeName { get { return "MedicationStatement.adherence"; } }
 
       /// <summary>
       /// Type of adherence
diff --git a/src/Hl7.Fhir.R5/Model/Generated/MedicinalProductDefinition.cs b/src/Hl7.Fhir.R5/Model/Generated/MedicinalProductDefinition.cs
index f6c09098d5..286873e849 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/MedicinalProductDefinition.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/MedicinalProductDefinition.cs
@@ -64,14 +64,13 @@ public partial class MedicinalProductDefinition : Hl7.Fhir.Model.DomainResource,
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("MedicinalProductDefinition#Contact")]
-    [BackboneType("MedicinalProductDefinition.contact")]
+    [FhirType("MedicinalProductDefinition.contact", IsBackboneType=true)]
     public partial class ContactComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MedicinalProductDefinition#Contact"; } }
+      public override string TypeName { get { return "MedicinalProductDefinition.contact"; } }
 
       /// <summary>
       /// Allows the contact to be classified, for example QPPV, Pharmacovigilance Enquiry Information
@@ -216,14 +215,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("MedicinalProductDefinition#Name")]
-    [BackboneType("MedicinalProductDefinition.name")]
+    [FhirType("MedicinalProductDefinition.name", IsBackboneType=true)]
     public partial class NameComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MedicinalProductDefinition#Name"; } }
+      public override string TypeName { get { return "MedicinalProductDefinition.name"; } }
 
       /// <summary>
       /// The full product name
@@ -436,14 +434,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("MedicinalProductDefinition#Part")]
-    [BackboneType("MedicinalProductDefinition.name.part")]
+    [FhirType("MedicinalProductDefinition.name.part", IsBackboneType=true)]
     public partial class PartComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MedicinalProductDefinition#Part"; } }
+      public override string TypeName { get { return "MedicinalProductDefinition.name.part"; } }
 
       /// <summary>
       /// A fragment of a product name
@@ -608,14 +605,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MedicinalProductDefinition#Usage")]
-    [BackboneType("MedicinalProductDefinition.name.usage")]
+    [FhirType("MedicinalProductDefinition.name.usage", IsBackboneType=true)]
     public partial class UsageComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MedicinalProductDefinition#Usage"; } }
+      public override string TypeName { get { return "MedicinalProductDefinition.name.usage"; } }
 
       /// <summary>
       /// Country code for where this name applies
@@ -789,14 +785,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MedicinalProductDefinition#CrossReference")]
-    [BackboneType("MedicinalProductDefinition.crossReference")]
+    [FhirType("MedicinalProductDefinition.crossReference", IsBackboneType=true)]
     public partial class CrossReferenceComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MedicinalProductDefinition#CrossReference"; } }
+      public override string TypeName { get { return "MedicinalProductDefinition.crossReference"; } }
 
       /// <summary>
       /// Reference to another product, e.g. for linking authorised to investigational product
@@ -942,14 +937,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MedicinalProductDefinition#Operation")]
-    [BackboneType("MedicinalProductDefinition.operation")]
+    [FhirType("MedicinalProductDefinition.operation", IsBackboneType=true)]
     public partial class OperationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MedicinalProductDefinition#Operation"; } }
+      public override string TypeName { get { return "MedicinalProductDefinition.operation"; } }
 
       /// <summary>
       /// The type of manufacturing operation e.g. manufacturing itself, re-packaging
@@ -1147,14 +1141,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MedicinalProductDefinition#Characteristic")]
-    [BackboneType("MedicinalProductDefinition.characteristic")]
+    [FhirType("MedicinalProductDefinition.characteristic", IsBackboneType=true)]
     public partial class CharacteristicComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MedicinalProductDefinition#Characteristic"; } }
+      public override string TypeName { get { return "MedicinalProductDefinition.characteristic"; } }
 
       /// <summary>
       /// A code expressing the type of characteristic
diff --git a/src/Hl7.Fhir.R5/Model/Generated/MessageDefinition.cs b/src/Hl7.Fhir.R5/Model/Generated/MessageDefinition.cs
index de985a3a5b..5ef560d330 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/MessageDefinition.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/MessageDefinition.cs
@@ -130,14 +130,13 @@ public enum MessageheaderResponseRequest
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MessageDefinition#Focus")]
-    [BackboneType("MessageDefinition.focus")]
+    [FhirType("MessageDefinition.focus", IsBackboneType=true)]
     public partial class FocusComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MessageDefinition#Focus"; } }
+      public override string TypeName { get { return "MessageDefinition.focus"; } }
 
       /// <summary>
       /// Type of resource
@@ -408,14 +407,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MessageDefinition#AllowedResponse")]
-    [BackboneType("MessageDefinition.allowedResponse")]
+    [FhirType("MessageDefinition.allowedResponse", IsBackboneType=true)]
     public partial class AllowedResponseComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MessageDefinition#AllowedResponse"; } }
+      public override string TypeName { get { return "MessageDefinition.allowedResponse"; } }
 
       /// <summary>
       /// Reference to allowed message definition response
diff --git a/src/Hl7.Fhir.R5/Model/Generated/MessageHeader.cs b/src/Hl7.Fhir.R5/Model/Generated/MessageHeader.cs
index 2cd1a96938..9fcf1a2558 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/MessageHeader.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/MessageHeader.cs
@@ -96,14 +96,13 @@ public enum ResponseType
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MessageHeader#MessageDestination")]
-    [BackboneType("MessageHeader.destination")]
+    [FhirType("MessageHeader.destination", IsBackboneType=true)]
     public partial class MessageDestinationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MessageHeader#MessageDestination"; } }
+      public override string TypeName { get { return "MessageHeader.destination"; } }
 
       /// <summary>
       /// Actual destination address or Endpoint resource
@@ -322,14 +321,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MessageHeader#MessageSource")]
-    [BackboneType("MessageHeader.source")]
+    [FhirType("MessageHeader.source", IsBackboneType=true)]
     public partial class MessageSourceComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MessageHeader#MessageSource"; } }
+      public override string TypeName { get { return "MessageHeader.source"; } }
 
       /// <summary>
       /// Actual source address or Endpoint resource
@@ -605,14 +603,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MessageHeader#Response")]
-    [BackboneType("MessageHeader.response")]
+    [FhirType("MessageHeader.response", IsBackboneType=true)]
     public partial class ResponseComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MessageHeader#Response"; } }
+      public override string TypeName { get { return "MessageHeader.response"; } }
 
       /// <summary>
       /// Bundle.identifier of original message
diff --git a/src/Hl7.Fhir.R5/Model/Generated/MolecularSequence.cs b/src/Hl7.Fhir.R5/Model/Generated/MolecularSequence.cs
index 5e0cd88563..40da909e00 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/MolecularSequence.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/MolecularSequence.cs
@@ -133,14 +133,13 @@ public enum StrandType
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("MolecularSequence#Relative")]
-    [BackboneType("MolecularSequence.relative")]
+    [FhirType("MolecularSequence.relative", IsBackboneType=true)]
     public partial class RelativeComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MolecularSequence#Relative"; } }
+      public override string TypeName { get { return "MolecularSequence.relative"; } }
 
       /// <summary>
       /// Ways of identifying nucleotides or amino acids within a sequence
@@ -380,14 +379,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MolecularSequence#StartingSequence")]
-    [BackboneType("MolecularSequence.relative.startingSequence")]
+    [FhirType("MolecularSequence.relative.startingSequence", IsBackboneType=true)]
     public partial class StartingSequenceComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MolecularSequence#StartingSequence"; } }
+      public override string TypeName { get { return "MolecularSequence.relative.startingSequence"; } }
 
       /// <summary>
       /// The genome assembly used for starting sequence, e.g. GRCh38
@@ -735,14 +733,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("MolecularSequence#Edit")]
-    [BackboneType("MolecularSequence.relative.edit")]
+    [FhirType("MolecularSequence.relative.edit", IsBackboneType=true)]
     public partial class EditComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MolecularSequence#Edit"; } }
+      public override string TypeName { get { return "MolecularSequence.relative.edit"; } }
 
       /// <summary>
       /// Start position of the edit on the starting sequence
diff --git a/src/Hl7.Fhir.R5/Model/Generated/NamingSystem.cs b/src/Hl7.Fhir.R5/Model/Generated/NamingSystem.cs
index 21739e7f11..caf5978002 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/NamingSystem.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/NamingSystem.cs
@@ -142,14 +142,13 @@ public enum NamingSystemIdentifierType
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("NamingSystem#UniqueId")]
-    [BackboneType("NamingSystem.uniqueId")]
+    [FhirType("NamingSystem.uniqueId", IsBackboneType=true)]
     public partial class UniqueIdComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "NamingSystem#UniqueId"; } }
+      public override string TypeName { get { return "NamingSystem.uniqueId"; } }
 
       /// <summary>
       /// oid | uuid | uri | iri-stem | v2csmnemonic | other
diff --git a/src/Hl7.Fhir.R5/Model/Generated/NutritionIntake.cs b/src/Hl7.Fhir.R5/Model/Generated/NutritionIntake.cs
index 8a2218362b..7073179e53 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/NutritionIntake.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/NutritionIntake.cs
@@ -64,14 +64,13 @@ public partial class NutritionIntake : Hl7.Fhir.Model.DomainResource, IIdentifia
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("NutritionIntake#ConsumedItem")]
-    [BackboneType("NutritionIntake.consumedItem")]
+    [FhirType("NutritionIntake.consumedItem", IsBackboneType=true)]
     public partial class ConsumedItemComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "NutritionIntake#ConsumedItem"; } }
+      public override string TypeName { get { return "NutritionIntake.consumedItem"; } }
 
       /// <summary>
       /// The type of food or fluid product
@@ -364,14 +363,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("NutritionIntake#IngredientLabel")]
-    [BackboneType("NutritionIntake.ingredientLabel")]
+    [FhirType("NutritionIntake.ingredientLabel", IsBackboneType=true)]
     public partial class IngredientLabelComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "NutritionIntake#IngredientLabel"; } }
+      public override string TypeName { get { return "NutritionIntake.ingredientLabel"; } }
 
       /// <summary>
       /// Total nutrient consumed
@@ -518,14 +516,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("NutritionIntake#Performer")]
-    [BackboneType("NutritionIntake.performer")]
+    [FhirType("NutritionIntake.performer", IsBackboneType=true)]
     public partial class PerformerComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "NutritionIntake#Performer"; } }
+      public override string TypeName { get { return "NutritionIntake.performer"; } }
 
       /// <summary>
       /// Type of performer
diff --git a/src/Hl7.Fhir.R5/Model/Generated/NutritionOrder.cs b/src/Hl7.Fhir.R5/Model/Generated/NutritionOrder.cs
index 478f620285..97a2ddc3aa 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/NutritionOrder.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/NutritionOrder.cs
@@ -68,14 +68,13 @@ public partial class NutritionOrder : Hl7.Fhir.Model.DomainResource, IIdentifiab
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("NutritionOrder#OralDiet")]
-    [BackboneType("NutritionOrder.oralDiet")]
+    [FhirType("NutritionOrder.oralDiet", IsBackboneType=true)]
     public partial class OralDietComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "NutritionOrder#OralDiet"; } }
+      public override string TypeName { get { return "NutritionOrder.oralDiet"; } }
 
       /// <summary>
       /// Type of oral diet or diet restrictions that describe what can be consumed orally
@@ -343,14 +342,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("NutritionOrder#OralDietSchedule")]
-    [BackboneType("NutritionOrder.oralDiet.schedule")]
+    [FhirType("NutritionOrder.oralDiet.schedule", IsBackboneType=true)]
     public partial class OralDietScheduleComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "NutritionOrder#OralDietSchedule"; } }
+      public override string TypeName { get { return "NutritionOrder.oralDiet.schedule"; } }
 
       /// <summary>
       /// Scheduled frequency of diet
@@ -539,14 +537,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("NutritionOrder#Nutrient")]
-    [BackboneType("NutritionOrder.oralDiet.nutrient")]
+    [FhirType("NutritionOrder.oralDiet.nutrient", IsBackboneType=true)]
     public partial class NutrientComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "NutritionOrder#Nutrient"; } }
+      public override string TypeName { get { return "NutritionOrder.oralDiet.nutrient"; } }
 
       /// <summary>
       /// Type of nutrient that is being modified
@@ -691,14 +688,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("NutritionOrder#Texture")]
-    [BackboneType("NutritionOrder.oralDiet.texture")]
+    [FhirType("NutritionOrder.oralDiet.texture", IsBackboneType=true)]
     public partial class TextureComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "NutritionOrder#Texture"; } }
+      public override string TypeName { get { return "NutritionOrder.oralDiet.texture"; } }
 
       /// <summary>
       /// Code to indicate how to alter the texture of the foods, e.g. pureed
@@ -844,14 +840,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("NutritionOrder#Supplement")]
-    [BackboneType("NutritionOrder.supplement")]
+    [FhirType("NutritionOrder.supplement", IsBackboneType=true)]
     public partial class SupplementComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "NutritionOrder#Supplement"; } }
+      public override string TypeName { get { return "NutritionOrder.supplement"; } }
 
       /// <summary>
       /// Type of supplement product requested
@@ -1107,14 +1102,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("NutritionOrder#SupplementSchedule")]
-    [BackboneType("NutritionOrder.supplement.schedule")]
+    [FhirType("NutritionOrder.supplement.schedule", IsBackboneType=true)]
     public partial class SupplementScheduleComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "NutritionOrder#SupplementSchedule"; } }
+      public override string TypeName { get { return "NutritionOrder.supplement.schedule"; } }
 
       /// <summary>
       /// Scheduled frequency of diet
@@ -1303,14 +1297,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("NutritionOrder#EnteralFormula")]
-    [BackboneType("NutritionOrder.enteralFormula")]
+    [FhirType("NutritionOrder.enteralFormula", IsBackboneType=true)]
     public partial class EnteralFormulaComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "NutritionOrder#EnteralFormula"; } }
+      public override string TypeName { get { return "NutritionOrder.enteralFormula"; } }
 
       /// <summary>
       /// Type of enteral or infant formula
@@ -1670,14 +1663,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("NutritionOrder#Additive")]
-    [BackboneType("NutritionOrder.enteralFormula.additive")]
+    [FhirType("NutritionOrder.enteralFormula.additive", IsBackboneType=true)]
     public partial class AdditiveComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "NutritionOrder#Additive"; } }
+      public override string TypeName { get { return "NutritionOrder.enteralFormula.additive"; } }
 
       /// <summary>
       /// Type of modular component to add to the feeding
@@ -1866,14 +1858,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("NutritionOrder#Administration")]
-    [BackboneType("NutritionOrder.enteralFormula.administration")]
+    [FhirType("NutritionOrder.enteralFormula.administration", IsBackboneType=true)]
     public partial class AdministrationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "NutritionOrder#Administration"; } }
+      public override string TypeName { get { return "NutritionOrder.enteralFormula.administration"; } }
 
       /// <summary>
       /// Scheduling information for enteral formula products
@@ -2044,14 +2035,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("NutritionOrder#EnteralFormulaSchedule")]
-    [BackboneType("NutritionOrder.enteralFormula.administration.schedule")]
+    [FhirType("NutritionOrder.enteralFormula.administration.schedule", IsBackboneType=true)]
     public partial class EnteralFormulaScheduleComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "NutritionOrder#EnteralFormulaSchedule"; } }
+      public override string TypeName { get { return "NutritionOrder.enteralFormula.administration.schedule"; } }
 
       /// <summary>
       /// Scheduled frequency of enteral formula
diff --git a/src/Hl7.Fhir.R5/Model/Generated/NutritionProduct.cs b/src/Hl7.Fhir.R5/Model/Generated/NutritionProduct.cs
index 5a4dd56bf6..f17d8647e6 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/NutritionProduct.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/NutritionProduct.cs
@@ -95,14 +95,13 @@ public enum NutritionProductStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("NutritionProduct#Nutrient")]
-    [BackboneType("NutritionProduct.nutrient")]
+    [FhirType("NutritionProduct.nutrient", IsBackboneType=true)]
     public partial class NutrientComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "NutritionProduct#Nutrient"; } }
+      public override string TypeName { get { return "NutritionProduct.nutrient"; } }
 
       /// <summary>
       /// The (relevant) nutrients in the product
@@ -245,14 +244,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("NutritionProduct#Ingredient")]
-    [BackboneType("NutritionProduct.ingredient")]
+    [FhirType("NutritionProduct.ingredient", IsBackboneType=true)]
     public partial class IngredientComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "NutritionProduct#Ingredient"; } }
+      public override string TypeName { get { return "NutritionProduct.ingredient"; } }
 
       /// <summary>
       /// The ingredient contained in the product
@@ -395,14 +393,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("NutritionProduct#Characteristic")]
-    [BackboneType("NutritionProduct.characteristic")]
+    [FhirType("NutritionProduct.characteristic", IsBackboneType=true)]
     public partial class CharacteristicComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "NutritionProduct#Characteristic"; } }
+      public override string TypeName { get { return "NutritionProduct.characteristic"; } }
 
       /// <summary>
       /// Code specifying the type of characteristic
@@ -551,14 +548,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("NutritionProduct#Instance")]
-    [BackboneType("NutritionProduct.instance")]
+    [FhirType("NutritionProduct.instance", IsBackboneType=true)]
     public partial class InstanceComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "NutritionProduct#Instance"; } }
+      public override string TypeName { get { return "NutritionProduct.instance"; } }
 
       /// <summary>
       /// The amount of items or instances
diff --git a/src/Hl7.Fhir.R5/Model/Generated/Observation.cs b/src/Hl7.Fhir.R5/Model/Generated/Observation.cs
index c8d306ade7..12e5adb9da 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/Observation.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/Observation.cs
@@ -96,14 +96,13 @@ public enum TriggeredBytype
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Observation#TriggeredBy")]
-    [BackboneType("Observation.triggeredBy")]
+    [FhirType("Observation.triggeredBy", IsBackboneType=true)]
     public partial class TriggeredByComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Observation#TriggeredBy"; } }
+      public override string TypeName { get { return "Observation.triggeredBy"; } }
 
       /// <summary>
       /// Triggering observation
@@ -315,14 +314,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Observation#ReferenceRange")]
-    [BackboneType("Observation.referenceRange")]
+    [FhirType("Observation.referenceRange", IsBackboneType=true)]
     public partial class ReferenceRangeComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Observation#ReferenceRange"; } }
+      public override string TypeName { get { return "Observation.referenceRange"; } }
 
       /// <summary>
       /// Low Range, if relevant
@@ -614,14 +612,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Observation#Component")]
-    [BackboneType("Observation.component")]
+    [FhirType("Observation.component", IsBackboneType=true)]
     public partial class ComponentComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Observation#Component"; } }
+      public override string TypeName { get { return "Observation.component"; } }
 
       /// <summary>
       /// Type of component observation (code / type)
diff --git a/src/Hl7.Fhir.R5/Model/Generated/ObservationDefinition.cs b/src/Hl7.Fhir.R5/Model/Generated/ObservationDefinition.cs
index 6603ec62ab..df7e5eed1d 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/ObservationDefinition.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/ObservationDefinition.cs
@@ -172,14 +172,13 @@ public enum ObservationRangeCategory
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ObservationDefinition#QualifiedValue")]
-    [BackboneType("ObservationDefinition.qualifiedValue")]
+    [FhirType("ObservationDefinition.qualifiedValue", IsBackboneType=true)]
     public partial class QualifiedValueComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ObservationDefinition#QualifiedValue"; } }
+      public override string TypeName { get { return "ObservationDefinition.qualifiedValue"; } }
 
       /// <summary>
       /// Context qualifier for the set of qualified values
@@ -706,14 +705,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ObservationDefinition#Component")]
-    [BackboneType("ObservationDefinition.component")]
+    [FhirType("ObservationDefinition.component", IsBackboneType=true)]
     public partial class ComponentComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ObservationDefinition#Component"; } }
+      public override string TypeName { get { return "ObservationDefinition.component"; } }
 
       /// <summary>
       /// Type of observation
diff --git a/src/Hl7.Fhir.R5/Model/Generated/OperationDefinition.cs b/src/Hl7.Fhir.R5/Model/Generated/OperationDefinition.cs
index 376f53e23f..2353efce2c 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/OperationDefinition.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/OperationDefinition.cs
@@ -118,14 +118,13 @@ public enum OperationParameterScope
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("OperationDefinition#Parameter")]
-    [BackboneType("OperationDefinition.parameter")]
+    [FhirType("OperationDefinition.parameter", IsBackboneType=true)]
     public partial class ParameterComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "OperationDefinition#Parameter"; } }
+      public override string TypeName { get { return "OperationDefinition.parameter"; } }
 
       /// <summary>
       /// Name in Parameters.parameter.name or in URL
@@ -743,14 +742,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("OperationDefinition#Binding")]
-    [BackboneType("OperationDefinition.parameter.binding")]
+    [FhirType("OperationDefinition.parameter.binding", IsBackboneType=true)]
     public partial class BindingComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "OperationDefinition#Binding"; } }
+      public override string TypeName { get { return "OperationDefinition.parameter.binding"; } }
 
       /// <summary>
       /// required | extensible | preferred | example
@@ -935,14 +933,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("OperationDefinition#ReferencedFrom")]
-    [BackboneType("OperationDefinition.parameter.referencedFrom")]
+    [FhirType("OperationDefinition.parameter.referencedFrom", IsBackboneType=true)]
     public partial class ReferencedFromComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "OperationDefinition#ReferencedFrom"; } }
+      public override string TypeName { get { return "OperationDefinition.parameter.referencedFrom"; } }
 
       /// <summary>
       /// Referencing parameter
@@ -1124,14 +1121,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("OperationDefinition#Overload")]
-    [BackboneType("OperationDefinition.overload")]
+    [FhirType("OperationDefinition.overload", IsBackboneType=true)]
     public partial class OverloadComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "OperationDefinition#Overload"; } }
+      public override string TypeName { get { return "OperationDefinition.overload"; } }
 
       /// <summary>
       /// Name of parameter to include in overload
diff --git a/src/Hl7.Fhir.R5/Model/Generated/Organization.cs b/src/Hl7.Fhir.R5/Model/Generated/Organization.cs
index f310821423..77e23eb271 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/Organization.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/Organization.cs
@@ -68,14 +68,13 @@ public partial class Organization : Hl7.Fhir.Model.DomainResource, IIdentifiable
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Organization#Qualification")]
-    [BackboneType("Organization.qualification")]
+    [FhirType("Organization.qualification", IsBackboneType=true)]
     public partial class QualificationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Organization#Qualification"; } }
+      public override string TypeName { get { return "Organization.qualification"; } }
 
       /// <summary>
       /// An identifier for this qualification for the organization
diff --git a/src/Hl7.Fhir.R5/Model/Generated/PackagedProductDefinition.cs b/src/Hl7.Fhir.R5/Model/Generated/PackagedProductDefinition.cs
index dfe75850f7..b84e4e6ed3 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/PackagedProductDefinition.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/PackagedProductDefinition.cs
@@ -61,14 +61,13 @@ public partial class PackagedProductDefinition : Hl7.Fhir.Model.DomainResource,
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("PackagedProductDefinition#LegalStatusOfSupply")]
-    [BackboneType("PackagedProductDefinition.legalStatusOfSupply")]
+    [FhirType("PackagedProductDefinition.legalStatusOfSupply", IsBackboneType=true)]
     public partial class LegalStatusOfSupplyComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "PackagedProductDefinition#LegalStatusOfSupply"; } }
+      public override string TypeName { get { return "PackagedProductDefinition.legalStatusOfSupply"; } }
 
       /// <summary>
       /// The actual status of supply. In what situation this package type may be supplied for use
@@ -214,14 +213,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("PackagedProductDefinition#Packaging")]
-    [BackboneType("PackagedProductDefinition.packaging")]
+    [FhirType("PackagedProductDefinition.packaging", IsBackboneType=true)]
     public partial class PackagingComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "PackagedProductDefinition#Packaging"; } }
+      public override string TypeName { get { return "PackagedProductDefinition.packaging"; } }
 
       /// <summary>
       /// An identifier that is specific to this particular part of the packaging. Including possibly a Data Carrier Identifier
@@ -636,14 +634,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("PackagedProductDefinition#Property")]
-    [BackboneType("PackagedProductDefinition.packaging.property")]
+    [FhirType("PackagedProductDefinition.packaging.property", IsBackboneType=true)]
     public partial class PropertyComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "PackagedProductDefinition#Property"; } }
+      public override string TypeName { get { return "PackagedProductDefinition.packaging.property"; } }
 
       /// <summary>
       /// A code expressing the type of characteristic
@@ -788,14 +785,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("PackagedProductDefinition#ContainedItem")]
-    [BackboneType("PackagedProductDefinition.packaging.containedItem")]
+    [FhirType("PackagedProductDefinition.packaging.containedItem", IsBackboneType=true)]
     public partial class ContainedItemComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "PackagedProductDefinition#ContainedItem"; } }
+      public override string TypeName { get { return "PackagedProductDefinition.packaging.containedItem"; } }
 
       /// <summary>
       /// The actual item(s) of medication, as manufactured, or a device, or other medically related item (food, biologicals, raw materials, medical fluids, gases etc.), as contained in the package
diff --git a/src/Hl7.Fhir.R5/Model/Generated/Patient.cs b/src/Hl7.Fhir.R5/Model/Generated/Patient.cs
index a0cde86134..1c94108e60 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/Patient.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/Patient.cs
@@ -101,14 +101,13 @@ public enum LinkType
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Patient#Contact")]
-    [BackboneType("Patient.contact")]
+    [FhirType("Patient.contact", IsBackboneType=true)]
     public partial class ContactComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Patient#Contact"; } }
+      public override string TypeName { get { return "Patient.contact"; } }
 
       /// <summary>
       /// The kind of relationship
@@ -402,14 +401,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Patient#Communication")]
-    [BackboneType("Patient.communication")]
+    [FhirType("Patient.communication", IsBackboneType=true)]
     public partial class CommunicationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Patient#Communication"; } }
+      public override string TypeName { get { return "Patient.communication"; } }
 
       /// <summary>
       /// The language which can be used to communicate with the patient about his or her health
@@ -573,14 +571,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Patient#Link")]
-    [BackboneType("Patient.link")]
+    [FhirType("Patient.link", IsBackboneType=true)]
     public partial class LinkComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Patient#Link"; } }
+      public override string TypeName { get { return "Patient.link"; } }
 
       /// <summary>
       /// The other patient or related person resource that the link refers to
diff --git a/src/Hl7.Fhir.R5/Model/Generated/PaymentReconciliation.cs b/src/Hl7.Fhir.R5/Model/Generated/PaymentReconciliation.cs
index 4077fd50ba..953416e778 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/PaymentReconciliation.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/PaymentReconciliation.cs
@@ -101,14 +101,13 @@ public enum PaymentOutcome
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("PaymentReconciliation#Allocation")]
-    [BackboneType("PaymentReconciliation.allocation")]
+    [FhirType("PaymentReconciliation.allocation", IsBackboneType=true)]
     public partial class AllocationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "PaymentReconciliation#Allocation"; } }
+      public override string TypeName { get { return "PaymentReconciliation.allocation"; } }
 
       /// <summary>
       /// Business identifier of the payment detail
@@ -562,14 +561,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("PaymentReconciliation#Notes")]
-    [BackboneType("PaymentReconciliation.processNote")]
+    [FhirType("PaymentReconciliation.processNote", IsBackboneType=true)]
     public partial class NotesComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "PaymentReconciliation#Notes"; } }
+      public override string TypeName { get { return "PaymentReconciliation.processNote"; } }
 
       /// <summary>
       /// display | print | printoper
diff --git a/src/Hl7.Fhir.R5/Model/Generated/Permission.cs b/src/Hl7.Fhir.R5/Model/Generated/Permission.cs
index 1de32f98ca..0e2dcdb70e 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/Permission.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/Permission.cs
@@ -144,14 +144,13 @@ public enum PermissionRuleCombining
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Permission#Justification")]
-    [BackboneType("Permission.justification")]
+    [FhirType("Permission.justification", IsBackboneType=true)]
     public partial class JustificationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Permission#Justification"; } }
+      public override string TypeName { get { return "Permission.justification"; } }
 
       /// <summary>
       /// The regulatory grounds upon which this Permission builds
@@ -300,14 +299,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Permission#Rule")]
-    [BackboneType("Permission.rule")]
+    [FhirType("Permission.rule", IsBackboneType=true)]
     public partial class RuleComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Permission#Rule"; } }
+      public override string TypeName { get { return "Permission.rule"; } }
 
       /// <summary>
       /// deny | permit
@@ -525,14 +523,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Permission#Data")]
-    [BackboneType("Permission.rule.data")]
+    [FhirType("Permission.rule.data", IsBackboneType=true)]
     public partial class DataComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Permission#Data"; } }
+      public override string TypeName { get { return "Permission.rule.data"; } }
 
       /// <summary>
       /// Explicit FHIR Resource references
@@ -726,14 +723,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Permission#Resource")]
-    [BackboneType("Permission.rule.data.resource")]
+    [FhirType("Permission.rule.data.resource", IsBackboneType=true)]
     public partial class ResourceComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Permission#Resource"; } }
+      public override string TypeName { get { return "Permission.rule.data.resource"; } }
 
       /// <summary>
       /// instance | related | dependents | authoredby
@@ -898,14 +894,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Permission#Activity")]
-    [BackboneType("Permission.rule.activity")]
+    [FhirType("Permission.rule.activity", IsBackboneType=true)]
     public partial class ActivityComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Permission#Activity"; } }
+      public override string TypeName { get { return "Permission.rule.activity"; } }
 
       /// <summary>
       /// Authorized actor(s)
diff --git a/src/Hl7.Fhir.R5/Model/Generated/Person.cs b/src/Hl7.Fhir.R5/Model/Generated/Person.cs
index 9123d5ff0f..7b5d3771c5 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/Person.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/Person.cs
@@ -103,14 +103,13 @@ public enum IdentityAssuranceLevel
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Person#Communication")]
-    [BackboneType("Person.communication")]
+    [FhirType("Person.communication", IsBackboneType=true)]
     public partial class CommunicationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Person#Communication"; } }
+      public override string TypeName { get { return "Person.communication"; } }
 
       /// <summary>
       /// The language which can be used to communicate with the person about his or her health
@@ -271,14 +270,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Person#Link")]
-    [BackboneType("Person.link")]
+    [FhirType("Person.link", IsBackboneType=true)]
     public partial class LinkComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Person#Link"; } }
+      public override string TypeName { get { return "Person.link"; } }
 
       /// <summary>
       /// The resource to which this actual person is associated
diff --git a/src/Hl7.Fhir.R5/Model/Generated/PlanDefinition.cs b/src/Hl7.Fhir.R5/Model/Generated/PlanDefinition.cs
index 0854f58af9..e81484469f 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/PlanDefinition.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/PlanDefinition.cs
@@ -67,14 +67,13 @@ public partial class PlanDefinition : Hl7.Fhir.Model.DomainResource, IIdentifiab
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("PlanDefinition#Goal")]
-    [BackboneType("PlanDefinition.goal")]
+    [FhirType("PlanDefinition.goal", IsBackboneType=true)]
     public partial class GoalComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "PlanDefinition#Goal"; } }
+      public override string TypeName { get { return "PlanDefinition.goal"; } }
 
       /// <summary>
       /// E.g. Treatment, dietary, behavioral
@@ -352,14 +351,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("PlanDefinition#Target")]
-    [BackboneType("PlanDefinition.goal.target")]
+    [FhirType("PlanDefinition.goal.target", IsBackboneType=true)]
     public partial class TargetComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "PlanDefinition#Target"; } }
+      public override string TypeName { get { return "PlanDefinition.goal.target"; } }
 
       /// <summary>
       /// The parameter whose value is to be tracked
@@ -531,14 +529,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("PlanDefinition#Actor")]
-    [BackboneType("PlanDefinition.actor")]
+    [FhirType("PlanDefinition.actor", IsBackboneType=true)]
     public partial class ActorComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "PlanDefinition#Actor"; } }
+      public override string TypeName { get { return "PlanDefinition.actor"; } }
 
       /// <summary>
       /// User-visible title
@@ -744,14 +741,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("PlanDefinition#Option")]
-    [BackboneType("PlanDefinition.actor.option")]
+    [FhirType("PlanDefinition.actor.option", IsBackboneType=true)]
     public partial class OptionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "PlanDefinition#Option"; } }
+      public override string TypeName { get { return "PlanDefinition.actor.option"; } }
 
       /// <summary>
       /// careteam | device | group | healthcareservice | location | organization | patient | practitioner | practitionerrole | relatedperson
@@ -987,14 +983,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("PlanDefinition#Action")]
-    [BackboneType("PlanDefinition.action")]
+    [FhirType("PlanDefinition.action", IsBackboneType=true)]
     public partial class ActionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "PlanDefinition#Action"; } }
+      public override string TypeName { get { return "PlanDefinition.action"; } }
 
       /// <summary>
       /// Unique id for the action in the PlanDefinition
@@ -2082,14 +2077,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("PlanDefinition#Condition")]
-    [BackboneType("PlanDefinition.action.condition")]
+    [FhirType("PlanDefinition.action.condition", IsBackboneType=true)]
     public partial class ConditionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "PlanDefinition#Condition"; } }
+      public override string TypeName { get { return "PlanDefinition.action.condition"; } }
 
       /// <summary>
       /// applicability | start | stop
@@ -2254,14 +2248,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("PlanDefinition#Input")]
-    [BackboneType("PlanDefinition.action.input")]
+    [FhirType("PlanDefinition.action.input", IsBackboneType=true)]
     public partial class InputComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "PlanDefinition#Input"; } }
+      public override string TypeName { get { return "PlanDefinition.action.input"; } }
 
       /// <summary>
       /// User-visible title
@@ -2466,14 +2459,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("PlanDefinition#Output")]
-    [BackboneType("PlanDefinition.action.output")]
+    [FhirType("PlanDefinition.action.output", IsBackboneType=true)]
     public partial class OutputComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "PlanDefinition#Output"; } }
+      public override string TypeName { get { return "PlanDefinition.action.output"; } }
 
       /// <summary>
       /// User-visible title
@@ -2679,14 +2671,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("PlanDefinition#RelatedAction")]
-    [BackboneType("PlanDefinition.action.relatedAction")]
+    [FhirType("PlanDefinition.action.relatedAction", IsBackboneType=true)]
     public partial class RelatedActionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "PlanDefinition#RelatedAction"; } }
+      public override string TypeName { get { return "PlanDefinition.action.relatedAction"; } }
 
       /// <summary>
       /// What action is this related to
@@ -2942,14 +2933,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("PlanDefinition#Participant")]
-    [BackboneType("PlanDefinition.action.participant")]
+    [FhirType("PlanDefinition.action.participant", IsBackboneType=true)]
     public partial class ParticipantComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "PlanDefinition#Participant"; } }
+      public override string TypeName { get { return "PlanDefinition.action.participant"; } }
 
       /// <summary>
       /// What actor
@@ -3254,14 +3244,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("PlanDefinition#DynamicValue")]
-    [BackboneType("PlanDefinition.action.dynamicValue")]
+    [FhirType("PlanDefinition.action.dynamicValue", IsBackboneType=true)]
     public partial class DynamicValueComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "PlanDefinition#DynamicValue"; } }
+      public override string TypeName { get { return "PlanDefinition.action.dynamicValue"; } }
 
       /// <summary>
       /// The path to the element to be set dynamically
diff --git a/src/Hl7.Fhir.R5/Model/Generated/Practitioner.cs b/src/Hl7.Fhir.R5/Model/Generated/Practitioner.cs
index d672ed439c..78fcfee3d0 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/Practitioner.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/Practitioner.cs
@@ -69,14 +69,13 @@ public partial class Practitioner : Hl7.Fhir.Model.DomainResource, IIdentifiable
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Practitioner#Qualification")]
-    [BackboneType("Practitioner.qualification")]
+    [FhirType("Practitioner.qualification", IsBackboneType=true)]
     public partial class QualificationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Practitioner#Qualification"; } }
+      public override string TypeName { get { return "Practitioner.qualification"; } }
 
       /// <summary>
       /// An identifier for this qualification for the practitioner
@@ -278,14 +277,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Practitioner#Communication")]
-    [BackboneType("Practitioner.communication")]
+    [FhirType("Practitioner.communication", IsBackboneType=true)]
     public partial class CommunicationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Practitioner#Communication"; } }
+      public override string TypeName { get { return "Practitioner.communication"; } }
 
       /// <summary>
       /// The language code used to communicate with the practitioner
diff --git a/src/Hl7.Fhir.R5/Model/Generated/Procedure.cs b/src/Hl7.Fhir.R5/Model/Generated/Procedure.cs
index c32fa2e875..0915409b08 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/Procedure.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/Procedure.cs
@@ -67,14 +67,13 @@ public partial class Procedure : Hl7.Fhir.Model.DomainResource, IIdentifiable<Li
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Procedure#Performer")]
-    [BackboneType("Procedure.performer")]
+    [FhirType("Procedure.performer", IsBackboneType=true)]
     public partial class PerformerComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Procedure#Performer"; } }
+      public override string TypeName { get { return "Procedure.performer"; } }
 
       /// <summary>
       /// Type of performance
@@ -274,14 +273,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Procedure#FocalDevice")]
-    [BackboneType("Procedure.focalDevice")]
+    [FhirType("Procedure.focalDevice", IsBackboneType=true)]
     public partial class FocalDeviceComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Procedure#FocalDevice"; } }
+      public override string TypeName { get { return "Procedure.focalDevice"; } }
 
       /// <summary>
       /// Kind of change to device
diff --git a/src/Hl7.Fhir.R5/Model/Generated/Provenance.cs b/src/Hl7.Fhir.R5/Model/Generated/Provenance.cs
index 2f18f3e96b..0a3e1f27da 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/Provenance.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/Provenance.cs
@@ -109,14 +109,13 @@ public enum ProvenanceEntityRole
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Provenance#Agent")]
-    [BackboneType("Provenance.agent")]
+    [FhirType("Provenance.agent", IsBackboneType=true)]
     public partial class AgentComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Provenance#Agent"; } }
+      public override string TypeName { get { return "Provenance.agent"; } }
 
       /// <summary>
       /// How the agent participated
@@ -315,14 +314,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Provenance#Entity")]
-    [BackboneType("Provenance.entity")]
+    [FhirType("Provenance.entity", IsBackboneType=true)]
     public partial class EntityComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Provenance#Entity"; } }
+      public override string TypeName { get { return "Provenance.entity"; } }
 
       /// <summary>
       /// revision | quotation | source | instantiates | removal
diff --git a/src/Hl7.Fhir.R5/Model/Generated/Questionnaire.cs b/src/Hl7.Fhir.R5/Model/Generated/Questionnaire.cs
index 430b03f74f..76c6d8385d 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/Questionnaire.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/Questionnaire.cs
@@ -298,14 +298,13 @@ public enum QuestionnaireItemOperator
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Questionnaire#Item")]
-    [BackboneType("Questionnaire.item")]
+    [FhirType("Questionnaire.item", IsBackboneType=true)]
     public partial class ItemComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Questionnaire#Item"; } }
+      public override string TypeName { get { return "Questionnaire.item"; } }
 
       /// <summary>
       /// Unique id for item in questionnaire
@@ -1100,14 +1099,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Questionnaire#EnableWhen")]
-    [BackboneType("Questionnaire.item.enableWhen")]
+    [FhirType("Questionnaire.item.enableWhen", IsBackboneType=true)]
     public partial class EnableWhenComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Questionnaire#EnableWhen"; } }
+      public override string TypeName { get { return "Questionnaire.item.enableWhen"; } }
 
       /// <summary>
       /// The linkId of question that determines whether item is enabled/disabled
@@ -1322,14 +1320,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Questionnaire#AnswerOption")]
-    [BackboneType("Questionnaire.item.answerOption")]
+    [FhirType("Questionnaire.item.answerOption", IsBackboneType=true)]
     public partial class AnswerOptionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Questionnaire#AnswerOption"; } }
+      public override string TypeName { get { return "Questionnaire.item.answerOption"; } }
 
       /// <summary>
       /// Answer value
@@ -1497,14 +1494,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Questionnaire#Initial")]
-    [BackboneType("Questionnaire.item.initial")]
+    [FhirType("Questionnaire.item.initial", IsBackboneType=true)]
     public partial class InitialComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Questionnaire#Initial"; } }
+      public override string TypeName { get { return "Questionnaire.item.initial"; } }
 
       /// <summary>
       /// Actual value for initializing the question
diff --git a/src/Hl7.Fhir.R5/Model/Generated/QuestionnaireResponse.cs b/src/Hl7.Fhir.R5/Model/Generated/QuestionnaireResponse.cs
index 970fc46966..be8a1b1ca7 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/QuestionnaireResponse.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/QuestionnaireResponse.cs
@@ -109,14 +109,13 @@ public enum QuestionnaireResponseStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("QuestionnaireResponse#Item")]
-    [BackboneType("QuestionnaireResponse.item")]
+    [FhirType("QuestionnaireResponse.item", IsBackboneType=true)]
     public partial class ItemComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "QuestionnaireResponse#Item"; } }
+      public override string TypeName { get { return "QuestionnaireResponse.item"; } }
 
       /// <summary>
       /// Pointer to specific item from Questionnaire
@@ -393,14 +392,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("QuestionnaireResponse#Answer")]
-    [BackboneType("QuestionnaireResponse.item.answer")]
+    [FhirType("QuestionnaireResponse.item.answer", IsBackboneType=true)]
     public partial class AnswerComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "QuestionnaireResponse#Answer"; } }
+      public override string TypeName { get { return "QuestionnaireResponse.item.answer"; } }
 
       /// <summary>
       /// Single-valued answer to the question
diff --git a/src/Hl7.Fhir.R5/Model/Generated/RegulatedAuthorization.cs b/src/Hl7.Fhir.R5/Model/Generated/RegulatedAuthorization.cs
index 2c79c3d860..9939432b27 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/RegulatedAuthorization.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/RegulatedAuthorization.cs
@@ -67,14 +67,13 @@ public partial class RegulatedAuthorization : Hl7.Fhir.Model.DomainResource, IId
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("RegulatedAuthorization#Case")]
-    [BackboneType("RegulatedAuthorization.case")]
+    [FhirType("RegulatedAuthorization.case", IsBackboneType=true)]
     public partial class CaseComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "RegulatedAuthorization#Case"; } }
+      public override string TypeName { get { return "RegulatedAuthorization.case"; } }
 
       /// <summary>
       /// Identifier by which this case can be referenced
diff --git a/src/Hl7.Fhir.R5/Model/Generated/RelatedPerson.cs b/src/Hl7.Fhir.R5/Model/Generated/RelatedPerson.cs
index 4f93eb4fe5..c1277772c3 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/RelatedPerson.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/RelatedPerson.cs
@@ -67,14 +67,13 @@ public partial class RelatedPerson : Hl7.Fhir.Model.DomainResource, IIdentifiabl
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("RelatedPerson#Communication")]
-    [BackboneType("RelatedPerson.communication")]
+    [FhirType("RelatedPerson.communication", IsBackboneType=true)]
     public partial class CommunicationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "RelatedPerson#Communication"; } }
+      public override string TypeName { get { return "RelatedPerson.communication"; } }
 
       /// <summary>
       /// The language which can be used to communicate with the related person about the patient's health
diff --git a/src/Hl7.Fhir.R5/Model/Generated/RequestOrchestration.cs b/src/Hl7.Fhir.R5/Model/Generated/RequestOrchestration.cs
index 672a4fd555..e3dec8d082 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/RequestOrchestration.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/RequestOrchestration.cs
@@ -67,14 +67,13 @@ public partial class RequestOrchestration : Hl7.Fhir.Model.DomainResource, IIden
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("RequestOrchestration#Action")]
-    [BackboneType("RequestOrchestration.action")]
+    [FhirType("RequestOrchestration.action", IsBackboneType=true)]
     public partial class ActionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "RequestOrchestration#Action"; } }
+      public override string TypeName { get { return "RequestOrchestration.action"; } }
 
       /// <summary>
       /// Pointer to specific item from the PlanDefinition
@@ -1092,14 +1091,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("RequestOrchestration#Condition")]
-    [BackboneType("RequestOrchestration.action.condition")]
+    [FhirType("RequestOrchestration.action.condition", IsBackboneType=true)]
     public partial class ConditionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "RequestOrchestration#Condition"; } }
+      public override string TypeName { get { return "RequestOrchestration.action.condition"; } }
 
       /// <summary>
       /// applicability | start | stop
@@ -1264,14 +1262,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("RequestOrchestration#Input")]
-    [BackboneType("RequestOrchestration.action.input")]
+    [FhirType("RequestOrchestration.action.input", IsBackboneType=true)]
     public partial class InputComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "RequestOrchestration#Input"; } }
+      public override string TypeName { get { return "RequestOrchestration.action.input"; } }
 
       /// <summary>
       /// User-visible title
@@ -1476,14 +1473,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("RequestOrchestration#Output")]
-    [BackboneType("RequestOrchestration.action.output")]
+    [FhirType("RequestOrchestration.action.output", IsBackboneType=true)]
     public partial class OutputComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "RequestOrchestration#Output"; } }
+      public override string TypeName { get { return "RequestOrchestration.action.output"; } }
 
       /// <summary>
       /// User-visible title
@@ -1688,14 +1684,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("RequestOrchestration#RelatedAction")]
-    [BackboneType("RequestOrchestration.action.relatedAction")]
+    [FhirType("RequestOrchestration.action.relatedAction", IsBackboneType=true)]
     public partial class RelatedActionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "RequestOrchestration#RelatedAction"; } }
+      public override string TypeName { get { return "RequestOrchestration.action.relatedAction"; } }
 
       /// <summary>
       /// What action this is related to
@@ -1952,14 +1947,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("RequestOrchestration#Participant")]
-    [BackboneType("RequestOrchestration.action.participant")]
+    [FhirType("RequestOrchestration.action.participant", IsBackboneType=true)]
     public partial class ParticipantComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "RequestOrchestration#Participant"; } }
+      public override string TypeName { get { return "RequestOrchestration.action.participant"; } }
 
       /// <summary>
       /// careteam | device | group | healthcareservice | location | organization | patient | practitioner | practitionerrole | relatedperson
@@ -2249,14 +2243,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("RequestOrchestration#DynamicValue")]
-    [BackboneType("RequestOrchestration.action.dynamicValue")]
+    [FhirType("RequestOrchestration.action.dynamicValue", IsBackboneType=true)]
     public partial class DynamicValueComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "RequestOrchestration#DynamicValue"; } }
+      public override string TypeName { get { return "RequestOrchestration.action.dynamicValue"; } }
 
       /// <summary>
       /// The path to the element to be set dynamically
diff --git a/src/Hl7.Fhir.R5/Model/Generated/Requirements.cs b/src/Hl7.Fhir.R5/Model/Generated/Requirements.cs
index be2ee2bb9b..b9e2e0e395 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/Requirements.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/Requirements.cs
@@ -101,14 +101,13 @@ public enum ConformanceExpectation
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Requirements#Statement")]
-    [BackboneType("Requirements.statement")]
+    [FhirType("Requirements.statement", IsBackboneType=true)]
     public partial class StatementComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Requirements#Statement"; } }
+      public override string TypeName { get { return "Requirements.statement"; } }
 
       /// <summary>
       /// Key that identifies this statement
diff --git a/src/Hl7.Fhir.R5/Model/Generated/ResearchStudy.cs b/src/Hl7.Fhir.R5/Model/Generated/ResearchStudy.cs
index 021375d329..3d3025e629 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/ResearchStudy.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/ResearchStudy.cs
@@ -65,14 +65,13 @@ public partial class ResearchStudy : Hl7.Fhir.Model.DomainResource, IIdentifiabl
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("ResearchStudy#Label")]
-    [BackboneType("ResearchStudy.label")]
+    [FhirType("ResearchStudy.label", IsBackboneType=true)]
     public partial class LabelComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ResearchStudy#Label"; } }
+      public override string TypeName { get { return "ResearchStudy.label"; } }
 
       /// <summary>
       /// primary | official | scientific | plain-language | subtitle | short-title | acronym | earlier-title | language | auto-translated | human-use | machine-use | duplicate-uid
@@ -235,14 +234,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ResearchStudy#AssociatedParty")]
-    [BackboneType("ResearchStudy.associatedParty")]
+    [FhirType("ResearchStudy.associatedParty", IsBackboneType=true)]
     public partial class AssociatedPartyComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ResearchStudy#AssociatedParty"; } }
+      public override string TypeName { get { return "ResearchStudy.associatedParty"; } }
 
       /// <summary>
       /// Name of associated party
@@ -483,14 +481,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("ResearchStudy#ProgressStatus")]
-    [BackboneType("ResearchStudy.progressStatus")]
+    [FhirType("ResearchStudy.progressStatus", IsBackboneType=true)]
     public partial class ProgressStatusComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ResearchStudy#ProgressStatus"; } }
+      public override string TypeName { get { return "ResearchStudy.progressStatus"; } }
 
       /// <summary>
       /// Label for status or state (e.g. recruitment status)
@@ -676,14 +673,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("ResearchStudy#Recruitment")]
-    [BackboneType("ResearchStudy.recruitment")]
+    [FhirType("ResearchStudy.recruitment", IsBackboneType=true)]
     public partial class RecruitmentComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ResearchStudy#Recruitment"; } }
+      public override string TypeName { get { return "ResearchStudy.recruitment"; } }
 
       /// <summary>
       /// Estimated total number of participants to be enrolled
@@ -918,14 +914,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ResearchStudy#ComparisonGroup")]
-    [BackboneType("ResearchStudy.comparisonGroup")]
+    [FhirType("ResearchStudy.comparisonGroup", IsBackboneType=true)]
     public partial class ComparisonGroupComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ResearchStudy#ComparisonGroup"; } }
+      public override string TypeName { get { return "ResearchStudy.comparisonGroup"; } }
 
       /// <summary>
       /// Allows the comparisonGroup for the study and the comparisonGroup for the subject to be linked easily
@@ -1230,14 +1225,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ResearchStudy#Objective")]
-    [BackboneType("ResearchStudy.objective")]
+    [FhirType("ResearchStudy.objective", IsBackboneType=true)]
     public partial class ObjectiveComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ResearchStudy#Objective"; } }
+      public override string TypeName { get { return "ResearchStudy.objective"; } }
 
       /// <summary>
       /// Label for the objective
@@ -1444,14 +1438,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ResearchStudy#OutcomeMeasure")]
-    [BackboneType("ResearchStudy.outcomeMeasure")]
+    [FhirType("ResearchStudy.outcomeMeasure", IsBackboneType=true)]
     public partial class OutcomeMeasureComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ResearchStudy#OutcomeMeasure"; } }
+      public override string TypeName { get { return "ResearchStudy.outcomeMeasure"; } }
 
       /// <summary>
       /// Label for the outcome
diff --git a/src/Hl7.Fhir.R5/Model/Generated/ResearchSubject.cs b/src/Hl7.Fhir.R5/Model/Generated/ResearchSubject.cs
index bef6659c6a..30225977fc 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/ResearchSubject.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/ResearchSubject.cs
@@ -158,14 +158,13 @@ public enum ResearchSubjectState
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ResearchSubject#Progress")]
-    [BackboneType("ResearchSubject.progress")]
+    [FhirType("ResearchSubject.progress", IsBackboneType=true)]
     public partial class ProgressComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ResearchSubject#Progress"; } }
+      public override string TypeName { get { return "ResearchSubject.progress"; } }
 
       /// <summary>
       /// state | milestone
diff --git a/src/Hl7.Fhir.R5/Model/Generated/RiskAssessment.cs b/src/Hl7.Fhir.R5/Model/Generated/RiskAssessment.cs
index 880e0b42da..95a7336eba 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/RiskAssessment.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/RiskAssessment.cs
@@ -68,14 +68,13 @@ public partial class RiskAssessment : Hl7.Fhir.Model.DomainResource, IIdentifiab
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("RiskAssessment#Prediction")]
-    [BackboneType("RiskAssessment.prediction")]
+    [FhirType("RiskAssessment.prediction", IsBackboneType=true)]
     public partial class PredictionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "RiskAssessment#Prediction"; } }
+      public override string TypeName { get { return "RiskAssessment.prediction"; } }
 
       /// <summary>
       /// Possible outcome for the subject
diff --git a/src/Hl7.Fhir.R5/Model/Generated/SearchParameter.cs b/src/Hl7.Fhir.R5/Model/Generated/SearchParameter.cs
index 4200c55376..cfcf1b5345 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/SearchParameter.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/SearchParameter.cs
@@ -96,14 +96,13 @@ public enum SearchProcessingModeType
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("SearchParameter#Component")]
-    [BackboneType("SearchParameter.component")]
+    [FhirType("SearchParameter.component", IsBackboneType=true)]
     public partial class ComponentComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "SearchParameter#Component"; } }
+      public override string TypeName { get { return "SearchParameter.component"; } }
 
       /// <summary>
       /// Defines how the part works
diff --git a/src/Hl7.Fhir.R5/Model/Generated/ServiceRequest.cs b/src/Hl7.Fhir.R5/Model/Generated/ServiceRequest.cs
index 2de6beec03..e5890fe20d 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/ServiceRequest.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/ServiceRequest.cs
@@ -68,14 +68,13 @@ public partial class ServiceRequest : Hl7.Fhir.Model.DomainResource, IIdentifiab
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ServiceRequest#OrderDetail")]
-    [BackboneType("ServiceRequest.orderDetail")]
+    [FhirType("ServiceRequest.orderDetail", IsBackboneType=true)]
     public partial class OrderDetailComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ServiceRequest#OrderDetail"; } }
+      public override string TypeName { get { return "ServiceRequest.orderDetail"; } }
 
       /// <summary>
       /// The context of the order details by reference
@@ -217,14 +216,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("ServiceRequest#Parameter")]
-    [BackboneType("ServiceRequest.orderDetail.parameter")]
+    [FhirType("ServiceRequest.orderDetail.parameter", IsBackboneType=true)]
     public partial class ParameterComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ServiceRequest#Parameter"; } }
+      public override string TypeName { get { return "ServiceRequest.orderDetail.parameter"; } }
 
       /// <summary>
       /// The detail of the order being requested
@@ -373,14 +371,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ServiceRequest#PatientInstruction")]
-    [BackboneType("ServiceRequest.patientInstruction")]
+    [FhirType("ServiceRequest.patientInstruction", IsBackboneType=true)]
     public partial class PatientInstructionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ServiceRequest#PatientInstruction"; } }
+      public override string TypeName { get { return "ServiceRequest.patientInstruction"; } }
 
       /// <summary>
       /// Patient or consumer-oriented instructions
diff --git a/src/Hl7.Fhir.R5/Model/Generated/Specimen.cs b/src/Hl7.Fhir.R5/Model/Generated/Specimen.cs
index 1e236d2b30..84e43cdc67 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/Specimen.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/Specimen.cs
@@ -123,14 +123,13 @@ public enum SpecimenCombined
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Specimen#Feature")]
-    [BackboneType("Specimen.feature")]
+    [FhirType("Specimen.feature", IsBackboneType=true)]
     public partial class FeatureComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Specimen#Feature"; } }
+      public override string TypeName { get { return "Specimen.feature"; } }
 
       /// <summary>
       /// Highlighted feature
@@ -295,14 +294,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Specimen#Collection")]
-    [BackboneType("Specimen.collection")]
+    [FhirType("Specimen.collection", IsBackboneType=true)]
     public partial class CollectionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Specimen#Collection"; } }
+      public override string TypeName { get { return "Specimen.collection"; } }
 
       /// <summary>
       /// Who collected the specimen
@@ -633,14 +631,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Specimen#Processing")]
-    [BackboneType("Specimen.processing")]
+    [FhirType("Specimen.processing", IsBackboneType=true)]
     public partial class ProcessingComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Specimen#Processing"; } }
+      public override string TypeName { get { return "Specimen.processing"; } }
 
       /// <summary>
       /// Textual description of procedure
@@ -858,14 +855,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Specimen#Container")]
-    [BackboneType("Specimen.container")]
+    [FhirType("Specimen.container", IsBackboneType=true)]
     public partial class ContainerComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Specimen#Container"; } }
+      public override string TypeName { get { return "Specimen.container"; } }
 
       /// <summary>
       /// Device resource for the container
diff --git a/src/Hl7.Fhir.R5/Model/Generated/SpecimenDefinition.cs b/src/Hl7.Fhir.R5/Model/Generated/SpecimenDefinition.cs
index f52cdb7e9a..d21fb73018 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/SpecimenDefinition.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/SpecimenDefinition.cs
@@ -89,14 +89,13 @@ public enum SpecimenContainedPreference
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("SpecimenDefinition#TypeTested")]
-    [BackboneType("SpecimenDefinition.typeTested")]
+    [FhirType("SpecimenDefinition.typeTested", IsBackboneType=true)]
     public partial class TypeTestedComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "SpecimenDefinition#TypeTested"; } }
+      public override string TypeName { get { return "SpecimenDefinition.typeTested"; } }
 
       /// <summary>
       /// Primary or secondary specimen
@@ -518,14 +517,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SpecimenDefinition#Container")]
-    [BackboneType("SpecimenDefinition.typeTested.container")]
+    [FhirType("SpecimenDefinition.typeTested.container", IsBackboneType=true)]
     public partial class ContainerComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "SpecimenDefinition#Container"; } }
+      public override string TypeName { get { return "SpecimenDefinition.typeTested.container"; } }
 
       /// <summary>
       /// The material type used for the container
@@ -861,14 +859,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("SpecimenDefinition#Additive")]
-    [BackboneType("SpecimenDefinition.typeTested.container.additive")]
+    [FhirType("SpecimenDefinition.typeTested.container.additive", IsBackboneType=true)]
     public partial class AdditiveComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "SpecimenDefinition#Additive"; } }
+      public override string TypeName { get { return "SpecimenDefinition.typeTested.container.additive"; } }
 
       /// <summary>
       /// Additive associated with container
@@ -992,14 +989,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("SpecimenDefinition#Handling")]
-    [BackboneType("SpecimenDefinition.typeTested.handling")]
+    [FhirType("SpecimenDefinition.typeTested.handling", IsBackboneType=true)]
     public partial class HandlingComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "SpecimenDefinition#Handling"; } }
+      public override string TypeName { get { return "SpecimenDefinition.typeTested.handling"; } }
 
       /// <summary>
       /// Qualifies the interval of temperature
diff --git a/src/Hl7.Fhir.R5/Model/Generated/StructureMap.cs b/src/Hl7.Fhir.R5/Model/Generated/StructureMap.cs
index 42f54c966b..32e289d8e9 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/StructureMap.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/StructureMap.cs
@@ -329,14 +329,13 @@ public enum StructureMapTransform
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("StructureMap#Structure")]
-    [BackboneType("StructureMap.structure")]
+    [FhirType("StructureMap.structure", IsBackboneType=true)]
     public partial class StructureComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "StructureMap#Structure"; } }
+      public override string TypeName { get { return "StructureMap.structure"; } }
 
       /// <summary>
       /// Canonical reference to structure definition
@@ -606,14 +605,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("StructureMap#Const")]
-    [BackboneType("StructureMap.const")]
+    [FhirType("StructureMap.const", IsBackboneType=true)]
     public partial class ConstComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "StructureMap#Const"; } }
+      public override string TypeName { get { return "StructureMap.const"; } }
 
       /// <summary>
       /// Constant name
@@ -793,14 +791,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("StructureMap#Group")]
-    [BackboneType("StructureMap.group")]
+    [FhirType("StructureMap.group", IsBackboneType=true)]
     public partial class GroupComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "StructureMap#Group"; } }
+      public override string TypeName { get { return "StructureMap.group"; } }
 
       /// <summary>
       /// Human-readable label
@@ -1122,14 +1119,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("StructureMap#Input")]
-    [BackboneType("StructureMap.group.input")]
+    [FhirType("StructureMap.group.input", IsBackboneType=true)]
     public partial class InputComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "StructureMap#Input"; } }
+      public override string TypeName { get { return "StructureMap.group.input"; } }
 
       /// <summary>
       /// Name for this instance of data
@@ -1396,14 +1392,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("StructureMap#Rule")]
-    [BackboneType("StructureMap.group.rule")]
+    [FhirType("StructureMap.group.rule", IsBackboneType=true)]
     public partial class RuleComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "StructureMap#Rule"; } }
+      public override string TypeName { get { return "StructureMap.group.rule"; } }
 
       /// <summary>
       /// Name of the rule for internal references
@@ -1684,14 +1679,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("StructureMap#Source")]
-    [BackboneType("StructureMap.group.rule.source")]
+    [FhirType("StructureMap.group.rule.source", IsBackboneType=true)]
     public partial class SourceComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "StructureMap#Source"; } }
+      public override string TypeName { get { return "StructureMap.group.rule.source"; } }
 
       /// <summary>
       /// Type or variable this rule applies to
@@ -2258,14 +2252,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("StructureMap#Target")]
-    [BackboneType("StructureMap.group.rule.target")]
+    [FhirType("StructureMap.group.rule.target", IsBackboneType=true)]
     public partial class TargetComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "StructureMap#Target"; } }
+      public override string TypeName { get { return "StructureMap.group.rule.target"; } }
 
       /// <summary>
       /// Variable this rule applies to
@@ -2645,14 +2638,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("StructureMap#Parameter")]
-    [BackboneType("StructureMap.group.rule.target.parameter")]
+    [FhirType("StructureMap.group.rule.target.parameter", IsBackboneType=true)]
     public partial class ParameterComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "StructureMap#Parameter"; } }
+      public override string TypeName { get { return "StructureMap.group.rule.target.parameter"; } }
 
       /// <summary>
       /// Parameter value - variable or literal
@@ -2771,14 +2763,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("StructureMap#Dependent")]
-    [BackboneType("StructureMap.group.rule.dependent")]
+    [FhirType("StructureMap.group.rule.dependent", IsBackboneType=true)]
     public partial class DependentComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "StructureMap#Dependent"; } }
+      public override string TypeName { get { return "StructureMap.group.rule.dependent"; } }
 
       /// <summary>
       /// Name of a rule or group to apply
diff --git a/src/Hl7.Fhir.R5/Model/Generated/Subscription.cs b/src/Hl7.Fhir.R5/Model/Generated/Subscription.cs
index 52a765d2b5..cf37379f5a 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/Subscription.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/Subscription.cs
@@ -95,14 +95,13 @@ public enum SubscriptionPayloadContent
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Subscription#FilterBy")]
-    [BackboneType("Subscription.filterBy")]
+    [FhirType("Subscription.filterBy", IsBackboneType=true)]
     public partial class FilterByComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Subscription#FilterBy"; } }
+      public override string TypeName { get { return "Subscription.filterBy"; } }
 
       /// <summary>
       /// Allowed Resource (reference to definition) for this Subscription filter
@@ -419,14 +418,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Subscription#Parameter")]
-    [BackboneType("Subscription.parameter")]
+    [FhirType("Subscription.parameter", IsBackboneType=true)]
     public partial class ParameterComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Subscription#Parameter"; } }
+      public override string TypeName { get { return "Subscription.parameter"; } }
 
       /// <summary>
       /// Name (key) of the parameter
diff --git a/src/Hl7.Fhir.R5/Model/Generated/SubscriptionStatus.cs b/src/Hl7.Fhir.R5/Model/Generated/SubscriptionStatus.cs
index 3c169ee622..75d83880a4 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/SubscriptionStatus.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/SubscriptionStatus.cs
@@ -107,14 +107,13 @@ public enum SubscriptionNotificationType
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("SubscriptionStatus#NotificationEvent")]
-    [BackboneType("SubscriptionStatus.notificationEvent")]
+    [FhirType("SubscriptionStatus.notificationEvent", IsBackboneType=true)]
     public partial class NotificationEventComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "SubscriptionStatus#NotificationEvent"; } }
+      public override string TypeName { get { return "SubscriptionStatus.notificationEvent"; } }
 
       /// <summary>
       /// Sequencing index of this event
diff --git a/src/Hl7.Fhir.R5/Model/Generated/SubscriptionTopic.cs b/src/Hl7.Fhir.R5/Model/Generated/SubscriptionTopic.cs
index 79a498b655..b218e117ba 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/SubscriptionTopic.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/SubscriptionTopic.cs
@@ -117,14 +117,13 @@ public enum CriteriaNotExistsBehavior
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("SubscriptionTopic#ResourceTrigger")]
-    [BackboneType("SubscriptionTopic.resourceTrigger")]
+    [FhirType("SubscriptionTopic.resourceTrigger", IsBackboneType=true)]
     public partial class ResourceTriggerComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "SubscriptionTopic#ResourceTrigger"; } }
+      public override string TypeName { get { return "SubscriptionTopic.resourceTrigger"; } }
 
       /// <summary>
       /// Text representation of the resource trigger
@@ -420,14 +419,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("SubscriptionTopic#QueryCriteria")]
-    [BackboneType("SubscriptionTopic.resourceTrigger.queryCriteria")]
+    [FhirType("SubscriptionTopic.resourceTrigger.queryCriteria", IsBackboneType=true)]
     public partial class QueryCriteriaComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "SubscriptionTopic#QueryCriteria"; } }
+      public override string TypeName { get { return "SubscriptionTopic.resourceTrigger.queryCriteria"; } }
 
       /// <summary>
       /// Rule applied to previous resource state
@@ -740,14 +738,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("SubscriptionTopic#EventTrigger")]
-    [BackboneType("SubscriptionTopic.eventTrigger")]
+    [FhirType("SubscriptionTopic.eventTrigger", IsBackboneType=true)]
     public partial class EventTriggerComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "SubscriptionTopic#EventTrigger"; } }
+      public override string TypeName { get { return "SubscriptionTopic.eventTrigger"; } }
 
       /// <summary>
       /// Text representation of the event trigger
@@ -956,14 +953,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("SubscriptionTopic#CanFilterBy")]
-    [BackboneType("SubscriptionTopic.canFilterBy")]
+    [FhirType("SubscriptionTopic.canFilterBy", IsBackboneType=true)]
     public partial class CanFilterByComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "SubscriptionTopic#CanFilterBy"; } }
+      public override string TypeName { get { return "SubscriptionTopic.canFilterBy"; } }
 
       /// <summary>
       /// Description of this filter parameter
@@ -1323,14 +1319,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("SubscriptionTopic#NotificationShape")]
-    [BackboneType("SubscriptionTopic.notificationShape")]
+    [FhirType("SubscriptionTopic.notificationShape", IsBackboneType=true)]
     public partial class NotificationShapeComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "SubscriptionTopic#NotificationShape"; } }
+      public override string TypeName { get { return "SubscriptionTopic.notificationShape"; } }
 
       /// <summary>
       /// URL of the Resource that is the focus (main) resource in a notification shape
diff --git a/src/Hl7.Fhir.R5/Model/Generated/Substance.cs b/src/Hl7.Fhir.R5/Model/Generated/Substance.cs
index a89f169367..9561af9056 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/Substance.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/Substance.cs
@@ -92,14 +92,13 @@ public enum FHIRSubstanceStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Substance#Ingredient")]
-    [BackboneType("Substance.ingredient")]
+    [FhirType("Substance.ingredient", IsBackboneType=true)]
     public partial class IngredientComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Substance#Ingredient"; } }
+      public override string TypeName { get { return "Substance.ingredient"; } }
 
       /// <summary>
       /// Optional amount (concentration)
diff --git a/src/Hl7.Fhir.R5/Model/Generated/SubstanceDefinition.cs b/src/Hl7.Fhir.R5/Model/Generated/SubstanceDefinition.cs
index e689cbd59b..1f2be3dccf 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/SubstanceDefinition.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/SubstanceDefinition.cs
@@ -61,14 +61,13 @@ public partial class SubstanceDefinition : Hl7.Fhir.Model.DomainResource, IIdent
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SubstanceDefinition#Moiety")]
-    [BackboneType("SubstanceDefinition.moiety")]
+    [FhirType("SubstanceDefinition.moiety", IsBackboneType=true)]
     public partial class MoietyComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "SubstanceDefinition#Moiety"; } }
+      public override string TypeName { get { return "SubstanceDefinition.moiety"; } }
 
       /// <summary>
       /// Role that the moiety is playing
@@ -400,14 +399,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SubstanceDefinition#Characterization")]
-    [BackboneType("SubstanceDefinition.characterization")]
+    [FhirType("SubstanceDefinition.characterization", IsBackboneType=true)]
     public partial class CharacterizationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "SubstanceDefinition#Characterization"; } }
+      public override string TypeName { get { return "SubstanceDefinition.characterization"; } }
 
       /// <summary>
       /// The method used to find the characterization e.g. HPLC
@@ -619,14 +617,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SubstanceDefinition#Property")]
-    [BackboneType("SubstanceDefinition.property")]
+    [FhirType("SubstanceDefinition.property", IsBackboneType=true)]
     public partial class PropertyComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "SubstanceDefinition#Property"; } }
+      public override string TypeName { get { return "SubstanceDefinition.property"; } }
 
       /// <summary>
       /// A code expressing the type of property
@@ -774,14 +771,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("SubstanceDefinition#MolecularWeight")]
-    [BackboneType("SubstanceDefinition.molecularWeight")]
+    [FhirType("SubstanceDefinition.molecularWeight", IsBackboneType=true)]
     public partial class MolecularWeightComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "SubstanceDefinition#MolecularWeight"; } }
+      public override string TypeName { get { return "SubstanceDefinition.molecularWeight"; } }
 
       /// <summary>
       /// The method by which the weight was determined
@@ -950,14 +946,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SubstanceDefinition#Structure")]
-    [BackboneType("SubstanceDefinition.structure")]
+    [FhirType("SubstanceDefinition.structure", IsBackboneType=true)]
     public partial class StructureComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "SubstanceDefinition#Structure"; } }
+      public override string TypeName { get { return "SubstanceDefinition.structure"; } }
 
       /// <summary>
       /// Stereochemistry type
@@ -1292,14 +1287,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SubstanceDefinition#Representation")]
-    [BackboneType("SubstanceDefinition.structure.representation")]
+    [FhirType("SubstanceDefinition.structure.representation", IsBackboneType=true)]
     public partial class RepresentationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "SubstanceDefinition#Representation"; } }
+      public override string TypeName { get { return "SubstanceDefinition.structure.representation"; } }
 
       /// <summary>
       /// The kind of structural representation (e.g. full, partial)
@@ -1512,14 +1506,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SubstanceDefinition#Code")]
-    [BackboneType("SubstanceDefinition.code")]
+    [FhirType("SubstanceDefinition.code", IsBackboneType=true)]
     public partial class CodeComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "SubstanceDefinition#Code"; } }
+      public override string TypeName { get { return "SubstanceDefinition.code"; } }
 
       /// <summary>
       /// The specific code
@@ -1758,14 +1751,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SubstanceDefinition#Name")]
-    [BackboneType("SubstanceDefinition.name")]
+    [FhirType("SubstanceDefinition.name", IsBackboneType=true)]
     public partial class NameComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "SubstanceDefinition#Name"; } }
+      public override string TypeName { get { return "SubstanceDefinition.name"; } }
 
       /// <summary>
       /// The actual name
@@ -2182,14 +2174,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SubstanceDefinition#Official")]
-    [BackboneType("SubstanceDefinition.name.official")]
+    [FhirType("SubstanceDefinition.name.official", IsBackboneType=true)]
     public partial class OfficialComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "SubstanceDefinition#Official"; } }
+      public override string TypeName { get { return "SubstanceDefinition.name.official"; } }
 
       /// <summary>
       /// Which authority uses this official name
@@ -2378,14 +2369,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("SubstanceDefinition#Relationship")]
-    [BackboneType("SubstanceDefinition.relationship")]
+    [FhirType("SubstanceDefinition.relationship", IsBackboneType=true)]
     public partial class RelationshipComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "SubstanceDefinition#Relationship"; } }
+      public override string TypeName { get { return "SubstanceDefinition.relationship"; } }
 
       /// <summary>
       /// A pointer to another substance, as a resource or a representational code
@@ -2683,14 +2673,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("SubstanceDefinition#SourceMaterial")]
-    [BackboneType("SubstanceDefinition.sourceMaterial")]
+    [FhirType("SubstanceDefinition.sourceMaterial", IsBackboneType=true)]
     public partial class SourceMaterialComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "SubstanceDefinition#SourceMaterial"; } }
+      public override string TypeName { get { return "SubstanceDefinition.sourceMaterial"; } }
 
       /// <summary>
       /// Classification of the origin of the raw material. e.g. cat hair is an Animal source type
diff --git a/src/Hl7.Fhir.R5/Model/Generated/SubstanceNucleicAcid.cs b/src/Hl7.Fhir.R5/Model/Generated/SubstanceNucleicAcid.cs
index 4729713d23..eaa7334187 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/SubstanceNucleicAcid.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/SubstanceNucleicAcid.cs
@@ -61,14 +61,13 @@ public partial class SubstanceNucleicAcid : Hl7.Fhir.Model.DomainResource
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SubstanceNucleicAcid#Subunit")]
-    [BackboneType("SubstanceNucleicAcid.subunit")]
+    [FhirType("SubstanceNucleicAcid.subunit", IsBackboneType=true)]
     public partial class SubunitComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "SubstanceNucleicAcid#Subunit"; } }
+      public override string TypeName { get { return "SubstanceNucleicAcid.subunit"; } }
 
       /// <summary>
       /// Index of linear sequences of nucleic acids in order of decreasing length. Sequences of the same length will be ordered by molecular weight. Subunits that have identical sequences will be repeated and have sequential subscripts
@@ -415,14 +414,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SubstanceNucleicAcid#Linkage")]
-    [BackboneType("SubstanceNucleicAcid.subunit.linkage")]
+    [FhirType("SubstanceNucleicAcid.subunit.linkage", IsBackboneType=true)]
     public partial class LinkageComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "SubstanceNucleicAcid#Linkage"; } }
+      public override string TypeName { get { return "SubstanceNucleicAcid.subunit.linkage"; } }
 
       /// <summary>
       /// The entity that links the sugar residues together should also be captured for nearly all naturally occurring nucleic acid the linkage is a phosphate group. For many synthetic oligonucleotides phosphorothioate linkages are often seen. Linkage connectivity is assumed to be 3’-5’. If the linkage is either 3’-3’ or 5’-5’ this should be specified
@@ -667,14 +665,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SubstanceNucleicAcid#Sugar")]
-    [BackboneType("SubstanceNucleicAcid.subunit.sugar")]
+    [FhirType("SubstanceNucleicAcid.subunit.sugar", IsBackboneType=true)]
     public partial class SugarComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "SubstanceNucleicAcid#Sugar"; } }
+      public override string TypeName { get { return "SubstanceNucleicAcid.subunit.sugar"; } }
 
       /// <summary>
       /// The Substance ID of the sugar or sugar-like component that make up the nucleotide
diff --git a/src/Hl7.Fhir.R5/Model/Generated/SubstancePolymer.cs b/src/Hl7.Fhir.R5/Model/Generated/SubstancePolymer.cs
index 1399d90b21..015d398d4c 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/SubstancePolymer.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/SubstancePolymer.cs
@@ -61,14 +61,13 @@ public partial class SubstancePolymer : Hl7.Fhir.Model.DomainResource, IIdentifi
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SubstancePolymer#MonomerSet")]
-    [BackboneType("SubstancePolymer.monomerSet")]
+    [FhirType("SubstancePolymer.monomerSet", IsBackboneType=true)]
     public partial class MonomerSetComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "SubstancePolymer#MonomerSet"; } }
+      public override string TypeName { get { return "SubstancePolymer.monomerSet"; } }
 
       /// <summary>
       /// Captures the type of ratio to the entire polymer, e.g. Monomer/Polymer ratio, SRU/Polymer Ratio
@@ -210,14 +209,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SubstancePolymer#StartingMaterial")]
-    [BackboneType("SubstancePolymer.monomerSet.startingMaterial")]
+    [FhirType("SubstancePolymer.monomerSet.startingMaterial", IsBackboneType=true)]
     public partial class StartingMaterialComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "SubstancePolymer#StartingMaterial"; } }
+      public override string TypeName { get { return "SubstancePolymer.monomerSet.startingMaterial"; } }
 
       /// <summary>
       /// The type of substance for this starting material
@@ -426,14 +424,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SubstancePolymer#Repeat")]
-    [BackboneType("SubstancePolymer.repeat")]
+    [FhirType("SubstancePolymer.repeat", IsBackboneType=true)]
     public partial class RepeatComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "SubstancePolymer#Repeat"; } }
+      public override string TypeName { get { return "SubstancePolymer.repeat"; } }
 
       /// <summary>
       /// A representation of an (average) molecular formula from a polymer
@@ -618,14 +615,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SubstancePolymer#RepeatUnit")]
-    [BackboneType("SubstancePolymer.repeat.repeatUnit")]
+    [FhirType("SubstancePolymer.repeat.repeatUnit", IsBackboneType=true)]
     public partial class RepeatUnitComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "SubstancePolymer#RepeatUnit"; } }
+      public override string TypeName { get { return "SubstancePolymer.repeat.repeatUnit"; } }
 
       /// <summary>
       /// Structural repeat units are essential elements for defining polymers
@@ -879,14 +875,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SubstancePolymer#DegreeOfPolymerisation")]
-    [BackboneType("SubstancePolymer.repeat.repeatUnit.degreeOfPolymerisation")]
+    [FhirType("SubstancePolymer.repeat.repeatUnit.degreeOfPolymerisation", IsBackboneType=true)]
     public partial class DegreeOfPolymerisationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "SubstancePolymer#DegreeOfPolymerisation"; } }
+      public override string TypeName { get { return "SubstancePolymer.repeat.repeatUnit.degreeOfPolymerisation"; } }
 
       /// <summary>
       /// The type of the degree of polymerisation shall be described, e.g. SRU/Polymer Ratio
@@ -1131,14 +1126,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SubstancePolymer#StructuralRepresentation")]
-    [BackboneType("SubstancePolymer.repeat.repeatUnit.structuralRepresentation")]
+    [FhirType("SubstancePolymer.repeat.repeatUnit.structuralRepresentation", IsBackboneType=true)]
     public partial class StructuralRepresentationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "SubstancePolymer#StructuralRepresentation"; } }
+      public override string TypeName { get { return "SubstancePolymer.repeat.repeatUnit.structuralRepresentation"; } }
 
       /// <summary>
       /// The type of structure (e.g. Full, Partial, Representative)
diff --git a/src/Hl7.Fhir.R5/Model/Generated/SubstanceProtein.cs b/src/Hl7.Fhir.R5/Model/Generated/SubstanceProtein.cs
index 0028b20e93..f53b6b2520 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/SubstanceProtein.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/SubstanceProtein.cs
@@ -61,14 +61,13 @@ public partial class SubstanceProtein : Hl7.Fhir.Model.DomainResource
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SubstanceProtein#Subunit")]
-    [BackboneType("SubstanceProtein.subunit")]
+    [FhirType("SubstanceProtein.subunit", IsBackboneType=true)]
     public partial class SubunitComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "SubstanceProtein#Subunit"; } }
+      public override string TypeName { get { return "SubstanceProtein.subunit"; } }
 
       /// <summary>
       /// Index of primary sequences of amino acids linked through peptide bonds in order of decreasing length. Sequences of the same length will be ordered by molecular weight. Subunits that have identical sequences will be repeated and have sequential subscripts
diff --git a/src/Hl7.Fhir.R5/Model/Generated/SubstanceReferenceInformation.cs b/src/Hl7.Fhir.R5/Model/Generated/SubstanceReferenceInformation.cs
index 1886332c66..ae7662f21b 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/SubstanceReferenceInformation.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/SubstanceReferenceInformation.cs
@@ -61,14 +61,13 @@ public partial class SubstanceReferenceInformation : Hl7.Fhir.Model.DomainResour
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SubstanceReferenceInformation#Gene")]
-    [BackboneType("SubstanceReferenceInformation.gene")]
+    [FhirType("SubstanceReferenceInformation.gene", IsBackboneType=true)]
     public partial class GeneComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "SubstanceReferenceInformation#Gene"; } }
+      public override string TypeName { get { return "SubstanceReferenceInformation.gene"; } }
 
       /// <summary>
       /// Todo
@@ -237,14 +236,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SubstanceReferenceInformation#GeneElement")]
-    [BackboneType("SubstanceReferenceInformation.geneElement")]
+    [FhirType("SubstanceReferenceInformation.geneElement", IsBackboneType=true)]
     public partial class GeneElementComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "SubstanceReferenceInformation#GeneElement"; } }
+      public override string TypeName { get { return "SubstanceReferenceInformation.geneElement"; } }
 
       /// <summary>
       /// Todo
@@ -413,14 +411,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SubstanceReferenceInformation#Target")]
-    [BackboneType("SubstanceReferenceInformation.target")]
+    [FhirType("SubstanceReferenceInformation.target", IsBackboneType=true)]
     public partial class TargetComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "SubstanceReferenceInformation#Target"; } }
+      public override string TypeName { get { return "SubstanceReferenceInformation.target"; } }
 
       /// <summary>
       /// Todo
diff --git a/src/Hl7.Fhir.R5/Model/Generated/SubstanceSourceMaterial.cs b/src/Hl7.Fhir.R5/Model/Generated/SubstanceSourceMaterial.cs
index be74ae1be5..c27876c8f3 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/SubstanceSourceMaterial.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/SubstanceSourceMaterial.cs
@@ -61,14 +61,13 @@ public partial class SubstanceSourceMaterial : Hl7.Fhir.Model.DomainResource
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SubstanceSourceMaterial#FractionDescription")]
-    [BackboneType("SubstanceSourceMaterial.fractionDescription")]
+    [FhirType("SubstanceSourceMaterial.fractionDescription", IsBackboneType=true)]
     public partial class FractionDescriptionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "SubstanceSourceMaterial#FractionDescription"; } }
+      public override string TypeName { get { return "SubstanceSourceMaterial.fractionDescription"; } }
 
       /// <summary>
       /// This element is capturing information about the fraction of a plant part, or human plasma for fractionation
@@ -227,14 +226,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SubstanceSourceMaterial#Organism")]
-    [BackboneType("SubstanceSourceMaterial.organism")]
+    [FhirType("SubstanceSourceMaterial.organism", IsBackboneType=true)]
     public partial class OrganismComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "SubstanceSourceMaterial#Organism"; } }
+      public override string TypeName { get { return "SubstanceSourceMaterial.organism"; } }
 
       /// <summary>
       /// The family of an organism shall be specified
@@ -544,14 +542,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SubstanceSourceMaterial#Author")]
-    [BackboneType("SubstanceSourceMaterial.organism.author")]
+    [FhirType("SubstanceSourceMaterial.organism.author", IsBackboneType=true)]
     public partial class AuthorComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "SubstanceSourceMaterial#Author"; } }
+      public override string TypeName { get { return "SubstanceSourceMaterial.organism.author"; } }
 
       /// <summary>
       /// The type of author of an organism species shall be specified. The parenthetical author of an organism species refers to the first author who published the plant/animal name (of any rank). The primary author of an organism species refers to the first author(s), who validly published the plant/animal name
@@ -710,14 +707,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SubstanceSourceMaterial#Hybrid")]
-    [BackboneType("SubstanceSourceMaterial.organism.hybrid")]
+    [FhirType("SubstanceSourceMaterial.organism.hybrid", IsBackboneType=true)]
     public partial class HybridComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "SubstanceSourceMaterial#Hybrid"; } }
+      public override string TypeName { get { return "SubstanceSourceMaterial.organism.hybrid"; } }
 
       /// <summary>
       /// The identifier of the maternal species constituting the hybrid organism shall be specified based on a controlled vocabulary. For plants, the parents aren’t always known, and it is unlikely that it will be known which is maternal and which is paternal
@@ -1005,14 +1001,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SubstanceSourceMaterial#OrganismGeneral")]
-    [BackboneType("SubstanceSourceMaterial.organism.organismGeneral")]
+    [FhirType("SubstanceSourceMaterial.organism.organismGeneral", IsBackboneType=true)]
     public partial class OrganismGeneralComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "SubstanceSourceMaterial#OrganismGeneral"; } }
+      public override string TypeName { get { return "SubstanceSourceMaterial.organism.organismGeneral"; } }
 
       /// <summary>
       /// The kingdom of an organism shall be specified
@@ -1203,14 +1198,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SubstanceSourceMaterial#PartDescription")]
-    [BackboneType("SubstanceSourceMaterial.partDescription")]
+    [FhirType("SubstanceSourceMaterial.partDescription", IsBackboneType=true)]
     public partial class PartDescriptionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "SubstanceSourceMaterial#PartDescription"; } }
+      public override string TypeName { get { return "SubstanceSourceMaterial.partDescription"; } }
 
       /// <summary>
       /// Entity of anatomical origin of source material within an organism
diff --git a/src/Hl7.Fhir.R5/Model/Generated/SupplyDelivery.cs b/src/Hl7.Fhir.R5/Model/Generated/SupplyDelivery.cs
index 0a54d5f35e..9d1e949242 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/SupplyDelivery.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/SupplyDelivery.cs
@@ -129,14 +129,13 @@ public enum SupplyDeliverySupplyItemType
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("SupplyDelivery#SuppliedItem")]
-    [BackboneType("SupplyDelivery.suppliedItem")]
+    [FhirType("SupplyDelivery.suppliedItem", IsBackboneType=true)]
     public partial class SuppliedItemComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "SupplyDelivery#SuppliedItem"; } }
+      public override string TypeName { get { return "SupplyDelivery.suppliedItem"; } }
 
       /// <summary>
       /// Amount supplied
diff --git a/src/Hl7.Fhir.R5/Model/Generated/SupplyRequest.cs b/src/Hl7.Fhir.R5/Model/Generated/SupplyRequest.cs
index 040628efb2..50a5ca5734 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/SupplyRequest.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/SupplyRequest.cs
@@ -119,14 +119,13 @@ public enum SupplyRequestStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("SupplyRequest#Parameter")]
-    [BackboneType("SupplyRequest.parameter")]
+    [FhirType("SupplyRequest.parameter", IsBackboneType=true)]
     public partial class ParameterComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "SupplyRequest#Parameter"; } }
+      public override string TypeName { get { return "SupplyRequest.parameter"; } }
 
       /// <summary>
       /// Item detail
diff --git a/src/Hl7.Fhir.R5/Model/Generated/Task.cs b/src/Hl7.Fhir.R5/Model/Generated/Task.cs
index f9fe53f9fd..4f86e3763a 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/Task.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/Task.cs
@@ -210,14 +210,13 @@ public enum TaskIntent
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Task#Performer")]
-    [BackboneType("Task.performer")]
+    [FhirType("Task.performer", IsBackboneType=true)]
     public partial class PerformerComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Task#Performer"; } }
+      public override string TypeName { get { return "Task.performer"; } }
 
       /// <summary>
       /// Type of performance
@@ -366,14 +365,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Task#Restriction")]
-    [BackboneType("Task.restriction")]
+    [FhirType("Task.restriction", IsBackboneType=true)]
     public partial class RestrictionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Task#Restriction"; } }
+      public override string TypeName { get { return "Task.restriction"; } }
 
       /// <summary>
       /// How many times to repeat
@@ -563,14 +561,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Task#Input")]
-    [BackboneType("Task.input")]
+    [FhirType("Task.input", IsBackboneType=true)]
     public partial class InputComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Task#Input"; } }
+      public override string TypeName { get { return "Task.input"; } }
 
       /// <summary>
       /// Label for the input
@@ -719,14 +716,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Task#Output")]
-    [BackboneType("Task.output")]
+    [FhirType("Task.output", IsBackboneType=true)]
     public partial class OutputComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Task#Output"; } }
+      public override string TypeName { get { return "Task.output"; } }
 
       /// <summary>
       /// Label for output
diff --git a/src/Hl7.Fhir.R5/Model/Generated/TerminologyCapabilities.cs b/src/Hl7.Fhir.R5/Model/Generated/TerminologyCapabilities.cs
index 617ce5d840..964e3264e6 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/TerminologyCapabilities.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/TerminologyCapabilities.cs
@@ -95,14 +95,13 @@ public enum CodeSearchSupport
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TerminologyCapabilities#Software")]
-    [BackboneType("TerminologyCapabilities.software")]
+    [FhirType("TerminologyCapabilities.software", IsBackboneType=true)]
     public partial class SoftwareComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TerminologyCapabilities#Software"; } }
+      public override string TypeName { get { return "TerminologyCapabilities.software"; } }
 
       /// <summary>
       /// A name the software is known by
@@ -283,14 +282,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TerminologyCapabilities#Implementation")]
-    [BackboneType("TerminologyCapabilities.implementation")]
+    [FhirType("TerminologyCapabilities.implementation", IsBackboneType=true)]
     public partial class ImplementationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TerminologyCapabilities#Implementation"; } }
+      public override string TypeName { get { return "TerminologyCapabilities.implementation"; } }
 
       /// <summary>
       /// Describes this specific instance
@@ -472,14 +470,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TerminologyCapabilities#CodeSystem")]
-    [BackboneType("TerminologyCapabilities.codeSystem")]
+    [FhirType("TerminologyCapabilities.codeSystem", IsBackboneType=true)]
     public partial class CodeSystemComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TerminologyCapabilities#CodeSystem"; } }
+      public override string TypeName { get { return "TerminologyCapabilities.codeSystem"; } }
 
       /// <summary>
       /// Canonical identifier for the code system, represented as a URI
@@ -732,14 +729,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TerminologyCapabilities#Version")]
-    [BackboneType("TerminologyCapabilities.codeSystem.version")]
+    [FhirType("TerminologyCapabilities.codeSystem.version", IsBackboneType=true)]
     public partial class VersionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TerminologyCapabilities#Version"; } }
+      public override string TypeName { get { return "TerminologyCapabilities.codeSystem.version"; } }
 
       /// <summary>
       /// Version identifier for this version
@@ -1075,14 +1071,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("TerminologyCapabilities#Filter")]
-    [BackboneType("TerminologyCapabilities.codeSystem.version.filter")]
+    [FhirType("TerminologyCapabilities.codeSystem.version.filter", IsBackboneType=true)]
     public partial class FilterComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TerminologyCapabilities#Filter"; } }
+      public override string TypeName { get { return "TerminologyCapabilities.codeSystem.version.filter"; } }
 
       /// <summary>
       /// Code of the property supported
@@ -1261,14 +1256,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("TerminologyCapabilities#Expansion")]
-    [BackboneType("TerminologyCapabilities.expansion")]
+    [FhirType("TerminologyCapabilities.expansion", IsBackboneType=true)]
     public partial class ExpansionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TerminologyCapabilities#Expansion"; } }
+      public override string TypeName { get { return "TerminologyCapabilities.expansion"; } }
 
       /// <summary>
       /// Whether the server can return nested value sets
@@ -1557,14 +1551,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("TerminologyCapabilities#Parameter")]
-    [BackboneType("TerminologyCapabilities.expansion.parameter")]
+    [FhirType("TerminologyCapabilities.expansion.parameter", IsBackboneType=true)]
     public partial class ParameterComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TerminologyCapabilities#Parameter"; } }
+      public override string TypeName { get { return "TerminologyCapabilities.expansion.parameter"; } }
 
       /// <summary>
       /// Name of the supported expansion parameter
@@ -1742,14 +1735,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("TerminologyCapabilities#ValidateCode")]
-    [BackboneType("TerminologyCapabilities.validateCode")]
+    [FhirType("TerminologyCapabilities.validateCode", IsBackboneType=true)]
     public partial class ValidateCodeComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TerminologyCapabilities#ValidateCode"; } }
+      public override string TypeName { get { return "TerminologyCapabilities.validateCode"; } }
 
       /// <summary>
       /// Whether translations are validated
@@ -1884,14 +1876,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("TerminologyCapabilities#Translation")]
-    [BackboneType("TerminologyCapabilities.translation")]
+    [FhirType("TerminologyCapabilities.translation", IsBackboneType=true)]
     public partial class TranslationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TerminologyCapabilities#Translation"; } }
+      public override string TypeName { get { return "TerminologyCapabilities.translation"; } }
 
       /// <summary>
       /// Whether the client must identify the map
@@ -2029,14 +2020,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TerminologyCapabilities#Closure")]
-    [BackboneType("TerminologyCapabilities.closure")]
+    [FhirType("TerminologyCapabilities.closure", IsBackboneType=true)]
     public partial class ClosureComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TerminologyCapabilities#Closure"; } }
+      public override string TypeName { get { return "TerminologyCapabilities.closure"; } }
 
       /// <summary>
       /// If cross-system closure is supported
diff --git a/src/Hl7.Fhir.R5/Model/Generated/TestPlan.cs b/src/Hl7.Fhir.R5/Model/Generated/TestPlan.cs
index 41532290f5..e2a5a25651 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/TestPlan.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/TestPlan.cs
@@ -67,14 +67,13 @@ public partial class TestPlan : Hl7.Fhir.Model.DomainResource, IIdentifiable<Lis
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestPlan#Dependency")]
-    [BackboneType("TestPlan.dependency")]
+    [FhirType("TestPlan.dependency", IsBackboneType=true)]
     public partial class DependencyComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TestPlan#Dependency"; } }
+      public override string TypeName { get { return "TestPlan.dependency"; } }
 
       /// <summary>
       /// Description of the dependency criterium
@@ -236,14 +235,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestPlan#TestCase")]
-    [BackboneType("TestPlan.testCase")]
+    [FhirType("TestPlan.testCase", IsBackboneType=true)]
     public partial class TestCaseComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TestPlan#TestCase"; } }
+      public override string TypeName { get { return "TestPlan.testCase"; } }
 
       /// <summary>
       /// Sequence of test case in the test plan
@@ -510,14 +508,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestPlan#TestCaseDependency")]
-    [BackboneType("TestPlan.testCase.dependency")]
+    [FhirType("TestPlan.testCase.dependency", IsBackboneType=true)]
     public partial class TestCaseDependencyComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TestPlan#TestCaseDependency"; } }
+      public override string TypeName { get { return "TestPlan.testCase.dependency"; } }
 
       /// <summary>
       /// Description of the criteria
@@ -676,14 +673,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("TestPlan#TestRun")]
-    [BackboneType("TestPlan.testCase.testRun")]
+    [FhirType("TestPlan.testCase.testRun", IsBackboneType=true)]
     public partial class TestRunComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TestPlan#TestRun"; } }
+      public override string TypeName { get { return "TestPlan.testCase.testRun"; } }
 
       /// <summary>
       /// The narrative description of the tests
@@ -842,14 +838,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("TestPlan#Script")]
-    [BackboneType("TestPlan.testCase.testRun.script")]
+    [FhirType("TestPlan.testCase.testRun.script", IsBackboneType=true)]
     public partial class ScriptComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TestPlan#Script"; } }
+      public override string TypeName { get { return "TestPlan.testCase.testRun.script"; } }
 
       /// <summary>
       /// The language for the test cases e.g. 'gherkin', 'testscript'
@@ -992,14 +987,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("TestPlan#TestData")]
-    [BackboneType("TestPlan.testCase.testData")]
+    [FhirType("TestPlan.testCase.testData", IsBackboneType=true)]
     public partial class TestDataComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TestPlan#TestData"; } }
+      public override string TypeName { get { return "TestPlan.testCase.testData"; } }
 
       /// <summary>
       /// The type of test data description, e.g. 'synthea'
@@ -1171,14 +1165,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestPlan#Assertion")]
-    [BackboneType("TestPlan.testCase.assertion")]
+    [FhirType("TestPlan.testCase.assertion", IsBackboneType=true)]
     public partial class AssertionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TestPlan#Assertion"; } }
+      public override string TypeName { get { return "TestPlan.testCase.assertion"; } }
 
       /// <summary>
       /// Assertion type - for example 'informative' or 'required'
diff --git a/src/Hl7.Fhir.R5/Model/Generated/TestReport.cs b/src/Hl7.Fhir.R5/Model/Generated/TestReport.cs
index bb9f2f6c1c..b0490e5dcb 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/TestReport.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/TestReport.cs
@@ -200,14 +200,13 @@ public enum TestReportActionResult
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("TestReport#Participant")]
-    [BackboneType("TestReport.participant")]
+    [FhirType("TestReport.participant", IsBackboneType=true)]
     public partial class ParticipantComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TestReport#Participant"; } }
+      public override string TypeName { get { return "TestReport.participant"; } }
 
       /// <summary>
       /// test-engine | client | server
@@ -431,14 +430,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("TestReport#Setup")]
-    [BackboneType("TestReport.setup")]
+    [FhirType("TestReport.setup", IsBackboneType=true)]
     public partial class SetupComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TestReport#Setup"; } }
+      public override string TypeName { get { return "TestReport.setup"; } }
 
       /// <summary>
       /// A setup operation or assert that was executed
@@ -559,14 +557,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestReport#SetupAction")]
-    [BackboneType("TestReport.setup.action")]
+    [FhirType("TestReport.setup.action", IsBackboneType=true)]
     public partial class SetupActionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TestReport#SetupAction"; } }
+      public override string TypeName { get { return "TestReport.setup.action"; } }
 
       /// <summary>
       /// The operation to perform
@@ -710,14 +707,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestReport#Operation")]
-    [BackboneType("TestReport.setup.action.operation")]
+    [FhirType("TestReport.setup.action.operation", IsBackboneType=true)]
     public partial class OperationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TestReport#Operation"; } }
+      public override string TypeName { get { return "TestReport.setup.action.operation"; } }
 
       /// <summary>
       /// pass | skip | fail | warning | error
@@ -943,14 +939,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestReport#Assert")]
-    [BackboneType("TestReport.setup.action.assert")]
+    [FhirType("TestReport.setup.action.assert", IsBackboneType=true)]
     public partial class AssertComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TestReport#Assert"; } }
+      public override string TypeName { get { return "TestReport.setup.action.assert"; } }
 
       /// <summary>
       /// pass | skip | fail | warning | error
@@ -1203,14 +1198,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestReport#Requirement")]
-    [BackboneType("TestReport.setup.action.assert.requirement")]
+    [FhirType("TestReport.setup.action.assert.requirement", IsBackboneType=true)]
     public partial class RequirementComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TestReport#Requirement"; } }
+      public override string TypeName { get { return "TestReport.setup.action.assert.requirement"; } }
 
       /// <summary>
       /// Link or reference to the testing requirement
@@ -1328,14 +1322,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("TestReport#Test")]
-    [BackboneType("TestReport.test")]
+    [FhirType("TestReport.test", IsBackboneType=true)]
     public partial class TestComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TestReport#Test"; } }
+      public override string TypeName { get { return "TestReport.test"; } }
 
       /// <summary>
       /// Tracking/logging name of this test
@@ -1542,14 +1535,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestReport#TestAction")]
-    [BackboneType("TestReport.test.action")]
+    [FhirType("TestReport.test.action", IsBackboneType=true)]
     public partial class TestActionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TestReport#TestAction"; } }
+      public override string TypeName { get { return "TestReport.test.action"; } }
 
       /// <summary>
       /// The operation performed
@@ -1693,14 +1685,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestReport#Teardown")]
-    [BackboneType("TestReport.teardown")]
+    [FhirType("TestReport.teardown", IsBackboneType=true)]
     public partial class TeardownComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TestReport#Teardown"; } }
+      public override string TypeName { get { return "TestReport.teardown"; } }
 
       /// <summary>
       /// One or more teardown operations performed
@@ -1821,14 +1812,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestReport#TeardownAction")]
-    [BackboneType("TestReport.teardown.action")]
+    [FhirType("TestReport.teardown.action", IsBackboneType=true)]
     public partial class TeardownActionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TestReport#TeardownAction"; } }
+      public override string TypeName { get { return "TestReport.teardown.action"; } }
 
       /// <summary>
       /// The teardown operation performed
diff --git a/src/Hl7.Fhir.R5/Model/Generated/TestScript.cs b/src/Hl7.Fhir.R5/Model/Generated/TestScript.cs
index ffd79f215d..d67360c274 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/TestScript.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/TestScript.cs
@@ -532,14 +532,13 @@ public enum AssertionResponseTypes
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#Origin")]
-    [BackboneType("TestScript.origin")]
+    [FhirType("TestScript.origin", IsBackboneType=true)]
     public partial class OriginComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TestScript#Origin"; } }
+      public override string TypeName { get { return "TestScript.origin"; } }
 
       /// <summary>
       /// The index of the abstract origin server starting at 1
@@ -748,14 +747,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#Destination")]
-    [BackboneType("TestScript.destination")]
+    [FhirType("TestScript.destination", IsBackboneType=true)]
     public partial class DestinationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TestScript#Destination"; } }
+      public override string TypeName { get { return "TestScript.destination"; } }
 
       /// <summary>
       /// The index of the abstract destination server starting at 1
@@ -963,14 +961,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#Metadata")]
-    [BackboneType("TestScript.metadata")]
+    [FhirType("TestScript.metadata", IsBackboneType=true)]
     public partial class MetadataComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TestScript#Metadata"; } }
+      public override string TypeName { get { return "TestScript.metadata"; } }
 
       /// <summary>
       /// Links to the FHIR specification
@@ -1116,14 +1113,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#Link")]
-    [BackboneType("TestScript.metadata.link")]
+    [FhirType("TestScript.metadata.link", IsBackboneType=true)]
     public partial class LinkComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TestScript#Link"; } }
+      public override string TypeName { get { return "TestScript.metadata.link"; } }
 
       /// <summary>
       /// URL to the specification
@@ -1305,14 +1301,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#Capability")]
-    [BackboneType("TestScript.metadata.capability")]
+    [FhirType("TestScript.metadata.capability", IsBackboneType=true)]
     public partial class CapabilityComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TestScript#Capability"; } }
+      public override string TypeName { get { return "TestScript.metadata.capability"; } }
 
       /// <summary>
       /// Are the capabilities required?
@@ -1712,14 +1707,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#Scope")]
-    [BackboneType("TestScript.scope")]
+    [FhirType("TestScript.scope", IsBackboneType=true)]
     public partial class ScopeComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TestScript#Scope"; } }
+      public override string TypeName { get { return "TestScript.scope"; } }
 
       /// <summary>
       /// The specific conformance artifact being tested
@@ -1909,14 +1903,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#Fixture")]
-    [BackboneType("TestScript.fixture")]
+    [FhirType("TestScript.fixture", IsBackboneType=true)]
     public partial class FixtureComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TestScript#Fixture"; } }
+      public override string TypeName { get { return "TestScript.fixture"; } }
 
       /// <summary>
       /// Whether or not to implicitly create the fixture during setup
@@ -2126,14 +2119,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#Variable")]
-    [BackboneType("TestScript.variable")]
+    [FhirType("TestScript.variable", IsBackboneType=true)]
     public partial class VariableComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TestScript#Variable"; } }
+      public override string TypeName { get { return "TestScript.variable"; } }
 
       /// <summary>
       /// Descriptive name for this variable
@@ -2569,14 +2561,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#Setup")]
-    [BackboneType("TestScript.setup")]
+    [FhirType("TestScript.setup", IsBackboneType=true)]
     public partial class SetupComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TestScript#Setup"; } }
+      public override string TypeName { get { return "TestScript.setup"; } }
 
       /// <summary>
       /// A setup operation or assert to perform
@@ -2697,14 +2688,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#SetupAction")]
-    [BackboneType("TestScript.setup.action")]
+    [FhirType("TestScript.setup.action", IsBackboneType=true)]
     public partial class SetupActionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TestScript#SetupAction"; } }
+      public override string TypeName { get { return "TestScript.setup.action"; } }
 
       /// <summary>
       /// The setup operation to perform
@@ -2848,14 +2838,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#Operation")]
-    [BackboneType("TestScript.setup.action.operation")]
+    [FhirType("TestScript.setup.action.operation", IsBackboneType=true)]
     public partial class OperationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TestScript#Operation"; } }
+      public override string TypeName { get { return "TestScript.setup.action.operation"; } }
 
       /// <summary>
       /// The operation code type that will be executed
@@ -3653,14 +3642,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#RequestHeader")]
-    [BackboneType("TestScript.setup.action.operation.requestHeader")]
+    [FhirType("TestScript.setup.action.operation.requestHeader", IsBackboneType=true)]
     public partial class RequestHeaderComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TestScript#RequestHeader"; } }
+      public override string TypeName { get { return "TestScript.setup.action.operation.requestHeader"; } }
 
       /// <summary>
       /// HTTP header field name
@@ -3843,14 +3831,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#Assert")]
-    [BackboneType("TestScript.setup.action.assert")]
+    [FhirType("TestScript.setup.action.assert", IsBackboneType=true)]
     public partial class AssertComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TestScript#Assert"; } }
+      public override string TypeName { get { return "TestScript.setup.action.assert"; } }
 
       /// <summary>
       /// Tracking/logging assertion label
@@ -5017,14 +5004,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#Requirement")]
-    [BackboneType("TestScript.setup.action.assert.requirement")]
+    [FhirType("TestScript.setup.action.assert.requirement", IsBackboneType=true)]
     public partial class RequirementComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TestScript#Requirement"; } }
+      public override string TypeName { get { return "TestScript.setup.action.assert.requirement"; } }
 
       /// <summary>
       /// Link or reference to the testing requirement
@@ -5142,14 +5128,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#Test")]
-    [BackboneType("TestScript.test")]
+    [FhirType("TestScript.test", IsBackboneType=true)]
     public partial class TestComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TestScript#Test"; } }
+      public override string TypeName { get { return "TestScript.test"; } }
 
       /// <summary>
       /// Tracking/logging name of this test
@@ -5356,14 +5341,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#TestAction")]
-    [BackboneType("TestScript.test.action")]
+    [FhirType("TestScript.test.action", IsBackboneType=true)]
     public partial class TestActionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TestScript#TestAction"; } }
+      public override string TypeName { get { return "TestScript.test.action"; } }
 
       /// <summary>
       /// The setup operation to perform
@@ -5507,14 +5491,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#Teardown")]
-    [BackboneType("TestScript.teardown")]
+    [FhirType("TestScript.teardown", IsBackboneType=true)]
     public partial class TeardownComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TestScript#Teardown"; } }
+      public override string TypeName { get { return "TestScript.teardown"; } }
 
       /// <summary>
       /// One or more teardown operations to perform
@@ -5635,14 +5618,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#TeardownAction")]
-    [BackboneType("TestScript.teardown.action")]
+    [FhirType("TestScript.teardown.action", IsBackboneType=true)]
     public partial class TeardownActionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TestScript#TeardownAction"; } }
+      public override string TypeName { get { return "TestScript.teardown.action"; } }
 
       /// <summary>
       /// The teardown operation to perform
diff --git a/src/Hl7.Fhir.R5/Model/Generated/Timing.cs b/src/Hl7.Fhir.R5/Model/Generated/Timing.cs
index 5502d7a6d2..46cafff927 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/Timing.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/Timing.cs
@@ -293,14 +293,13 @@ public enum EventTiming
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Timing#Repeat")]
-    [BackboneType("Timing.repeat")]
+    [FhirType("Timing.repeat", IsBackboneType=true)]
     public partial class RepeatComponent : Hl7.Fhir.Model.Element
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Timing#Repeat"; } }
+      public override string TypeName { get { return "Timing.repeat"; } }
 
       /// <summary>
       /// Length/Range of lengths, or (Start and/or end) limits
diff --git a/src/Hl7.Fhir.R5/Model/Generated/Transport.cs b/src/Hl7.Fhir.R5/Model/Generated/Transport.cs
index f4aef6aa8e..ee6113df0b 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/Transport.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/Transport.cs
@@ -177,14 +177,13 @@ public enum TransportIntent
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Transport#Restriction")]
-    [BackboneType("Transport.restriction")]
+    [FhirType("Transport.restriction", IsBackboneType=true)]
     public partial class RestrictionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Transport#Restriction"; } }
+      public override string TypeName { get { return "Transport.restriction"; } }
 
       /// <summary>
       /// How many times to repeat
@@ -374,14 +373,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Transport#Parameter")]
-    [BackboneType("Transport.input")]
+    [FhirType("Transport.input", IsBackboneType=true)]
     public partial class ParameterComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Transport#Parameter"; } }
+      public override string TypeName { get { return "Transport.input"; } }
 
       /// <summary>
       /// Label for the input
@@ -530,14 +528,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Transport#Output")]
-    [BackboneType("Transport.output")]
+    [FhirType("Transport.output", IsBackboneType=true)]
     public partial class OutputComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Transport#Output"; } }
+      public override string TypeName { get { return "Transport.output"; } }
 
       /// <summary>
       /// Label for output
diff --git a/src/Hl7.Fhir.R5/Model/Generated/VerificationResult.cs b/src/Hl7.Fhir.R5/Model/Generated/VerificationResult.cs
index f9f0dff305..bc3dffba68 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/VerificationResult.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/VerificationResult.cs
@@ -113,14 +113,13 @@ public enum StatusCode
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("VerificationResult#PrimarySource")]
-    [BackboneType("VerificationResult.primarySource")]
+    [FhirType("VerificationResult.primarySource", IsBackboneType=true)]
     public partial class PrimarySourceComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "VerificationResult#PrimarySource"; } }
+      public override string TypeName { get { return "VerificationResult.primarySource"; } }
 
       /// <summary>
       /// Reference to the primary source
@@ -414,14 +413,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("VerificationResult#Attestation")]
-    [BackboneType("VerificationResult.attestation")]
+    [FhirType("VerificationResult.attestation", IsBackboneType=true)]
     public partial class AttestationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "VerificationResult#Attestation"; } }
+      public override string TypeName { get { return "VerificationResult.attestation"; } }
 
       /// <summary>
       /// The individual or organization attesting to information
@@ -771,14 +769,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("VerificationResult#Validator")]
-    [BackboneType("VerificationResult.validator")]
+    [FhirType("VerificationResult.validator", IsBackboneType=true)]
     public partial class ValidatorComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "VerificationResult#Validator"; } }
+      public override string TypeName { get { return "VerificationResult.validator"; } }
 
       /// <summary>
       /// Reference to the organization validating information
diff --git a/src/Hl7.Fhir.R5/Model/Generated/VisionPrescription.cs b/src/Hl7.Fhir.R5/Model/Generated/VisionPrescription.cs
index 317b6339fe..d97523ed97 100644
--- a/src/Hl7.Fhir.R5/Model/Generated/VisionPrescription.cs
+++ b/src/Hl7.Fhir.R5/Model/Generated/VisionPrescription.cs
@@ -123,14 +123,13 @@ public enum VisionBase
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("VisionPrescription#LensSpecification")]
-    [BackboneType("VisionPrescription.lensSpecification")]
+    [FhirType("VisionPrescription.lensSpecification", IsBackboneType=true)]
     public partial class LensSpecificationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "VisionPrescription#LensSpecification"; } }
+      public override string TypeName { get { return "VisionPrescription.lensSpecification"; } }
 
       /// <summary>
       /// Product to be supplied
@@ -761,14 +760,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("VisionPrescription#Prism")]
-    [BackboneType("VisionPrescription.lensSpecification.prism")]
+    [FhirType("VisionPrescription.lensSpecification.prism", IsBackboneType=true)]
     public partial class PrismComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "VisionPrescription#Prism"; } }
+      public override string TypeName { get { return "VisionPrescription.lensSpecification.prism"; } }
 
       /// <summary>
       /// Amount of adjustment
diff --git a/src/Hl7.Fhir.STU3.Tests/Model/ValidateAllExamplesSearchExtractionTest.cs b/src/Hl7.Fhir.STU3.Tests/Model/ValidateAllExamplesSearchExtractionTest.cs
index 0ddb477ff2..9b6ebe23c9 100644
--- a/src/Hl7.Fhir.STU3.Tests/Model/ValidateAllExamplesSearchExtractionTest.cs
+++ b/src/Hl7.Fhir.STU3.Tests/Model/ValidateAllExamplesSearchExtractionTest.cs
@@ -154,7 +154,7 @@ private static void ExtractExamplesFromResource(Dictionary<ModelInfo.SearchParam
 
             try
             {
-                var results = resourceModel.Select(index.Expression, new EvaluationContext(resourceModel));
+                var results = resourceModel.Select(index.Expression, new EvaluationContext());
                 if (results.Count() > 0)
                 {
                     foreach (var t2 in results)
@@ -195,4 +195,4 @@ private static void ExtractExamplesFromResource(Dictionary<ModelInfo.SearchParam
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/Hl7.Fhir.STU3.Tests/Validation/SearchDataExtraction.cs b/src/Hl7.Fhir.STU3.Tests/Validation/SearchDataExtraction.cs
index d0637007cf..c31e05c4c3 100644
--- a/src/Hl7.Fhir.STU3.Tests/Validation/SearchDataExtraction.cs
+++ b/src/Hl7.Fhir.STU3.Tests/Validation/SearchDataExtraction.cs
@@ -130,7 +130,7 @@ private static void ExtractValuesForSearchParameterFromFile(Dictionary<string, i
 
         private static void ExtractExamplesFromResource(Dictionary<string, int> exampleSearchValues, Resource resource, ModelInfo.SearchParamDefinition index, string key)
         {
-            var results = resource.Select(index.Expression, new FhirEvaluationContext(resource.ToTypedElement()));
+            var results = resource.Select(index.Expression, new FhirEvaluationContext());
             if (results.Any())
             {
                 // we perform the Select on a Poco, because then we get the FHIR dialect of FhirPath as well.
@@ -170,4 +170,4 @@ private static void ExtractExamplesFromResource(Dictionary<string, int> exampleS
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Account.cs b/src/Hl7.Fhir.STU3/Model/Generated/Account.cs
index 5a6d93a53e..4832c9169d 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/Account.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/Account.cs
@@ -97,14 +97,13 @@ public enum AccountStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Account#Coverage")]
-    [BackboneType("Account.coverage")]
+    [FhirType("Account.coverage", IsBackboneType=true)]
     public partial class CoverageComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Account#Coverage"; } }
+      public override string TypeName { get { return "Account.coverage"; } }
 
       /// <summary>
       /// The party(s) that are responsible for covering the payment of this account
@@ -269,14 +268,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Account#Guarantor")]
-    [BackboneType("Account.guarantor")]
+    [FhirType("Account.guarantor", IsBackboneType=true)]
     public partial class GuarantorComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Account#Guarantor"; } }
+      public override string TypeName { get { return "Account.guarantor"; } }
 
       /// <summary>
       /// Responsible entity
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/ActivityDefinition.cs b/src/Hl7.Fhir.STU3/Model/Generated/ActivityDefinition.cs
index 8f04f50563..3a13d19e83 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/ActivityDefinition.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/ActivityDefinition.cs
@@ -67,14 +67,13 @@ public partial class ActivityDefinition : Hl7.Fhir.Model.DomainResource, IIdenti
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ActivityDefinition#Participant")]
-    [BackboneType("ActivityDefinition.participant")]
+    [FhirType("ActivityDefinition.participant", IsBackboneType=true)]
     public partial class ParticipantComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ActivityDefinition#Participant"; } }
+      public override string TypeName { get { return "ActivityDefinition.participant"; } }
 
       /// <summary>
       /// patient | practitioner | related-person
@@ -240,14 +239,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ActivityDefinition#DynamicValue")]
-    [BackboneType("ActivityDefinition.dynamicValue")]
+    [FhirType("ActivityDefinition.dynamicValue", IsBackboneType=true)]
     public partial class DynamicValueComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ActivityDefinition#DynamicValue"; } }
+      public override string TypeName { get { return "ActivityDefinition.dynamicValue"; } }
 
       /// <summary>
       /// Natural language description of the dynamic value
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/AdverseEvent.cs b/src/Hl7.Fhir.STU3/Model/Generated/AdverseEvent.cs
index bfade3e6e7..64674076e8 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/AdverseEvent.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/AdverseEvent.cs
@@ -157,14 +157,13 @@ public enum AdverseEventCausality
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("AdverseEvent#SuspectEntity")]
-    [BackboneType("AdverseEvent.suspectEntity")]
+    [FhirType("AdverseEvent.suspectEntity", IsBackboneType=true)]
     public partial class SuspectEntityComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "AdverseEvent#SuspectEntity"; } }
+      public override string TypeName { get { return "AdverseEvent.suspectEntity"; } }
 
       /// <summary>
       /// Refers to the specific entity that caused the adverse event
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/AllergyIntolerance.cs b/src/Hl7.Fhir.STU3/Model/Generated/AllergyIntolerance.cs
index 38ac7e8081..a06d428679 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/AllergyIntolerance.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/AllergyIntolerance.cs
@@ -242,14 +242,13 @@ public enum AllergyIntoleranceSeverity
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("AllergyIntolerance#Reaction")]
-    [BackboneType("AllergyIntolerance.reaction")]
+    [FhirType("AllergyIntolerance.reaction", IsBackboneType=true)]
     public partial class ReactionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "AllergyIntolerance#Reaction"; } }
+      public override string TypeName { get { return "AllergyIntolerance.reaction"; } }
 
       /// <summary>
       /// Specific substance or pharmaceutical product considered to be responsible for event
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Appointment.cs b/src/Hl7.Fhir.STU3/Model/Generated/Appointment.cs
index c40a7c0425..578aa01bc8 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/Appointment.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/Appointment.cs
@@ -150,14 +150,13 @@ public enum ParticipantRequired
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Appointment#Participant")]
-    [BackboneType("Appointment.participant")]
+    [FhirType("Appointment.participant", IsBackboneType=true)]
     public partial class ParticipantComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Appointment#Participant"; } }
+      public override string TypeName { get { return "Appointment.participant"; } }
 
       /// <summary>
       /// Role of participant in the appointment
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/AuditEvent.cs b/src/Hl7.Fhir.STU3/Model/Generated/AuditEvent.cs
index f7693aa891..c7e76a0029 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/AuditEvent.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/AuditEvent.cs
@@ -184,14 +184,13 @@ public enum AuditEventAgentNetworkType
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("AuditEvent#Agent")]
-    [BackboneType("AuditEvent.agent")]
+    [FhirType("AuditEvent.agent", IsBackboneType=true)]
     public partial class AgentComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "AuditEvent#Agent"; } }
+      public override string TypeName { get { return "AuditEvent.agent"; } }
 
       /// <summary>
       /// Agent role in the event
@@ -643,14 +642,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("AuditEvent#Network")]
-    [BackboneType("AuditEvent.agent.network")]
+    [FhirType("AuditEvent.agent.network", IsBackboneType=true)]
     public partial class NetworkComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "AuditEvent#Network"; } }
+      public override string TypeName { get { return "AuditEvent.agent.network"; } }
 
       /// <summary>
       /// Identifier for the network access point of the user device
@@ -833,14 +831,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("AuditEvent#Source")]
-    [BackboneType("AuditEvent.source")]
+    [FhirType("AuditEvent.source", IsBackboneType=true)]
     public partial class SourceComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "AuditEvent#Source"; } }
+      public override string TypeName { get { return "AuditEvent.source"; } }
 
       /// <summary>
       /// Logical source location within the enterprise
@@ -1031,14 +1028,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("AuditEvent#Entity")]
-    [BackboneType("AuditEvent.entity")]
+    [FhirType("AuditEvent.entity", IsBackboneType=true)]
     public partial class EntityComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "AuditEvent#Entity"; } }
+      public override string TypeName { get { return "AuditEvent.entity"; } }
 
       /// <summary>
       /// Specific instance of object
@@ -1444,14 +1440,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("AuditEvent#Detail")]
-    [BackboneType("AuditEvent.entity.detail")]
+    [FhirType("AuditEvent.entity.detail", IsBackboneType=true)]
     public partial class DetailComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "AuditEvent#Detail"; } }
+      public override string TypeName { get { return "AuditEvent.entity.detail"; } }
 
       /// <summary>
       /// Name of the property
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/CapabilityStatement.cs b/src/Hl7.Fhir.STU3/Model/Generated/CapabilityStatement.cs
index 19d4df229b..eabadf2588 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/CapabilityStatement.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/CapabilityStatement.cs
@@ -423,14 +423,13 @@ public enum DocumentMode
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CapabilityStatement#Software")]
-    [BackboneType("CapabilityStatement.software")]
+    [FhirType("CapabilityStatement.software", IsBackboneType=true)]
     public partial class SoftwareComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "CapabilityStatement#Software"; } }
+      public override string TypeName { get { return "CapabilityStatement.software"; } }
 
       /// <summary>
       /// A name the software is known by
@@ -654,14 +653,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CapabilityStatement#Implementation")]
-    [BackboneType("CapabilityStatement.implementation")]
+    [FhirType("CapabilityStatement.implementation", IsBackboneType=true)]
     public partial class ImplementationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "CapabilityStatement#Implementation"; } }
+      public override string TypeName { get { return "CapabilityStatement.implementation"; } }
 
       /// <summary>
       /// Describes this specific instance
@@ -845,14 +843,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CapabilityStatement#Rest")]
-    [BackboneType("CapabilityStatement.rest")]
+    [FhirType("CapabilityStatement.rest", IsBackboneType=true)]
     public partial class RestComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "CapabilityStatement#Rest"; } }
+      public override string TypeName { get { return "CapabilityStatement.rest"; } }
 
       /// <summary>
       /// client | server
@@ -1208,14 +1205,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CapabilityStatement#Security")]
-    [BackboneType("CapabilityStatement.rest.security")]
+    [FhirType("CapabilityStatement.rest.security", IsBackboneType=true)]
     public partial class SecurityComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "CapabilityStatement#Security"; } }
+      public override string TypeName { get { return "CapabilityStatement.rest.security"; } }
 
       /// <summary>
       /// Adds CORS Headers (http://enable-cors.org/)
@@ -1445,14 +1441,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("CapabilityStatement#Certificate")]
-    [BackboneType("CapabilityStatement.rest.security.certificate")]
+    [FhirType("CapabilityStatement.rest.security.certificate", IsBackboneType=true)]
     public partial class CertificateComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "CapabilityStatement#Certificate"; } }
+      public override string TypeName { get { return "CapabilityStatement.rest.security.certificate"; } }
 
       /// <summary>
       /// Mime type for certificates
@@ -1634,14 +1629,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CapabilityStatement#Resource")]
-    [BackboneType("CapabilityStatement.rest.resource")]
+    [FhirType("CapabilityStatement.rest.resource", IsBackboneType=true)]
     public partial class ResourceComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "CapabilityStatement#Resource"; } }
+      public override string TypeName { get { return "CapabilityStatement.rest.resource"; } }
 
       /// <summary>
       /// A resource type that is supported
@@ -2344,14 +2338,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CapabilityStatement#ResourceInteraction")]
-    [BackboneType("CapabilityStatement.rest.resource.interaction")]
+    [FhirType("CapabilityStatement.rest.resource.interaction", IsBackboneType=true)]
     public partial class ResourceInteractionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "CapabilityStatement#ResourceInteraction"; } }
+      public override string TypeName { get { return "CapabilityStatement.rest.resource.interaction"; } }
 
       /// <summary>
       /// read | vread | update | patch | delete | history-instance | history-type | create | search-type
@@ -2534,14 +2527,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CapabilityStatement#SearchParam")]
-    [BackboneType("CapabilityStatement.rest.resource.searchParam")]
+    [FhirType("CapabilityStatement.rest.resource.searchParam", IsBackboneType=true)]
     public partial class SearchParamComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "CapabilityStatement#SearchParam"; } }
+      public override string TypeName { get { return "CapabilityStatement.rest.resource.searchParam"; } }
 
       /// <summary>
       /// Name of search parameter
@@ -2811,14 +2803,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CapabilityStatement#SystemInteraction")]
-    [BackboneType("CapabilityStatement.rest.interaction")]
+    [FhirType("CapabilityStatement.rest.interaction", IsBackboneType=true)]
     public partial class SystemInteractionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "CapabilityStatement#SystemInteraction"; } }
+      public override string TypeName { get { return "CapabilityStatement.rest.interaction"; } }
 
       /// <summary>
       /// transaction | batch | search-system | history-system
@@ -3001,14 +2992,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CapabilityStatement#Operation")]
-    [BackboneType("CapabilityStatement.rest.operation")]
+    [FhirType("CapabilityStatement.rest.operation", IsBackboneType=true)]
     public partial class OperationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "CapabilityStatement#Operation"; } }
+      public override string TypeName { get { return "CapabilityStatement.rest.operation"; } }
 
       /// <summary>
       /// Name by which the operation/query is invoked
@@ -3175,14 +3165,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CapabilityStatement#Messaging")]
-    [BackboneType("CapabilityStatement.messaging")]
+    [FhirType("CapabilityStatement.messaging", IsBackboneType=true)]
     public partial class MessagingComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "CapabilityStatement#Messaging"; } }
+      public override string TypeName { get { return "CapabilityStatement.messaging"; } }
 
       /// <summary>
       /// Where messages should be sent
@@ -3440,14 +3429,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CapabilityStatement#Endpoint")]
-    [BackboneType("CapabilityStatement.messaging.endpoint")]
+    [FhirType("CapabilityStatement.messaging.endpoint", IsBackboneType=true)]
     public partial class EndpointComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "CapabilityStatement#Endpoint"; } }
+      public override string TypeName { get { return "CapabilityStatement.messaging.endpoint"; } }
 
       /// <summary>
       /// http | ftp | mllp +
@@ -3613,14 +3601,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CapabilityStatement#SupportedMessage")]
-    [BackboneType("CapabilityStatement.messaging.supportedMessage")]
+    [FhirType("CapabilityStatement.messaging.supportedMessage", IsBackboneType=true)]
     public partial class SupportedMessageComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "CapabilityStatement#SupportedMessage"; } }
+      public override string TypeName { get { return "CapabilityStatement.messaging.supportedMessage"; } }
 
       /// <summary>
       /// sender | receiver
@@ -3789,14 +3776,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CapabilityStatement#Event")]
-    [BackboneType("CapabilityStatement.messaging.event")]
+    [FhirType("CapabilityStatement.messaging.event", IsBackboneType=true)]
     public partial class EventComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "CapabilityStatement#Event"; } }
+      public override string TypeName { get { return "CapabilityStatement.messaging.event"; } }
 
       /// <summary>
       /// Event type
@@ -4153,14 +4139,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CapabilityStatement#Document")]
-    [BackboneType("CapabilityStatement.document")]
+    [FhirType("CapabilityStatement.document", IsBackboneType=true)]
     public partial class DocumentComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "CapabilityStatement#Document"; } }
+      public override string TypeName { get { return "CapabilityStatement.document"; } }
 
       /// <summary>
       /// producer | consumer
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/CarePlan.cs b/src/Hl7.Fhir.STU3/Model/Generated/CarePlan.cs
index dcee8bbb35..31ebd76427 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/CarePlan.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/CarePlan.cs
@@ -205,14 +205,13 @@ public enum CarePlanActivityStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CarePlan#Activity")]
-    [BackboneType("CarePlan.activity")]
+    [FhirType("CarePlan.activity", IsBackboneType=true)]
     public partial class ActivityComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "CarePlan#Activity"; } }
+      public override string TypeName { get { return "CarePlan.activity"; } }
 
       /// <summary>
       /// Results of the activity
@@ -439,14 +438,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CarePlan#Detail")]
-    [BackboneType("CarePlan.activity.detail")]
+    [FhirType("CarePlan.activity.detail", IsBackboneType=true)]
     public partial class DetailComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "CarePlan#Detail"; } }
+      public override string TypeName { get { return "CarePlan.activity.detail"; } }
 
       /// <summary>
       /// diet | drug | encounter | observation | procedure | supply | other
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/CareTeam.cs b/src/Hl7.Fhir.STU3/Model/Generated/CareTeam.cs
index b479cbaa2f..89c50968da 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/CareTeam.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/CareTeam.cs
@@ -107,14 +107,13 @@ public enum CareTeamStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CareTeam#Participant")]
-    [BackboneType("CareTeam.participant")]
+    [FhirType("CareTeam.participant", IsBackboneType=true)]
     public partial class ParticipantComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "CareTeam#Participant"; } }
+      public override string TypeName { get { return "CareTeam.participant"; } }
 
       /// <summary>
       /// Type of involvement
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/ChargeItem.cs b/src/Hl7.Fhir.STU3/Model/Generated/ChargeItem.cs
index 3a471c47a0..3f7ac8818e 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/ChargeItem.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/ChargeItem.cs
@@ -119,14 +119,13 @@ public enum ChargeItemStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ChargeItem#Participant")]
-    [BackboneType("ChargeItem.participant")]
+    [FhirType("ChargeItem.participant", IsBackboneType=true)]
     public partial class ParticipantComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ChargeItem#Participant"; } }
+      public override string TypeName { get { return "ChargeItem.participant"; } }
 
       /// <summary>
       /// What type of performance was done
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Claim.cs b/src/Hl7.Fhir.STU3/Model/Generated/Claim.cs
index 0446e4dbe9..ed9e8c96a8 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/Claim.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/Claim.cs
@@ -101,14 +101,13 @@ public enum ClaimUseCode
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Claim#RelatedClaim")]
-    [BackboneType("Claim.related")]
+    [FhirType("Claim.related", IsBackboneType=true)]
     public partial class RelatedClaimComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Claim#RelatedClaim"; } }
+      public override string TypeName { get { return "Claim.related"; } }
 
       /// <summary>
       /// Reference to the related claim
@@ -280,14 +279,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Claim#Payee")]
-    [BackboneType("Claim.payee")]
+    [FhirType("Claim.payee", IsBackboneType=true)]
     public partial class PayeeComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Claim#Payee"; } }
+      public override string TypeName { get { return "Claim.payee"; } }
 
       /// <summary>
       /// Type of party: Subscriber, Provider, other
@@ -461,14 +459,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Claim#CareTeam")]
-    [BackboneType("Claim.careTeam")]
+    [FhirType("Claim.careTeam", IsBackboneType=true)]
     public partial class CareTeamComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Claim#CareTeam"; } }
+      public override string TypeName { get { return "Claim.careTeam"; } }
 
       /// <summary>
       /// Number to covey order of careTeam
@@ -729,14 +726,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Claim#SpecialCondition")]
-    [BackboneType("Claim.information")]
+    [FhirType("Claim.information", IsBackboneType=true)]
     public partial class SpecialConditionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Claim#SpecialCondition"; } }
+      public override string TypeName { get { return "Claim.information"; } }
 
       /// <summary>
       /// Information instance identifier
@@ -1008,14 +1004,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Claim#Diagnosis")]
-    [BackboneType("Claim.diagnosis")]
+    [FhirType("Claim.diagnosis", IsBackboneType=true)]
     public partial class DiagnosisComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Claim#Diagnosis"; } }
+      public override string TypeName { get { return "Claim.diagnosis"; } }
 
       /// <summary>
       /// Number to covey order of diagnosis
@@ -1236,14 +1231,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Claim#Procedure")]
-    [BackboneType("Claim.procedure")]
+    [FhirType("Claim.procedure", IsBackboneType=true)]
     public partial class ProcedureComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Claim#Procedure"; } }
+      public override string TypeName { get { return "Claim.procedure"; } }
 
       /// <summary>
       /// Procedure sequence for reference
@@ -1454,14 +1448,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Claim#Insurance")]
-    [BackboneType("Claim.insurance")]
+    [FhirType("Claim.insurance", IsBackboneType=true)]
     public partial class InsuranceComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Claim#Insurance"; } }
+      public override string TypeName { get { return "Claim.insurance"; } }
 
       /// <summary>
       /// Service instance identifier
@@ -1785,14 +1778,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Claim#Accident")]
-    [BackboneType("Claim.accident")]
+    [FhirType("Claim.accident", IsBackboneType=true)]
     public partial class AccidentComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Claim#Accident"; } }
+      public override string TypeName { get { return "Claim.accident"; } }
 
       /// <summary>
       /// When the accident occurred
@@ -1988,14 +1980,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Claim#Item")]
-    [BackboneType("Claim.item")]
+    [FhirType("Claim.item", IsBackboneType=true)]
     public partial class ItemComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Claim#Item"; } }
+      public override string TypeName { get { return "Claim.item"; } }
 
       /// <summary>
       /// Service instance
@@ -2750,14 +2741,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Claim#Detail")]
-    [BackboneType("Claim.item.detail")]
+    [FhirType("Claim.item.detail", IsBackboneType=true)]
     public partial class DetailComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Claim#Detail"; } }
+      public override string TypeName { get { return "Claim.item.detail"; } }
 
       /// <summary>
       /// Service instance
@@ -3199,14 +3189,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Claim#SubDetail")]
-    [BackboneType("Claim.item.detail.subDetail")]
+    [FhirType("Claim.item.detail.subDetail", IsBackboneType=true)]
     public partial class SubDetailComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Claim#SubDetail"; } }
+      public override string TypeName { get { return "Claim.item.detail.subDetail"; } }
 
       /// <summary>
       /// Service instance
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/ClaimResponse.cs b/src/Hl7.Fhir.STU3/Model/Generated/ClaimResponse.cs
index 803a7cd149..d27c7a9047 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/ClaimResponse.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/ClaimResponse.cs
@@ -67,14 +67,13 @@ public partial class ClaimResponse : Hl7.Fhir.Model.DomainResource, IIdentifiabl
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ClaimResponse#Item")]
-    [BackboneType("ClaimResponse.item")]
+    [FhirType("ClaimResponse.item", IsBackboneType=true)]
     public partial class ItemComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ClaimResponse#Item"; } }
+      public override string TypeName { get { return "ClaimResponse.item"; } }
 
       /// <summary>
       /// Service instance
@@ -308,14 +307,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ClaimResponse#Adjudication")]
-    [BackboneType("ClaimResponse.item.adjudication")]
+    [FhirType("ClaimResponse.item.adjudication", IsBackboneType=true)]
     public partial class AdjudicationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ClaimResponse#Adjudication"; } }
+      public override string TypeName { get { return "ClaimResponse.item.adjudication"; } }
 
       /// <summary>
       /// Adjudication category such as co-pay, eligible, benefit, etc.
@@ -530,14 +528,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ClaimResponse#ItemDetail")]
-    [BackboneType("ClaimResponse.item.detail")]
+    [FhirType("ClaimResponse.item.detail", IsBackboneType=true)]
     public partial class ItemDetailComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ClaimResponse#ItemDetail"; } }
+      public override string TypeName { get { return "ClaimResponse.item.detail"; } }
 
       /// <summary>
       /// Service instance
@@ -771,14 +768,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ClaimResponse#SubDetail")]
-    [BackboneType("ClaimResponse.item.detail.subDetail")]
+    [FhirType("ClaimResponse.item.detail.subDetail", IsBackboneType=true)]
     public partial class SubDetailComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ClaimResponse#SubDetail"; } }
+      public override string TypeName { get { return "ClaimResponse.item.detail.subDetail"; } }
 
       /// <summary>
       /// Service instance
@@ -986,14 +982,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ClaimResponse#AddedItem")]
-    [BackboneType("ClaimResponse.addItem")]
+    [FhirType("ClaimResponse.addItem", IsBackboneType=true)]
     public partial class AddedItemComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ClaimResponse#AddedItem"; } }
+      public override string TypeName { get { return "ClaimResponse.addItem"; } }
 
       /// <summary>
       /// Service instances
@@ -1357,14 +1352,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ClaimResponse#AddedItemsDetail")]
-    [BackboneType("ClaimResponse.addItem.detail")]
+    [FhirType("ClaimResponse.addItem.detail", IsBackboneType=true)]
     public partial class AddedItemsDetailComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ClaimResponse#AddedItemsDetail"; } }
+      public override string TypeName { get { return "ClaimResponse.addItem.detail"; } }
 
       /// <summary>
       /// Revenue or cost center code
@@ -1658,14 +1652,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ClaimResponse#Error")]
-    [BackboneType("ClaimResponse.error")]
+    [FhirType("ClaimResponse.error", IsBackboneType=true)]
     public partial class ErrorComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ClaimResponse#Error"; } }
+      public override string TypeName { get { return "ClaimResponse.error"; } }
 
       /// <summary>
       /// Item sequence number
@@ -1915,14 +1908,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ClaimResponse#Payment")]
-    [BackboneType("ClaimResponse.payment")]
+    [FhirType("ClaimResponse.payment", IsBackboneType=true)]
     public partial class PaymentComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ClaimResponse#Payment"; } }
+      public override string TypeName { get { return "ClaimResponse.payment"; } }
 
       /// <summary>
       /// Partial or Complete
@@ -2186,14 +2178,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ClaimResponse#Note")]
-    [BackboneType("ClaimResponse.processNote")]
+    [FhirType("ClaimResponse.processNote", IsBackboneType=true)]
     public partial class NoteComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ClaimResponse#Note"; } }
+      public override string TypeName { get { return "ClaimResponse.processNote"; } }
 
       /// <summary>
       /// Sequence Number for this note
@@ -2425,14 +2416,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ClaimResponse#Insurance")]
-    [BackboneType("ClaimResponse.insurance")]
+    [FhirType("ClaimResponse.insurance", IsBackboneType=true)]
     public partial class InsuranceComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ClaimResponse#Insurance"; } }
+      public override string TypeName { get { return "ClaimResponse.insurance"; } }
 
       /// <summary>
       /// Service instance identifier
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/ClinicalImpression.cs b/src/Hl7.Fhir.STU3/Model/Generated/ClinicalImpression.cs
index 8a650ff6f9..d01a2e0c23 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/ClinicalImpression.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/ClinicalImpression.cs
@@ -95,14 +95,13 @@ public enum ClinicalImpressionStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ClinicalImpression#Investigation")]
-    [BackboneType("ClinicalImpression.investigation")]
+    [FhirType("ClinicalImpression.investigation", IsBackboneType=true)]
     public partial class InvestigationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ClinicalImpression#Investigation"; } }
+      public override string TypeName { get { return "ClinicalImpression.investigation"; } }
 
       /// <summary>
       /// A name/code for the set
@@ -251,14 +250,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ClinicalImpression#Finding")]
-    [BackboneType("ClinicalImpression.finding")]
+    [FhirType("ClinicalImpression.finding", IsBackboneType=true)]
     public partial class FindingComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ClinicalImpression#Finding"; } }
+      public override string TypeName { get { return "ClinicalImpression.finding"; } }
 
       /// <summary>
       /// What was found
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/CodeSystem.cs b/src/Hl7.Fhir.STU3/Model/Generated/CodeSystem.cs
index c9aadd057f..dd18243709 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/CodeSystem.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/CodeSystem.cs
@@ -181,14 +181,13 @@ public enum PropertyType
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CodeSystem#Filter")]
-    [BackboneType("CodeSystem.filter")]
+    [FhirType("CodeSystem.filter", IsBackboneType=true)]
     public partial class FilterComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "CodeSystem#Filter"; } }
+      public override string TypeName { get { return "CodeSystem.filter"; } }
 
       /// <summary>
       /// Code that identifies the filter
@@ -459,14 +458,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CodeSystem#Property")]
-    [BackboneType("CodeSystem.property")]
+    [FhirType("CodeSystem.property", IsBackboneType=true)]
     public partial class PropertyComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "CodeSystem#Property"; } }
+      public override string TypeName { get { return "CodeSystem.property"; } }
 
       /// <summary>
       /// Identifies the property on the concepts, and when referred to in operations
@@ -737,14 +735,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CodeSystem#ConceptDefinition")]
-    [BackboneType("CodeSystem.concept")]
+    [FhirType("CodeSystem.concept", IsBackboneType=true)]
     public partial class ConceptDefinitionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "CodeSystem#ConceptDefinition"; } }
+      public override string TypeName { get { return "CodeSystem.concept"; } }
 
       /// <summary>
       /// Code that identifies concept
@@ -1046,14 +1043,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CodeSystem#Designation")]
-    [BackboneType("CodeSystem.concept.designation")]
+    [FhirType("CodeSystem.concept.designation", IsBackboneType=true)]
     public partial class DesignationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "CodeSystem#Designation"; } }
+      public override string TypeName { get { return "CodeSystem.concept.designation"; } }
 
       /// <summary>
       /// Human language of the designation
@@ -1261,14 +1257,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CodeSystem#ConceptProperty")]
-    [BackboneType("CodeSystem.concept.property")]
+    [FhirType("CodeSystem.concept.property", IsBackboneType=true)]
     public partial class ConceptPropertyComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "CodeSystem#ConceptProperty"; } }
+      public override string TypeName { get { return "CodeSystem.concept.property"; } }
 
       /// <summary>
       /// Reference to CodeSystem.property.code
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Communication.cs b/src/Hl7.Fhir.STU3/Model/Generated/Communication.cs
index 0bd83e4f86..7adb3980be 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/Communication.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/Communication.cs
@@ -67,14 +67,13 @@ public partial class Communication : Hl7.Fhir.Model.DomainResource, IIdentifiabl
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Communication#Payload")]
-    [BackboneType("Communication.payload")]
+    [FhirType("Communication.payload", IsBackboneType=true)]
     public partial class PayloadComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Communication#Payload"; } }
+      public override string TypeName { get { return "Communication.payload"; } }
 
       /// <summary>
       /// Message part content
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/CommunicationRequest.cs b/src/Hl7.Fhir.STU3/Model/Generated/CommunicationRequest.cs
index 737f8ca6ef..840b5ec975 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/CommunicationRequest.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/CommunicationRequest.cs
@@ -67,14 +67,13 @@ public partial class CommunicationRequest : Hl7.Fhir.Model.DomainResource, IIden
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CommunicationRequest#Payload")]
-    [BackboneType("CommunicationRequest.payload")]
+    [FhirType("CommunicationRequest.payload", IsBackboneType=true)]
     public partial class PayloadComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "CommunicationRequest#Payload"; } }
+      public override string TypeName { get { return "CommunicationRequest.payload"; } }
 
       /// <summary>
       /// Message part content
@@ -197,14 +196,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CommunicationRequest#Requester")]
-    [BackboneType("CommunicationRequest.requester")]
+    [FhirType("CommunicationRequest.requester", IsBackboneType=true)]
     public partial class RequesterComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "CommunicationRequest#Requester"; } }
+      public override string TypeName { get { return "CommunicationRequest.requester"; } }
 
       /// <summary>
       /// Individual making the request
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/CompartmentDefinition.cs b/src/Hl7.Fhir.STU3/Model/Generated/CompartmentDefinition.cs
index 9ac6048d1b..c591b78a2c 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/CompartmentDefinition.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/CompartmentDefinition.cs
@@ -68,14 +68,13 @@ public partial class CompartmentDefinition : Hl7.Fhir.Model.DomainResource
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("CompartmentDefinition#Resource")]
-    [BackboneType("CompartmentDefinition.resource")]
+    [FhirType("CompartmentDefinition.resource", IsBackboneType=true)]
     public partial class ResourceComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "CompartmentDefinition#Resource"; } }
+      public override string TypeName { get { return "CompartmentDefinition.resource"; } }
 
       /// <summary>
       /// Name of resource type
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Composition.cs b/src/Hl7.Fhir.STU3/Model/Generated/Composition.cs
index 6d9f8b1188..c99b4deb68 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/Composition.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/Composition.cs
@@ -166,14 +166,13 @@ public enum CompositionAttestationMode
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Composition#Attester")]
-    [BackboneType("Composition.attester")]
+    [FhirType("Composition.attester", IsBackboneType=true)]
     public partial class AttesterComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Composition#Attester"; } }
+      public override string TypeName { get { return "Composition.attester"; } }
 
       /// <summary>
       /// personal | professional | legal | official
@@ -384,14 +383,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Composition#RelatesTo")]
-    [BackboneType("Composition.relatesTo")]
+    [FhirType("Composition.relatesTo", IsBackboneType=true)]
     public partial class RelatesToComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Composition#RelatesTo"; } }
+      public override string TypeName { get { return "Composition.relatesTo"; } }
 
       /// <summary>
       /// replaces | transforms | signs | appends
@@ -561,14 +559,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Composition#Event")]
-    [BackboneType("Composition.event")]
+    [FhirType("Composition.event", IsBackboneType=true)]
     public partial class EventComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Composition#Event"; } }
+      public override string TypeName { get { return "Composition.event"; } }
 
       /// <summary>
       /// Code(s) that apply to the event being documented
@@ -742,14 +739,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Composition#Section")]
-    [BackboneType("Composition.section")]
+    [FhirType("Composition.section", IsBackboneType=true)]
     public partial class SectionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Composition#Section"; } }
+      public override string TypeName { get { return "Composition.section"; } }
 
       /// <summary>
       /// Label for section (e.g. for ToC)
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/ConceptMap.cs b/src/Hl7.Fhir.STU3/Model/Generated/ConceptMap.cs
index 63ce29d58e..e5ac9484a6 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/ConceptMap.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/ConceptMap.cs
@@ -165,14 +165,13 @@ public enum ConceptMapGroupUnmappedMode
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ConceptMap#Group")]
-    [BackboneType("ConceptMap.group")]
+    [FhirType("ConceptMap.group", IsBackboneType=true)]
     public partial class GroupComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ConceptMap#Group"; } }
+      public override string TypeName { get { return "ConceptMap.group"; } }
 
       /// <summary>
       /// Code System (if value set crosses code systems)
@@ -490,14 +489,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ConceptMap#SourceElement")]
-    [BackboneType("ConceptMap.group.element")]
+    [FhirType("ConceptMap.group.element", IsBackboneType=true)]
     public partial class SourceElementComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ConceptMap#SourceElement"; } }
+      public override string TypeName { get { return "ConceptMap.group.element"; } }
 
       /// <summary>
       /// Identifies element being mapped
@@ -704,14 +702,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ConceptMap#TargetElement")]
-    [BackboneType("ConceptMap.group.element.target")]
+    [FhirType("ConceptMap.group.element.target", IsBackboneType=true)]
     public partial class TargetElementComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ConceptMap#TargetElement"; } }
+      public override string TypeName { get { return "ConceptMap.group.element.target"; } }
 
       /// <summary>
       /// Code that identifies the target element
@@ -1031,14 +1028,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ConceptMap#OtherElement")]
-    [BackboneType("ConceptMap.group.element.target.dependsOn")]
+    [FhirType("ConceptMap.group.element.target.dependsOn", IsBackboneType=true)]
     public partial class OtherElementComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ConceptMap#OtherElement"; } }
+      public override string TypeName { get { return "ConceptMap.group.element.target.dependsOn"; } }
 
       /// <summary>
       /// Reference to property mapping depends on
@@ -1307,14 +1303,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ConceptMap#Unmapped")]
-    [BackboneType("ConceptMap.group.unmapped")]
+    [FhirType("ConceptMap.group.unmapped", IsBackboneType=true)]
     public partial class UnmappedComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ConceptMap#Unmapped"; } }
+      public override string TypeName { get { return "ConceptMap.group.unmapped"; } }
 
       /// <summary>
       /// provided | fixed | other-map
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Condition.cs b/src/Hl7.Fhir.STU3/Model/Generated/Condition.cs
index 7d01e4a3cd..28b4997bd3 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/Condition.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/Condition.cs
@@ -153,14 +153,13 @@ public enum ConditionVerificationStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Condition#Stage")]
-    [BackboneType("Condition.stage")]
+    [FhirType("Condition.stage", IsBackboneType=true)]
     public partial class StageComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Condition#Stage"; } }
+      public override string TypeName { get { return "Condition.stage"; } }
 
       /// <summary>
       /// Simple summary (disease specific)
@@ -309,14 +308,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Condition#Evidence")]
-    [BackboneType("Condition.evidence")]
+    [FhirType("Condition.evidence", IsBackboneType=true)]
     public partial class EvidenceComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Condition#Evidence"; } }
+      public override string TypeName { get { return "Condition.evidence"; } }
 
       /// <summary>
       /// Manifestation/symptom
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Consent.cs b/src/Hl7.Fhir.STU3/Model/Generated/Consent.cs
index e7040d2cc6..027f4a0114 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/Consent.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/Consent.cs
@@ -170,14 +170,13 @@ public enum ConsentExceptType
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Consent#Actor")]
-    [BackboneType("Consent.actor")]
+    [FhirType("Consent.actor", IsBackboneType=true)]
     public partial class ActorComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Consent#Actor"; } }
+      public override string TypeName { get { return "Consent.actor"; } }
 
       /// <summary>
       /// How the actor is involved
@@ -326,14 +325,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Consent#Policy")]
-    [BackboneType("Consent.policy")]
+    [FhirType("Consent.policy", IsBackboneType=true)]
     public partial class PolicyComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Consent#Policy"; } }
+      public override string TypeName { get { return "Consent.policy"; } }
 
       /// <summary>
       /// Enforcement source for policy
@@ -513,14 +511,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Consent#Data")]
-    [BackboneType("Consent.data")]
+    [FhirType("Consent.data", IsBackboneType=true)]
     public partial class DataComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Consent#Data"; } }
+      public override string TypeName { get { return "Consent.data"; } }
 
       /// <summary>
       /// instance | related | dependents | authoredby
@@ -688,14 +685,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Consent#Except")]
-    [BackboneType("Consent.except")]
+    [FhirType("Consent.except", IsBackboneType=true)]
     public partial class ExceptComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Consent#Except"; } }
+      public override string TypeName { get { return "Consent.except"; } }
 
       /// <summary>
       /// deny | permit
@@ -1072,14 +1068,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Consent#ExceptActor")]
-    [BackboneType("Consent.except.actor")]
+    [FhirType("Consent.except.actor", IsBackboneType=true)]
     public partial class ExceptActorComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Consent#ExceptActor"; } }
+      public override string TypeName { get { return "Consent.except.actor"; } }
 
       /// <summary>
       /// How the actor is involved
@@ -1228,14 +1223,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Consent#ExceptData")]
-    [BackboneType("Consent.except.data")]
+    [FhirType("Consent.except.data", IsBackboneType=true)]
     public partial class ExceptDataComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Consent#ExceptData"; } }
+      public override string TypeName { get { return "Consent.except.data"; } }
 
       /// <summary>
       /// instance | related | dependents | authoredby
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Contract.cs b/src/Hl7.Fhir.STU3/Model/Generated/Contract.cs
index 4dd258f046..a5f6773141 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/Contract.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/Contract.cs
@@ -169,14 +169,13 @@ public enum ContractResourceStatusCodes
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Contract#Agent")]
-    [BackboneType("Contract.agent")]
+    [FhirType("Contract.agent", IsBackboneType=true)]
     public partial class AgentComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Contract#Agent"; } }
+      public override string TypeName { get { return "Contract.agent"; } }
 
       /// <summary>
       /// Contract Agent Type
@@ -327,14 +326,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Contract#Signatory")]
-    [BackboneType("Contract.signer")]
+    [FhirType("Contract.signer", IsBackboneType=true)]
     public partial class SignatoryComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Contract#Signatory"; } }
+      public override string TypeName { get { return "Contract.signer"; } }
 
       /// <summary>
       /// Contract Signatory Role
@@ -506,14 +504,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Contract#ValuedItem")]
-    [BackboneType("Contract.valuedItem")]
+    [FhirType("Contract.valuedItem", IsBackboneType=true)]
     public partial class ValuedItemComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Contract#ValuedItem"; } }
+      public override string TypeName { get { return "Contract.valuedItem"; } }
 
       /// <summary>
       /// Contract Valued Item Type
@@ -864,14 +861,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Contract#Term")]
-    [BackboneType("Contract.term")]
+    [FhirType("Contract.term", IsBackboneType=true)]
     public partial class TermComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Contract#Term"; } }
+      public override string TypeName { get { return "Contract.term"; } }
 
       /// <summary>
       /// Contract Term Number
@@ -1342,14 +1338,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Contract#TermAgent")]
-    [BackboneType("Contract.term.agent")]
+    [FhirType("Contract.term.agent", IsBackboneType=true)]
     public partial class TermAgentComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Contract#TermAgent"; } }
+      public override string TypeName { get { return "Contract.term.agent"; } }
 
       /// <summary>
       /// Contract Term Agent Subject
@@ -1498,14 +1493,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Contract#TermValuedItem")]
-    [BackboneType("Contract.term.valuedItem")]
+    [FhirType("Contract.term.valuedItem", IsBackboneType=true)]
     public partial class TermValuedItemComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Contract#TermValuedItem"; } }
+      public override string TypeName { get { return "Contract.term.valuedItem"; } }
 
       /// <summary>
       /// Contract Term Valued Item Type
@@ -1856,14 +1850,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Contract#FriendlyLanguage")]
-    [BackboneType("Contract.friendly")]
+    [FhirType("Contract.friendly", IsBackboneType=true)]
     public partial class FriendlyLanguageComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Contract#FriendlyLanguage"; } }
+      public override string TypeName { get { return "Contract.friendly"; } }
 
       /// <summary>
       /// Easily comprehended representation of this Contract
@@ -1986,14 +1979,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Contract#LegalLanguage")]
-    [BackboneType("Contract.legal")]
+    [FhirType("Contract.legal", IsBackboneType=true)]
     public partial class LegalLanguageComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Contract#LegalLanguage"; } }
+      public override string TypeName { get { return "Contract.legal"; } }
 
       /// <summary>
       /// Contract Legal Text
@@ -2116,14 +2108,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Contract#ComputableLanguage")]
-    [BackboneType("Contract.rule")]
+    [FhirType("Contract.rule", IsBackboneType=true)]
     public partial class ComputableLanguageComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Contract#ComputableLanguage"; } }
+      public override string TypeName { get { return "Contract.rule"; } }
 
       /// <summary>
       /// Computable Contract Rules
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Coverage.cs b/src/Hl7.Fhir.STU3/Model/Generated/Coverage.cs
index c63a153332..5fb168cc7c 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/Coverage.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/Coverage.cs
@@ -67,14 +67,13 @@ public partial class Coverage : Hl7.Fhir.Model.DomainResource, IIdentifiable<Lis
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Coverage#Group")]
-    [BackboneType("Coverage.grouping")]
+    [FhirType("Coverage.grouping", IsBackboneType=true)]
     public partial class GroupComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Coverage#Group"; } }
+      public override string TypeName { get { return "Coverage.grouping"; } }
 
       /// <summary>
       /// An identifier for the group
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/DataElement.cs b/src/Hl7.Fhir.STU3/Model/Generated/DataElement.cs
index 143e1d31ad..fb3ba46c58 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/DataElement.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/DataElement.cs
@@ -114,14 +114,13 @@ public enum DataElementStringency
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("DataElement#Mapping")]
-    [BackboneType("DataElement.mapping")]
+    [FhirType("DataElement.mapping", IsBackboneType=true)]
     public partial class MappingComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "DataElement#Mapping"; } }
+      public override string TypeName { get { return "DataElement.mapping"; } }
 
       /// <summary>
       /// Internal id when this mapping is used
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/DataRequirement.cs b/src/Hl7.Fhir.STU3/Model/Generated/DataRequirement.cs
index bfcdad2dc9..bc5588b83a 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/DataRequirement.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/DataRequirement.cs
@@ -67,14 +67,13 @@ public partial class DataRequirement : Hl7.Fhir.Model.DataType
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("DataRequirement#CodeFilter")]
-    [BackboneType("DataRequirement.codeFilter")]
+    [FhirType("DataRequirement.codeFilter", IsBackboneType=true)]
     public partial class CodeFilterComponent : Hl7.Fhir.Model.Element
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "DataRequirement#CodeFilter"; } }
+      public override string TypeName { get { return "DataRequirement.codeFilter"; } }
 
       /// <summary>
       /// The code-valued attribute of the filter
@@ -336,14 +335,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("DataRequirement#DateFilter")]
-    [BackboneType("DataRequirement.dateFilter")]
+    [FhirType("DataRequirement.dateFilter", IsBackboneType=true)]
     public partial class DateFilterComponent : Hl7.Fhir.Model.Element
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "DataRequirement#DateFilter"; } }
+      public override string TypeName { get { return "DataRequirement.dateFilter"; } }
 
       /// <summary>
       /// The date-valued attribute of the filter
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/DetectedIssue.cs b/src/Hl7.Fhir.STU3/Model/Generated/DetectedIssue.cs
index 369967f798..9565c5185e 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/DetectedIssue.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/DetectedIssue.cs
@@ -95,14 +95,13 @@ public enum DetectedIssueSeverity
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("DetectedIssue#Mitigation")]
-    [BackboneType("DetectedIssue.mitigation")]
+    [FhirType("DetectedIssue.mitigation", IsBackboneType=true)]
     public partial class MitigationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "DetectedIssue#Mitigation"; } }
+      public override string TypeName { get { return "DetectedIssue.mitigation"; } }
 
       /// <summary>
       /// What mitigation?
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Device.cs b/src/Hl7.Fhir.STU3/Model/Generated/Device.cs
index a2edf3b2d5..5580aaa184 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/Device.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/Device.cs
@@ -148,14 +148,13 @@ public enum UDIEntryType
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Device#Udi")]
-    [BackboneType("Device.udi")]
+    [FhirType("Device.udi", IsBackboneType=true)]
     public partial class UdiComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Device#Udi"; } }
+      public override string TypeName { get { return "Device.udi"; } }
 
       /// <summary>
       /// Mandatory fixed portion of UDI
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/DeviceComponent.cs b/src/Hl7.Fhir.STU3/Model/Generated/DeviceComponent.cs
index 63da91edda..d68d619928 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/DeviceComponent.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/DeviceComponent.cs
@@ -144,14 +144,13 @@ public enum MeasmntPrinciple
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("DeviceComponent#ProductionSpecification")]
-    [BackboneType("DeviceComponent.productionSpecification")]
+    [FhirType("DeviceComponent.productionSpecification", IsBackboneType=true)]
     public partial class ProductionSpecificationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "DeviceComponent#ProductionSpecification"; } }
+      public override string TypeName { get { return "DeviceComponent.productionSpecification"; } }
 
       /// <summary>
       /// Type or kind of production specification, for example serial number or software revision
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/DeviceMetric.cs b/src/Hl7.Fhir.STU3/Model/Generated/DeviceMetric.cs
index 649c297f51..5fc6135d83 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/DeviceMetric.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/DeviceMetric.cs
@@ -259,14 +259,13 @@ public enum DeviceMetricCalibrationState
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("DeviceMetric#Calibration")]
-    [BackboneType("DeviceMetric.calibration")]
+    [FhirType("DeviceMetric.calibration", IsBackboneType=true)]
     public partial class CalibrationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "DeviceMetric#Calibration"; } }
+      public override string TypeName { get { return "DeviceMetric.calibration"; } }
 
       /// <summary>
       /// unspecified | offset | gain | two-point
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/DeviceRequest.cs b/src/Hl7.Fhir.STU3/Model/Generated/DeviceRequest.cs
index 342fcb3dc8..63893be528 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/DeviceRequest.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/DeviceRequest.cs
@@ -67,14 +67,13 @@ public partial class DeviceRequest : Hl7.Fhir.Model.DomainResource, IIdentifiabl
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("DeviceRequest#Requester")]
-    [BackboneType("DeviceRequest.requester")]
+    [FhirType("DeviceRequest.requester", IsBackboneType=true)]
     public partial class RequesterComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "DeviceRequest#Requester"; } }
+      public override string TypeName { get { return "DeviceRequest.requester"; } }
 
       /// <summary>
       /// Individual making the request
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/DiagnosticReport.cs b/src/Hl7.Fhir.STU3/Model/Generated/DiagnosticReport.cs
index f4d85fd823..1d6a6d1edb 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/DiagnosticReport.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/DiagnosticReport.cs
@@ -138,14 +138,13 @@ public enum DiagnosticReportStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("DiagnosticReport#Performer")]
-    [BackboneType("DiagnosticReport.performer")]
+    [FhirType("DiagnosticReport.performer", IsBackboneType=true)]
     public partial class PerformerComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "DiagnosticReport#Performer"; } }
+      public override string TypeName { get { return "DiagnosticReport.performer"; } }
 
       /// <summary>
       /// Type of performer
@@ -293,14 +292,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("DiagnosticReport#Image")]
-    [BackboneType("DiagnosticReport.image")]
+    [FhirType("DiagnosticReport.image", IsBackboneType=true)]
     public partial class ImageComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "DiagnosticReport#Image"; } }
+      public override string TypeName { get { return "DiagnosticReport.image"; } }
 
       /// <summary>
       /// Comment about the image (e.g. explanation)
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/DocumentManifest.cs b/src/Hl7.Fhir.STU3/Model/Generated/DocumentManifest.cs
index 1cbe314184..3ff6f9ff2e 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/DocumentManifest.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/DocumentManifest.cs
@@ -67,14 +67,13 @@ public partial class DocumentManifest : Hl7.Fhir.Model.DomainResource, IIdentifi
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("DocumentManifest#Content")]
-    [BackboneType("DocumentManifest.content")]
+    [FhirType("DocumentManifest.content", IsBackboneType=true)]
     public partial class ContentComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "DocumentManifest#Content"; } }
+      public override string TypeName { get { return "DocumentManifest.content"; } }
 
       /// <summary>
       /// Contents of this set of documents
@@ -198,14 +197,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("DocumentManifest#Related")]
-    [BackboneType("DocumentManifest.related")]
+    [FhirType("DocumentManifest.related", IsBackboneType=true)]
     public partial class RelatedComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "DocumentManifest#Related"; } }
+      public override string TypeName { get { return "DocumentManifest.related"; } }
 
       /// <summary>
       /// Identifiers of things that are related
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/DocumentReference.cs b/src/Hl7.Fhir.STU3/Model/Generated/DocumentReference.cs
index 53354cac1b..12a01d891e 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/DocumentReference.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/DocumentReference.cs
@@ -68,14 +68,13 @@ public partial class DocumentReference : Hl7.Fhir.Model.DomainResource, IIdentif
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("DocumentReference#RelatesTo")]
-    [BackboneType("DocumentReference.relatesTo")]
+    [FhirType("DocumentReference.relatesTo", IsBackboneType=true)]
     public partial class RelatesToComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "DocumentReference#RelatesTo"; } }
+      public override string TypeName { get { return "DocumentReference.relatesTo"; } }
 
       /// <summary>
       /// replaces | transforms | signs | appends
@@ -243,14 +242,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("DocumentReference#Content")]
-    [BackboneType("DocumentReference.content")]
+    [FhirType("DocumentReference.content", IsBackboneType=true)]
     public partial class ContentComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "DocumentReference#Content"; } }
+      public override string TypeName { get { return "DocumentReference.content"; } }
 
       /// <summary>
       /// Where to access the document
@@ -397,14 +395,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("DocumentReference#Context")]
-    [BackboneType("DocumentReference.context")]
+    [FhirType("DocumentReference.context", IsBackboneType=true)]
     public partial class ContextComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "DocumentReference#Context"; } }
+      public override string TypeName { get { return "DocumentReference.context"; } }
 
       /// <summary>
       /// Context of the document  content
@@ -683,14 +680,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("DocumentReference#Related")]
-    [BackboneType("DocumentReference.context.related")]
+    [FhirType("DocumentReference.context.related", IsBackboneType=true)]
     public partial class RelatedComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "DocumentReference#Related"; } }
+      public override string TypeName { get { return "DocumentReference.context.related"; } }
 
       /// <summary>
       /// Identifier of related objects or events
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/ElementDefinition.cs b/src/Hl7.Fhir.STU3/Model/Generated/ElementDefinition.cs
index 39ba192698..5d3fdcc191 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/ElementDefinition.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/ElementDefinition.cs
@@ -254,14 +254,13 @@ public enum ConstraintSeverity
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ElementDefinition#Slicing")]
-    [BackboneType("ElementDefinition.slicing")]
+    [FhirType("ElementDefinition.slicing", IsBackboneType=true)]
     public partial class SlicingComponent : Hl7.Fhir.Model.Element
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ElementDefinition#Slicing"; } }
+      public override string TypeName { get { return "ElementDefinition.slicing"; } }
 
       /// <summary>
       /// Element values that are used to distinguish the slices
@@ -514,14 +513,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ElementDefinition#Discriminator")]
-    [BackboneType("ElementDefinition.slicing.discriminator")]
+    [FhirType("ElementDefinition.slicing.discriminator", IsBackboneType=true)]
     public partial class DiscriminatorComponent : Hl7.Fhir.Model.Element
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ElementDefinition#Discriminator"; } }
+      public override string TypeName { get { return "ElementDefinition.slicing.discriminator"; } }
 
       /// <summary>
       /// value | exists | pattern | type | profile
@@ -706,14 +704,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ElementDefinition#Base")]
-    [BackboneType("ElementDefinition.base")]
+    [FhirType("ElementDefinition.base", IsBackboneType=true)]
     public partial class BaseComponent : Hl7.Fhir.Model.Element
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ElementDefinition#Base"; } }
+      public override string TypeName { get { return "ElementDefinition.base"; } }
 
       /// <summary>
       /// Path that identifies the base element
@@ -940,14 +937,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ElementDefinition#TypeRef")]
-    [BackboneType("ElementDefinition.type")]
+    [FhirType("ElementDefinition.type", IsBackboneType=true)]
     public partial class TypeRefComponent : Hl7.Fhir.Model.Element
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ElementDefinition#TypeRef"; } }
+      public override string TypeName { get { return "ElementDefinition.type"; } }
 
       /// <summary>
       /// Data type or Resource (reference to definition)
@@ -1264,14 +1260,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ElementDefinition#Example")]
-    [BackboneType("ElementDefinition.example")]
+    [FhirType("ElementDefinition.example", IsBackboneType=true)]
     public partial class ExampleComponent : Hl7.Fhir.Model.Element
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ElementDefinition#Example"; } }
+      public override string TypeName { get { return "ElementDefinition.example"; } }
 
       /// <summary>
       /// Describes the purpose of this example
@@ -1438,14 +1433,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ElementDefinition#Constraint")]
-    [BackboneType("ElementDefinition.constraint")]
+    [FhirType("ElementDefinition.constraint", IsBackboneType=true)]
     public partial class ConstraintComponent : Hl7.Fhir.Model.Element
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ElementDefinition#Constraint"; } }
+      public override string TypeName { get { return "ElementDefinition.constraint"; } }
 
       /// <summary>
       /// Target of 'condition' reference above
@@ -1850,14 +1844,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ElementDefinition#ElementDefinitionBinding")]
-    [BackboneType("ElementDefinition.binding")]
+    [FhirType("ElementDefinition.binding", IsBackboneType=true)]
     public partial class ElementDefinitionBindingComponent : Hl7.Fhir.Model.Element
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ElementDefinition#ElementDefinitionBinding"; } }
+      public override string TypeName { get { return "ElementDefinition.binding"; } }
 
       /// <summary>
       /// required | extensible | preferred | example
@@ -2071,14 +2064,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ElementDefinition#Mapping")]
-    [BackboneType("ElementDefinition.mapping")]
+    [FhirType("ElementDefinition.mapping", IsBackboneType=true)]
     public partial class MappingComponent : Hl7.Fhir.Model.Element
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ElementDefinition#Mapping"; } }
+      public override string TypeName { get { return "ElementDefinition.mapping"; } }
 
       /// <summary>
       /// Reference to mapping declaration
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/EligibilityResponse.cs b/src/Hl7.Fhir.STU3/Model/Generated/EligibilityResponse.cs
index 399f855261..7d1eca272c 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/EligibilityResponse.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/EligibilityResponse.cs
@@ -67,14 +67,13 @@ public partial class EligibilityResponse : Hl7.Fhir.Model.DomainResource, IIdent
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("EligibilityResponse#Insurance")]
-    [BackboneType("EligibilityResponse.insurance")]
+    [FhirType("EligibilityResponse.insurance", IsBackboneType=true)]
     public partial class InsuranceComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "EligibilityResponse#Insurance"; } }
+      public override string TypeName { get { return "EligibilityResponse.insurance"; } }
 
       /// <summary>
       /// Updated Coverage details
@@ -248,14 +247,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("EligibilityResponse#Benefits")]
-    [BackboneType("EligibilityResponse.insurance.benefitBalance")]
+    [FhirType("EligibilityResponse.insurance.benefitBalance", IsBackboneType=true)]
     public partial class BenefitsComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "EligibilityResponse#Benefits"; } }
+      public override string TypeName { get { return "EligibilityResponse.insurance.benefitBalance"; } }
 
       /// <summary>
       /// Type of services covered
@@ -635,14 +633,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("EligibilityResponse#Benefit")]
-    [BackboneType("EligibilityResponse.insurance.benefitBalance.financial")]
+    [FhirType("EligibilityResponse.insurance.benefitBalance.financial", IsBackboneType=true)]
     public partial class BenefitComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "EligibilityResponse#Benefit"; } }
+      public override string TypeName { get { return "EligibilityResponse.insurance.benefitBalance.financial"; } }
 
       /// <summary>
       /// Deductable, visits, benefit amount
@@ -817,14 +814,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("EligibilityResponse#Errors")]
-    [BackboneType("EligibilityResponse.error")]
+    [FhirType("EligibilityResponse.error", IsBackboneType=true)]
     public partial class ErrorsComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "EligibilityResponse#Errors"; } }
+      public override string TypeName { get { return "EligibilityResponse.error"; } }
 
       /// <summary>
       /// Error code detailing processing issues
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Encounter.cs b/src/Hl7.Fhir.STU3/Model/Generated/Encounter.cs
index 8dd86826e6..b64c7a3aee 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/Encounter.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/Encounter.cs
@@ -168,14 +168,13 @@ public enum EncounterLocationStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Encounter#StatusHistory")]
-    [BackboneType("Encounter.statusHistory")]
+    [FhirType("Encounter.statusHistory", IsBackboneType=true)]
     public partial class StatusHistoryComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Encounter#StatusHistory"; } }
+      public override string TypeName { get { return "Encounter.statusHistory"; } }
 
       /// <summary>
       /// planned | arrived | triaged | in-progress | onleave | finished | cancelled +
@@ -342,14 +341,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Encounter#ClassHistory")]
-    [BackboneType("Encounter.classHistory")]
+    [FhirType("Encounter.classHistory", IsBackboneType=true)]
     public partial class ClassHistoryComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Encounter#ClassHistory"; } }
+      public override string TypeName { get { return "Encounter.classHistory"; } }
 
       /// <summary>
       /// inpatient | outpatient | ambulatory | emergency +
@@ -496,14 +494,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Encounter#Participant")]
-    [BackboneType("Encounter.participant")]
+    [FhirType("Encounter.participant", IsBackboneType=true)]
     public partial class ParticipantComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Encounter#Participant"; } }
+      public override string TypeName { get { return "Encounter.participant"; } }
 
       /// <summary>
       /// Role of participant in encounter
@@ -673,14 +670,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Encounter#Diagnosis")]
-    [BackboneType("Encounter.diagnosis")]
+    [FhirType("Encounter.diagnosis", IsBackboneType=true)]
     public partial class DiagnosisComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Encounter#Diagnosis"; } }
+      public override string TypeName { get { return "Encounter.diagnosis"; } }
 
       /// <summary>
       /// Reason the encounter takes place (resource)
@@ -872,14 +868,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Encounter#Hospitalization")]
-    [BackboneType("Encounter.hospitalization")]
+    [FhirType("Encounter.hospitalization", IsBackboneType=true)]
     public partial class HospitalizationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Encounter#Hospitalization"; } }
+      public override string TypeName { get { return "Encounter.hospitalization"; } }
 
       /// <summary>
       /// Pre-admission identifier
@@ -1212,14 +1207,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Encounter#Location")]
-    [BackboneType("Encounter.location")]
+    [FhirType("Encounter.location", IsBackboneType=true)]
     public partial class LocationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Encounter#Location"; } }
+      public override string TypeName { get { return "Encounter.location"; } }
 
       /// <summary>
       /// Location the encounter takes place
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/EpisodeOfCare.cs b/src/Hl7.Fhir.STU3/Model/Generated/EpisodeOfCare.cs
index 4efa012e47..73b3836fcb 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/EpisodeOfCare.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/EpisodeOfCare.cs
@@ -119,14 +119,13 @@ public enum EpisodeOfCareStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("EpisodeOfCare#StatusHistory")]
-    [BackboneType("EpisodeOfCare.statusHistory")]
+    [FhirType("EpisodeOfCare.statusHistory", IsBackboneType=true)]
     public partial class StatusHistoryComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "EpisodeOfCare#StatusHistory"; } }
+      public override string TypeName { get { return "EpisodeOfCare.statusHistory"; } }
 
       /// <summary>
       /// planned | waitlist | active | onhold | finished | cancelled | entered-in-error
@@ -289,14 +288,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("EpisodeOfCare#Diagnosis")]
-    [BackboneType("EpisodeOfCare.diagnosis")]
+    [FhirType("EpisodeOfCare.diagnosis", IsBackboneType=true)]
     public partial class DiagnosisComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "EpisodeOfCare#Diagnosis"; } }
+      public override string TypeName { get { return "EpisodeOfCare.diagnosis"; } }
 
       /// <summary>
       /// Conditions/problems/diagnoses this episode of care is for
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/ExpansionProfile.cs b/src/Hl7.Fhir.STU3/Model/Generated/ExpansionProfile.cs
index d63a7b3bae..47cf7b195a 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/ExpansionProfile.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/ExpansionProfile.cs
@@ -95,14 +95,13 @@ public enum SystemVersionProcessingMode
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExpansionProfile#FixedVersion")]
-    [BackboneType("ExpansionProfile.fixedVersion")]
+    [FhirType("ExpansionProfile.fixedVersion", IsBackboneType=true)]
     public partial class FixedVersionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ExpansionProfile#FixedVersion"; } }
+      public override string TypeName { get { return "ExpansionProfile.fixedVersion"; } }
 
       /// <summary>
       /// System to have its version fixed
@@ -331,14 +330,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExpansionProfile#ExcludedSystem")]
-    [BackboneType("ExpansionProfile.excludedSystem")]
+    [FhirType("ExpansionProfile.excludedSystem", IsBackboneType=true)]
     public partial class ExcludedSystemComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ExpansionProfile#ExcludedSystem"; } }
+      public override string TypeName { get { return "ExpansionProfile.excludedSystem"; } }
 
       /// <summary>
       /// The specific code system to be excluded
@@ -519,14 +517,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExpansionProfile#Designation")]
-    [BackboneType("ExpansionProfile.designation")]
+    [FhirType("ExpansionProfile.designation", IsBackboneType=true)]
     public partial class DesignationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ExpansionProfile#Designation"; } }
+      public override string TypeName { get { return "ExpansionProfile.designation"; } }
 
       /// <summary>
       /// Designations to be included
@@ -667,14 +664,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("ExpansionProfile#DesignationInclude")]
-    [BackboneType("ExpansionProfile.designation.include")]
+    [FhirType("ExpansionProfile.designation.include", IsBackboneType=true)]
     public partial class DesignationIncludeComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ExpansionProfile#DesignationInclude"; } }
+      public override string TypeName { get { return "ExpansionProfile.designation.include"; } }
 
       /// <summary>
       /// The designation to be included
@@ -795,14 +791,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExpansionProfile#DesignationIncludeDesignation")]
-    [BackboneType("ExpansionProfile.designation.include.designation")]
+    [FhirType("ExpansionProfile.designation.include.designation", IsBackboneType=true)]
     public partial class DesignationIncludeDesignationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ExpansionProfile#DesignationIncludeDesignation"; } }
+      public override string TypeName { get { return "ExpansionProfile.designation.include.designation"; } }
 
       /// <summary>
       /// Human language of the designation to be included
@@ -963,14 +958,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("ExpansionProfile#DesignationExclude")]
-    [BackboneType("ExpansionProfile.designation.exclude")]
+    [FhirType("ExpansionProfile.designation.exclude", IsBackboneType=true)]
     public partial class DesignationExcludeComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ExpansionProfile#DesignationExclude"; } }
+      public override string TypeName { get { return "ExpansionProfile.designation.exclude"; } }
 
       /// <summary>
       /// The designation to be excluded
@@ -1091,14 +1085,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExpansionProfile#DesignationExcludeDesignation")]
-    [BackboneType("ExpansionProfile.designation.exclude.designation")]
+    [FhirType("ExpansionProfile.designation.exclude.designation", IsBackboneType=true)]
     public partial class DesignationExcludeDesignationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ExpansionProfile#DesignationExcludeDesignation"; } }
+      public override string TypeName { get { return "ExpansionProfile.designation.exclude.designation"; } }
 
       /// <summary>
       /// Human language of the designation to be excluded
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/ExplanationOfBenefit.cs b/src/Hl7.Fhir.STU3/Model/Generated/ExplanationOfBenefit.cs
index 160d3d05f7..97e5d27d03 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/ExplanationOfBenefit.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/ExplanationOfBenefit.cs
@@ -258,14 +258,13 @@ public enum ActInvoiceGroupCode
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#RelatedClaim")]
-    [BackboneType("ExplanationOfBenefit.related")]
+    [FhirType("ExplanationOfBenefit.related", IsBackboneType=true)]
     public partial class RelatedClaimComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ExplanationOfBenefit#RelatedClaim"; } }
+      public override string TypeName { get { return "ExplanationOfBenefit.related"; } }
 
       /// <summary>
       /// Reference to the related claim
@@ -437,14 +436,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#Payee")]
-    [BackboneType("ExplanationOfBenefit.payee")]
+    [FhirType("ExplanationOfBenefit.payee", IsBackboneType=true)]
     public partial class PayeeComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ExplanationOfBenefit#Payee"; } }
+      public override string TypeName { get { return "ExplanationOfBenefit.payee"; } }
 
       /// <summary>
       /// Type of party: Subscriber, Provider, other
@@ -617,14 +615,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#SupportingInformation")]
-    [BackboneType("ExplanationOfBenefit.information")]
+    [FhirType("ExplanationOfBenefit.information", IsBackboneType=true)]
     public partial class SupportingInformationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ExplanationOfBenefit#SupportingInformation"; } }
+      public override string TypeName { get { return "ExplanationOfBenefit.information"; } }
 
       /// <summary>
       /// Information instance identifier
@@ -896,14 +893,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#CareTeam")]
-    [BackboneType("ExplanationOfBenefit.careTeam")]
+    [FhirType("ExplanationOfBenefit.careTeam", IsBackboneType=true)]
     public partial class CareTeamComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ExplanationOfBenefit#CareTeam"; } }
+      public override string TypeName { get { return "ExplanationOfBenefit.careTeam"; } }
 
       /// <summary>
       /// Number to covey order of careteam
@@ -1164,14 +1160,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#Diagnosis")]
-    [BackboneType("ExplanationOfBenefit.diagnosis")]
+    [FhirType("ExplanationOfBenefit.diagnosis", IsBackboneType=true)]
     public partial class DiagnosisComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ExplanationOfBenefit#Diagnosis"; } }
+      public override string TypeName { get { return "ExplanationOfBenefit.diagnosis"; } }
 
       /// <summary>
       /// Number to covey order of diagnosis
@@ -1392,14 +1387,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#Procedure")]
-    [BackboneType("ExplanationOfBenefit.procedure")]
+    [FhirType("ExplanationOfBenefit.procedure", IsBackboneType=true)]
     public partial class ProcedureComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ExplanationOfBenefit#Procedure"; } }
+      public override string TypeName { get { return "ExplanationOfBenefit.procedure"; } }
 
       /// <summary>
       /// Procedure sequence for reference
@@ -1610,14 +1604,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#Insurance")]
-    [BackboneType("ExplanationOfBenefit.insurance")]
+    [FhirType("ExplanationOfBenefit.insurance", IsBackboneType=true)]
     public partial class InsuranceComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ExplanationOfBenefit#Insurance"; } }
+      public override string TypeName { get { return "ExplanationOfBenefit.insurance"; } }
 
       /// <summary>
       /// Insurance information
@@ -1782,14 +1775,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#Accident")]
-    [BackboneType("ExplanationOfBenefit.accident")]
+    [FhirType("ExplanationOfBenefit.accident", IsBackboneType=true)]
     public partial class AccidentComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ExplanationOfBenefit#Accident"; } }
+      public override string TypeName { get { return "ExplanationOfBenefit.accident"; } }
 
       /// <summary>
       /// When the accident occurred
@@ -1980,14 +1972,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#Item")]
-    [BackboneType("ExplanationOfBenefit.item")]
+    [FhirType("ExplanationOfBenefit.item", IsBackboneType=true)]
     public partial class ItemComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ExplanationOfBenefit#Item"; } }
+      public override string TypeName { get { return "ExplanationOfBenefit.item"; } }
 
       /// <summary>
       /// Service instance
@@ -2812,14 +2803,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#Adjudication")]
-    [BackboneType("ExplanationOfBenefit.item.adjudication")]
+    [FhirType("ExplanationOfBenefit.item.adjudication", IsBackboneType=true)]
     public partial class AdjudicationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ExplanationOfBenefit#Adjudication"; } }
+      public override string TypeName { get { return "ExplanationOfBenefit.item.adjudication"; } }
 
       /// <summary>
       /// Adjudication category such as co-pay, eligible, benefit, etc.
@@ -3034,14 +3024,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#Detail")]
-    [BackboneType("ExplanationOfBenefit.item.detail")]
+    [FhirType("ExplanationOfBenefit.item.detail", IsBackboneType=true)]
     public partial class DetailComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ExplanationOfBenefit#Detail"; } }
+      public override string TypeName { get { return "ExplanationOfBenefit.item.detail"; } }
 
       /// <summary>
       /// Service instance
@@ -3580,14 +3569,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#SubDetail")]
-    [BackboneType("ExplanationOfBenefit.item.detail.subDetail")]
+    [FhirType("ExplanationOfBenefit.item.detail.subDetail", IsBackboneType=true)]
     public partial class SubDetailComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ExplanationOfBenefit#SubDetail"; } }
+      public override string TypeName { get { return "ExplanationOfBenefit.item.detail.subDetail"; } }
 
       /// <summary>
       /// Service instance
@@ -4100,14 +4088,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#AddedItem")]
-    [BackboneType("ExplanationOfBenefit.addItem")]
+    [FhirType("ExplanationOfBenefit.addItem", IsBackboneType=true)]
     public partial class AddedItemComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ExplanationOfBenefit#AddedItem"; } }
+      public override string TypeName { get { return "ExplanationOfBenefit.addItem"; } }
 
       /// <summary>
       /// Service instances
@@ -4471,14 +4458,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#AddedItemsDetail")]
-    [BackboneType("ExplanationOfBenefit.addItem.detail")]
+    [FhirType("ExplanationOfBenefit.addItem.detail", IsBackboneType=true)]
     public partial class AddedItemsDetailComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ExplanationOfBenefit#AddedItemsDetail"; } }
+      public override string TypeName { get { return "ExplanationOfBenefit.addItem.detail"; } }
 
       /// <summary>
       /// Revenue or cost center code
@@ -4772,14 +4758,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#Payment")]
-    [BackboneType("ExplanationOfBenefit.payment")]
+    [FhirType("ExplanationOfBenefit.payment", IsBackboneType=true)]
     public partial class PaymentComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ExplanationOfBenefit#Payment"; } }
+      public override string TypeName { get { return "ExplanationOfBenefit.payment"; } }
 
       /// <summary>
       /// Partial or Complete
@@ -5043,14 +5028,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#Note")]
-    [BackboneType("ExplanationOfBenefit.processNote")]
+    [FhirType("ExplanationOfBenefit.processNote", IsBackboneType=true)]
     public partial class NoteComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ExplanationOfBenefit#Note"; } }
+      public override string TypeName { get { return "ExplanationOfBenefit.processNote"; } }
 
       /// <summary>
       /// Sequence number for this note
@@ -5279,14 +5263,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#BenefitBalance")]
-    [BackboneType("ExplanationOfBenefit.benefitBalance")]
+    [FhirType("ExplanationOfBenefit.benefitBalance", IsBackboneType=true)]
     public partial class BenefitBalanceComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ExplanationOfBenefit#BenefitBalance"; } }
+      public override string TypeName { get { return "ExplanationOfBenefit.benefitBalance"; } }
 
       /// <summary>
       /// Type of services covered
@@ -5666,14 +5649,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ExplanationOfBenefit#Benefit")]
-    [BackboneType("ExplanationOfBenefit.benefitBalance.financial")]
+    [FhirType("ExplanationOfBenefit.benefitBalance.financial", IsBackboneType=true)]
     public partial class BenefitComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ExplanationOfBenefit#Benefit"; } }
+      public override string TypeName { get { return "ExplanationOfBenefit.benefitBalance.financial"; } }
 
       /// <summary>
       /// Deductable, visits, benefit amount
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/FamilyMemberHistory.cs b/src/Hl7.Fhir.STU3/Model/Generated/FamilyMemberHistory.cs
index 9e65011b16..67190ae965 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/FamilyMemberHistory.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/FamilyMemberHistory.cs
@@ -102,14 +102,13 @@ public enum FamilyHistoryStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("FamilyMemberHistory#Condition")]
-    [BackboneType("FamilyMemberHistory.condition")]
+    [FhirType("FamilyMemberHistory.condition", IsBackboneType=true)]
     public partial class ConditionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "FamilyMemberHistory#Condition"; } }
+      public override string TypeName { get { return "FamilyMemberHistory.condition"; } }
 
       /// <summary>
       /// Condition suffered by relation
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Goal.cs b/src/Hl7.Fhir.STU3/Model/Generated/Goal.cs
index 34ab6a149a..32e51f61eb 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/Goal.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/Goal.cs
@@ -156,14 +156,13 @@ public enum GoalStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Goal#Target")]
-    [BackboneType("Goal.target")]
+    [FhirType("Goal.target", IsBackboneType=true)]
     public partial class TargetComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Goal#Target"; } }
+      public override string TypeName { get { return "Goal.target"; } }
 
       /// <summary>
       /// The parameter whose value is being tracked
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/GraphDefinition.cs b/src/Hl7.Fhir.STU3/Model/Generated/GraphDefinition.cs
index 490aabe25b..7de3466d94 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/GraphDefinition.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/GraphDefinition.cs
@@ -98,14 +98,13 @@ public enum GraphCompartmentRule
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("GraphDefinition#Link")]
-    [BackboneType("GraphDefinition.link")]
+    [FhirType("GraphDefinition.link", IsBackboneType=true)]
     public partial class LinkComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "GraphDefinition#Link"; } }
+      public override string TypeName { get { return "GraphDefinition.link"; } }
 
       /// <summary>
       /// Path in the resource that contains the link
@@ -438,14 +437,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("GraphDefinition#Target")]
-    [BackboneType("GraphDefinition.link.target")]
+    [FhirType("GraphDefinition.link.target", IsBackboneType=true)]
     public partial class TargetComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "GraphDefinition#Target"; } }
+      public override string TypeName { get { return "GraphDefinition.link.target"; } }
 
       /// <summary>
       /// Type of resource this link refers to
@@ -677,14 +675,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("GraphDefinition#Compartment")]
-    [BackboneType("GraphDefinition.link.target.compartment")]
+    [FhirType("GraphDefinition.link.target.compartment", IsBackboneType=true)]
     public partial class CompartmentComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "GraphDefinition#Compartment"; } }
+      public override string TypeName { get { return "GraphDefinition.link.target.compartment"; } }
 
       /// <summary>
       /// Identifies the compartment
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Group.cs b/src/Hl7.Fhir.STU3/Model/Generated/Group.cs
index 808fe23cc0..25861612d2 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/Group.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/Group.cs
@@ -114,14 +114,13 @@ public enum GroupType
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Group#Characteristic")]
-    [BackboneType("Group.characteristic")]
+    [FhirType("Group.characteristic", IsBackboneType=true)]
     public partial class CharacteristicComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Group#Characteristic"; } }
+      public override string TypeName { get { return "Group.characteristic"; } }
 
       /// <summary>
       /// Kind of characteristic
@@ -340,14 +339,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Group#Member")]
-    [BackboneType("Group.member")]
+    [FhirType("Group.member", IsBackboneType=true)]
     public partial class MemberComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Group#Member"; } }
+      public override string TypeName { get { return "Group.member"; } }
 
       /// <summary>
       /// Reference to the group member
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/HealthcareService.cs b/src/Hl7.Fhir.STU3/Model/Generated/HealthcareService.cs
index 7b8a234e61..c8633add82 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/HealthcareService.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/HealthcareService.cs
@@ -65,14 +65,13 @@ public partial class HealthcareService : Hl7.Fhir.Model.DomainResource, IIdentif
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("HealthcareService#AvailableTime")]
-    [BackboneType("HealthcareService.availableTime")]
+    [FhirType("HealthcareService.availableTime", IsBackboneType=true)]
     public partial class AvailableTimeComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "HealthcareService#AvailableTime"; } }
+      public override string TypeName { get { return "HealthcareService.availableTime"; } }
 
       /// <summary>
       /// mon | tue | wed | thu | fri | sat | sun
@@ -341,14 +340,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("HealthcareService#NotAvailable")]
-    [BackboneType("HealthcareService.notAvailable")]
+    [FhirType("HealthcareService.notAvailable", IsBackboneType=true)]
     public partial class NotAvailableComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "HealthcareService#NotAvailable"; } }
+      public override string TypeName { get { return "HealthcareService.notAvailable"; } }
 
       /// <summary>
       /// Reason presented to the user explaining why time not available
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/ImagingManifest.cs b/src/Hl7.Fhir.STU3/Model/Generated/ImagingManifest.cs
index d1b8747f06..d618a41183 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/ImagingManifest.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/ImagingManifest.cs
@@ -68,14 +68,13 @@ public partial class ImagingManifest : Hl7.Fhir.Model.DomainResource, IIdentifia
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ImagingManifest#Study")]
-    [BackboneType("ImagingManifest.study")]
+    [FhirType("ImagingManifest.study", IsBackboneType=true)]
     public partial class StudyComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ImagingManifest#Study"; } }
+      public override string TypeName { get { return "ImagingManifest.study"; } }
 
       /// <summary>
       /// Study instance UID
@@ -295,14 +294,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ImagingManifest#Series")]
-    [BackboneType("ImagingManifest.study.series")]
+    [FhirType("ImagingManifest.study.series", IsBackboneType=true)]
     public partial class SeriesComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ImagingManifest#Series"; } }
+      public override string TypeName { get { return "ImagingManifest.study.series"; } }
 
       /// <summary>
       /// Series instance UID
@@ -495,14 +493,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ImagingManifest#Instance")]
-    [BackboneType("ImagingManifest.study.series.instance")]
+    [FhirType("ImagingManifest.study.series.instance", IsBackboneType=true)]
     public partial class InstanceComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ImagingManifest#Instance"; } }
+      public override string TypeName { get { return "ImagingManifest.study.series.instance"; } }
 
       /// <summary>
       /// SOP class UID of instance
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/ImagingStudy.cs b/src/Hl7.Fhir.STU3/Model/Generated/ImagingStudy.cs
index 62280ea16d..945ad7232c 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/ImagingStudy.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/ImagingStudy.cs
@@ -101,14 +101,13 @@ public enum InstanceAvailability
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ImagingStudy#Series")]
-    [BackboneType("ImagingStudy.series")]
+    [FhirType("ImagingStudy.series", IsBackboneType=true)]
     public partial class SeriesComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ImagingStudy#Series"; } }
+      public override string TypeName { get { return "ImagingStudy.series"; } }
 
       /// <summary>
       /// Formal DICOM identifier for this series
@@ -624,14 +623,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ImagingStudy#Instance")]
-    [BackboneType("ImagingStudy.series.instance")]
+    [FhirType("ImagingStudy.series.instance", IsBackboneType=true)]
     public partial class InstanceComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ImagingStudy#Instance"; } }
+      public override string TypeName { get { return "ImagingStudy.series.instance"; } }
 
       /// <summary>
       /// Formal DICOM identifier for this instance
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Immunization.cs b/src/Hl7.Fhir.STU3/Model/Generated/Immunization.cs
index 4c7544e076..b2c6067657 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/Immunization.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/Immunization.cs
@@ -89,14 +89,13 @@ public enum ImmunizationStatusCodes
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Immunization#Practitioner")]
-    [BackboneType("Immunization.practitioner")]
+    [FhirType("Immunization.practitioner", IsBackboneType=true)]
     public partial class PractitionerComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Immunization#Practitioner"; } }
+      public override string TypeName { get { return "Immunization.practitioner"; } }
 
       /// <summary>
       /// What type of performance was done
@@ -244,14 +243,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Immunization#Explanation")]
-    [BackboneType("Immunization.explanation")]
+    [FhirType("Immunization.explanation", IsBackboneType=true)]
     public partial class ExplanationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Immunization#Explanation"; } }
+      public override string TypeName { get { return "Immunization.explanation"; } }
 
       /// <summary>
       /// Why immunization occurred
@@ -400,14 +398,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Immunization#Reaction")]
-    [BackboneType("Immunization.reaction")]
+    [FhirType("Immunization.reaction", IsBackboneType=true)]
     public partial class ReactionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Immunization#Reaction"; } }
+      public override string TypeName { get { return "Immunization.reaction"; } }
 
       /// <summary>
       /// When reaction started
@@ -614,14 +611,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Immunization#VaccinationProtocol")]
-    [BackboneType("Immunization.vaccinationProtocol")]
+    [FhirType("Immunization.vaccinationProtocol", IsBackboneType=true)]
     public partial class VaccinationProtocolComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Immunization#VaccinationProtocol"; } }
+      public override string TypeName { get { return "Immunization.vaccinationProtocol"; } }
 
       /// <summary>
       /// Dose number within series
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/ImmunizationRecommendation.cs b/src/Hl7.Fhir.STU3/Model/Generated/ImmunizationRecommendation.cs
index c01c2f9d1c..ba644883c4 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/ImmunizationRecommendation.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/ImmunizationRecommendation.cs
@@ -64,14 +64,13 @@ public partial class ImmunizationRecommendation : Hl7.Fhir.Model.DomainResource,
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("ImmunizationRecommendation#Recommendation")]
-    [BackboneType("ImmunizationRecommendation.recommendation")]
+    [FhirType("ImmunizationRecommendation.recommendation", IsBackboneType=true)]
     public partial class RecommendationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ImmunizationRecommendation#Recommendation"; } }
+      public override string TypeName { get { return "ImmunizationRecommendation.recommendation"; } }
 
       /// <summary>
       /// Date recommendation created
@@ -438,14 +437,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ImmunizationRecommendation#DateCriterion")]
-    [BackboneType("ImmunizationRecommendation.recommendation.dateCriterion")]
+    [FhirType("ImmunizationRecommendation.recommendation.dateCriterion", IsBackboneType=true)]
     public partial class DateCriterionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ImmunizationRecommendation#DateCriterion"; } }
+      public override string TypeName { get { return "ImmunizationRecommendation.recommendation.dateCriterion"; } }
 
       /// <summary>
       /// Type of date
@@ -610,14 +608,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ImmunizationRecommendation#Protocol")]
-    [BackboneType("ImmunizationRecommendation.recommendation.protocol")]
+    [FhirType("ImmunizationRecommendation.recommendation.protocol", IsBackboneType=true)]
     public partial class ProtocolComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ImmunizationRecommendation#Protocol"; } }
+      public override string TypeName { get { return "ImmunizationRecommendation.recommendation.protocol"; } }
 
       /// <summary>
       /// Dose number within sequence
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/ImplementationGuide.cs b/src/Hl7.Fhir.STU3/Model/Generated/ImplementationGuide.cs
index 3aeb6146ba..58aac8268e 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/ImplementationGuide.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/ImplementationGuide.cs
@@ -147,14 +147,13 @@ public enum GuidePageKind
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ImplementationGuide#Dependency")]
-    [BackboneType("ImplementationGuide.dependency")]
+    [FhirType("ImplementationGuide.dependency", IsBackboneType=true)]
     public partial class DependencyComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ImplementationGuide#Dependency"; } }
+      public override string TypeName { get { return "ImplementationGuide.dependency"; } }
 
       /// <summary>
       /// reference | inclusion
@@ -338,14 +337,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ImplementationGuide#Package")]
-    [BackboneType("ImplementationGuide.package")]
+    [FhirType("ImplementationGuide.package", IsBackboneType=true)]
     public partial class PackageComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ImplementationGuide#Package"; } }
+      public override string TypeName { get { return "ImplementationGuide.package"; } }
 
       /// <summary>
       /// Name used .page.package
@@ -552,14 +550,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ImplementationGuide#Resource")]
-    [BackboneType("ImplementationGuide.package.resource")]
+    [FhirType("ImplementationGuide.package.resource", IsBackboneType=true)]
     public partial class ResourceComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ImplementationGuide#Resource"; } }
+      public override string TypeName { get { return "ImplementationGuide.package.resource"; } }
 
       /// <summary>
       /// If not an example, has its normal meaning
@@ -883,14 +880,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ImplementationGuide#Global")]
-    [BackboneType("ImplementationGuide.global")]
+    [FhirType("ImplementationGuide.global", IsBackboneType=true)]
     public partial class GlobalComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ImplementationGuide#Global"; } }
+      public override string TypeName { get { return "ImplementationGuide.global"; } }
 
       /// <summary>
       /// Type this profiles applies to
@@ -1059,14 +1055,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ImplementationGuide#Page")]
-    [BackboneType("ImplementationGuide.page")]
+    [FhirType("ImplementationGuide.page", IsBackboneType=true)]
     public partial class PageComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ImplementationGuide#Page"; } }
+      public override string TypeName { get { return "ImplementationGuide.page"; } }
 
       /// <summary>
       /// Where to find that page
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Linkage.cs b/src/Hl7.Fhir.STU3/Model/Generated/Linkage.cs
index 3d5204a5e9..50ba095ffd 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/Linkage.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/Linkage.cs
@@ -95,14 +95,13 @@ public enum LinkageType
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Linkage#Item")]
-    [BackboneType("Linkage.item")]
+    [FhirType("Linkage.item", IsBackboneType=true)]
     public partial class ItemComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Linkage#Item"; } }
+      public override string TypeName { get { return "Linkage.item"; } }
 
       /// <summary>
       /// source | alternate | historical
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/List.cs b/src/Hl7.Fhir.STU3/Model/Generated/List.cs
index ec38b63542..65af37d3bc 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/List.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/List.cs
@@ -96,14 +96,13 @@ public enum ListStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("List#Entry")]
-    [BackboneType("List.entry")]
+    [FhirType("List.entry", IsBackboneType=true)]
     public partial class EntryComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "List#Entry"; } }
+      public override string TypeName { get { return "List.entry"; } }
 
       /// <summary>
       /// Status/Workflow information about this item
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Location.cs b/src/Hl7.Fhir.STU3/Model/Generated/Location.cs
index 9ec5d97c6d..d73543d873 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/Location.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/Location.cs
@@ -117,14 +117,13 @@ public enum LocationMode
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Location#Position")]
-    [BackboneType("Location.position")]
+    [FhirType("Location.position", IsBackboneType=true)]
     public partial class PositionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Location#Position"; } }
+      public override string TypeName { get { return "Location.position"; } }
 
       /// <summary>
       /// Longitude with WGS84 datum
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Measure.cs b/src/Hl7.Fhir.STU3/Model/Generated/Measure.cs
index 38f8cf8677..a8dea950bc 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/Measure.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/Measure.cs
@@ -67,14 +67,13 @@ public partial class Measure : Hl7.Fhir.Model.DomainResource, IIdentifiable<List
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Measure#Group")]
-    [BackboneType("Measure.group")]
+    [FhirType("Measure.group", IsBackboneType=true)]
     public partial class GroupComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Measure#Group"; } }
+      public override string TypeName { get { return "Measure.group"; } }
 
       /// <summary>
       /// Unique identifier
@@ -332,14 +331,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Measure#Population")]
-    [BackboneType("Measure.group.population")]
+    [FhirType("Measure.group.population", IsBackboneType=true)]
     public partial class PopulationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Measure#Population"; } }
+      public override string TypeName { get { return "Measure.group.population"; } }
 
       /// <summary>
       /// Unique identifier
@@ -614,14 +612,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Measure#Stratifier")]
-    [BackboneType("Measure.group.stratifier")]
+    [FhirType("Measure.group.stratifier", IsBackboneType=true)]
     public partial class StratifierComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Measure#Stratifier"; } }
+      public override string TypeName { get { return "Measure.group.stratifier"; } }
 
       /// <summary>
       /// The identifier for the stratifier used to coordinate the reported data back to this stratifier
@@ -827,14 +824,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Measure#SupplementalData")]
-    [BackboneType("Measure.supplementalData")]
+    [FhirType("Measure.supplementalData", IsBackboneType=true)]
     public partial class SupplementalDataComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Measure#SupplementalData"; } }
+      public override string TypeName { get { return "Measure.supplementalData"; } }
 
       /// <summary>
       /// Identifier, unique within the measure
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/MeasureReport.cs b/src/Hl7.Fhir.STU3/Model/Generated/MeasureReport.cs
index a9ba8de8c5..c0cef87fa3 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/MeasureReport.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/MeasureReport.cs
@@ -123,14 +123,13 @@ public enum MeasureReportType
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MeasureReport#Group")]
-    [BackboneType("MeasureReport.group")]
+    [FhirType("MeasureReport.group", IsBackboneType=true)]
     public partial class GroupComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MeasureReport#Group"; } }
+      public override string TypeName { get { return "MeasureReport.group"; } }
 
       /// <summary>
       /// What group of the measure
@@ -345,14 +344,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MeasureReport#Population")]
-    [BackboneType("MeasureReport.group.population")]
+    [FhirType("MeasureReport.group.population", IsBackboneType=true)]
     public partial class PopulationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MeasureReport#Population"; } }
+      public override string TypeName { get { return "MeasureReport.group.population"; } }
 
       /// <summary>
       /// Population identifier as defined in the measure
@@ -567,14 +565,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MeasureReport#Stratifier")]
-    [BackboneType("MeasureReport.group.stratifier")]
+    [FhirType("MeasureReport.group.stratifier", IsBackboneType=true)]
     public partial class StratifierComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MeasureReport#Stratifier"; } }
+      public override string TypeName { get { return "MeasureReport.group.stratifier"; } }
 
       /// <summary>
       /// What stratifier of the group
@@ -719,14 +716,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MeasureReport#StratifierGroup")]
-    [BackboneType("MeasureReport.group.stratifier.stratum")]
+    [FhirType("MeasureReport.group.stratifier.stratum", IsBackboneType=true)]
     public partial class StratifierGroupComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MeasureReport#StratifierGroup"; } }
+      public override string TypeName { get { return "MeasureReport.group.stratifier.stratum"; } }
 
       /// <summary>
       /// The stratum value, e.g. male
@@ -933,14 +929,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MeasureReport#StratifierGroupPopulation")]
-    [BackboneType("MeasureReport.group.stratifier.stratum.population")]
+    [FhirType("MeasureReport.group.stratifier.stratum.population", IsBackboneType=true)]
     public partial class StratifierGroupPopulationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MeasureReport#StratifierGroupPopulation"; } }
+      public override string TypeName { get { return "MeasureReport.group.stratifier.stratum.population"; } }
 
       /// <summary>
       /// Population identifier as defined in the measure
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Medication.cs b/src/Hl7.Fhir.STU3/Model/Generated/Medication.cs
index 687bf0ce06..113ab1a24b 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/Medication.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/Medication.cs
@@ -96,14 +96,13 @@ public enum MedicationStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Medication#Ingredient")]
-    [BackboneType("Medication.ingredient")]
+    [FhirType("Medication.ingredient", IsBackboneType=true)]
     public partial class IngredientComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Medication#Ingredient"; } }
+      public override string TypeName { get { return "Medication.ingredient"; } }
 
       /// <summary>
       /// The product contained
@@ -294,14 +293,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Medication#Package")]
-    [BackboneType("Medication.package")]
+    [FhirType("Medication.package", IsBackboneType=true)]
     public partial class PackageComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Medication#Package"; } }
+      public override string TypeName { get { return "Medication.package"; } }
 
       /// <summary>
       /// E.g. box, vial, blister-pack
@@ -473,14 +471,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Medication#Content")]
-    [BackboneType("Medication.package.content")]
+    [FhirType("Medication.package.content", IsBackboneType=true)]
     public partial class ContentComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Medication#Content"; } }
+      public override string TypeName { get { return "Medication.package.content"; } }
 
       /// <summary>
       /// The item in the package
@@ -628,14 +625,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Medication#Batch")]
-    [BackboneType("Medication.package.batch")]
+    [FhirType("Medication.package.batch", IsBackboneType=true)]
     public partial class BatchComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Medication#Batch"; } }
+      public override string TypeName { get { return "Medication.package.batch"; } }
 
       /// <summary>
       /// Identifier assigned to batch
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/MedicationAdministration.cs b/src/Hl7.Fhir.STU3/Model/Generated/MedicationAdministration.cs
index dd121afede..fae77cc61c 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/MedicationAdministration.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/MedicationAdministration.cs
@@ -114,14 +114,13 @@ public enum MedicationAdministrationStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationAdministration#Performer")]
-    [BackboneType("MedicationAdministration.performer")]
+    [FhirType("MedicationAdministration.performer", IsBackboneType=true)]
     public partial class PerformerComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MedicationAdministration#Performer"; } }
+      public override string TypeName { get { return "MedicationAdministration.performer"; } }
 
       /// <summary>
       /// Individual who was performing
@@ -270,14 +269,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationAdministration#Dosage")]
-    [BackboneType("MedicationAdministration.dosage")]
+    [FhirType("MedicationAdministration.dosage", IsBackboneType=true)]
     public partial class DosageComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MedicationAdministration#Dosage"; } }
+      public override string TypeName { get { return "MedicationAdministration.dosage"; } }
 
       /// <summary>
       /// Free text dosage instructions e.g. SIG
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/MedicationDispense.cs b/src/Hl7.Fhir.STU3/Model/Generated/MedicationDispense.cs
index c4330d72d3..2fa3324a81 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/MedicationDispense.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/MedicationDispense.cs
@@ -115,14 +115,13 @@ public enum MedicationDispenseStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationDispense#Performer")]
-    [BackboneType("MedicationDispense.performer")]
+    [FhirType("MedicationDispense.performer", IsBackboneType=true)]
     public partial class PerformerComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MedicationDispense#Performer"; } }
+      public override string TypeName { get { return "MedicationDispense.performer"; } }
 
       /// <summary>
       /// Individual who was performing
@@ -271,14 +270,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationDispense#Substitution")]
-    [BackboneType("MedicationDispense.substitution")]
+    [FhirType("MedicationDispense.substitution", IsBackboneType=true)]
     public partial class SubstitutionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MedicationDispense#Substitution"; } }
+      public override string TypeName { get { return "MedicationDispense.substitution"; } }
 
       /// <summary>
       /// Whether a substitution was or was not performed on the dispense
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/MedicationRequest.cs b/src/Hl7.Fhir.STU3/Model/Generated/MedicationRequest.cs
index 5fd58579ab..72c4fd9b1a 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/MedicationRequest.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/MedicationRequest.cs
@@ -193,14 +193,13 @@ public enum MedicationRequestPriority
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationRequest#Requester")]
-    [BackboneType("MedicationRequest.requester")]
+    [FhirType("MedicationRequest.requester", IsBackboneType=true)]
     public partial class RequesterComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MedicationRequest#Requester"; } }
+      public override string TypeName { get { return "MedicationRequest.requester"; } }
 
       /// <summary>
       /// Who ordered the initial medication(s)
@@ -349,14 +348,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationRequest#DispenseRequest")]
-    [BackboneType("MedicationRequest.dispenseRequest")]
+    [FhirType("MedicationRequest.dispenseRequest", IsBackboneType=true)]
     public partial class DispenseRequestComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MedicationRequest#DispenseRequest"; } }
+      public override string TypeName { get { return "MedicationRequest.dispenseRequest"; } }
 
       /// <summary>
       /// Time period supply is authorized for
@@ -595,14 +593,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MedicationRequest#Substitution")]
-    [BackboneType("MedicationRequest.substitution")]
+    [FhirType("MedicationRequest.substitution", IsBackboneType=true)]
     public partial class SubstitutionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MedicationRequest#Substitution"; } }
+      public override string TypeName { get { return "MedicationRequest.substitution"; } }
 
       /// <summary>
       /// Whether substitution is allowed or not
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/MessageDefinition.cs b/src/Hl7.Fhir.STU3/Model/Generated/MessageDefinition.cs
index da5e957c8c..66cc816708 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/MessageDefinition.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/MessageDefinition.cs
@@ -68,14 +68,13 @@ public partial class MessageDefinition : Hl7.Fhir.Model.DomainResource, IIdentif
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MessageDefinition#Focus")]
-    [BackboneType("MessageDefinition.focus")]
+    [FhirType("MessageDefinition.focus", IsBackboneType=true)]
     public partial class FocusComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MessageDefinition#Focus"; } }
+      public override string TypeName { get { return "MessageDefinition.focus"; } }
 
       /// <summary>
       /// Type of resource
@@ -329,14 +328,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MessageDefinition#AllowedResponse")]
-    [BackboneType("MessageDefinition.allowedResponse")]
+    [FhirType("MessageDefinition.allowedResponse", IsBackboneType=true)]
     public partial class AllowedResponseComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MessageDefinition#AllowedResponse"; } }
+      public override string TypeName { get { return "MessageDefinition.allowedResponse"; } }
 
       /// <summary>
       /// Reference to allowed message definition response
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/MessageHeader.cs b/src/Hl7.Fhir.STU3/Model/Generated/MessageHeader.cs
index 104a59dfb9..43ae423c7e 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/MessageHeader.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/MessageHeader.cs
@@ -96,14 +96,13 @@ public enum ResponseType
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MessageHeader#MessageDestination")]
-    [BackboneType("MessageHeader.destination")]
+    [FhirType("MessageHeader.destination", IsBackboneType=true)]
     public partial class MessageDestinationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MessageHeader#MessageDestination"; } }
+      public override string TypeName { get { return "MessageHeader.destination"; } }
 
       /// <summary>
       /// Name of system
@@ -311,14 +310,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MessageHeader#MessageSource")]
-    [BackboneType("MessageHeader.source")]
+    [FhirType("MessageHeader.source", IsBackboneType=true)]
     public partial class MessageSourceComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MessageHeader#MessageSource"; } }
+      public override string TypeName { get { return "MessageHeader.source"; } }
 
       /// <summary>
       /// Name of system
@@ -610,14 +608,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("MessageHeader#Response")]
-    [BackboneType("MessageHeader.response")]
+    [FhirType("MessageHeader.response", IsBackboneType=true)]
     public partial class ResponseComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "MessageHeader#Response"; } }
+      public override string TypeName { get { return "MessageHeader.response"; } }
 
       /// <summary>
       /// Id of original message
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/NamingSystem.cs b/src/Hl7.Fhir.STU3/Model/Generated/NamingSystem.cs
index 5da30b52cb..398e271d22 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/NamingSystem.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/NamingSystem.cs
@@ -130,14 +130,13 @@ public enum NamingSystemIdentifierType
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("NamingSystem#UniqueId")]
-    [BackboneType("NamingSystem.uniqueId")]
+    [FhirType("NamingSystem.uniqueId", IsBackboneType=true)]
     public partial class UniqueIdComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "NamingSystem#UniqueId"; } }
+      public override string TypeName { get { return "NamingSystem.uniqueId"; } }
 
       /// <summary>
       /// oid | uuid | uri | other
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/NutritionOrder.cs b/src/Hl7.Fhir.STU3/Model/Generated/NutritionOrder.cs
index baa5efe158..e3d78db401 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/NutritionOrder.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/NutritionOrder.cs
@@ -132,14 +132,13 @@ public enum NutritionOrderStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("NutritionOrder#OralDiet")]
-    [BackboneType("NutritionOrder.oralDiet")]
+    [FhirType("NutritionOrder.oralDiet", IsBackboneType=true)]
     public partial class OralDietComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "NutritionOrder#OralDiet"; } }
+      public override string TypeName { get { return "NutritionOrder.oralDiet"; } }
 
       /// <summary>
       /// Type of oral diet or diet restrictions that describe what can be consumed orally
@@ -408,14 +407,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("NutritionOrder#Nutrient")]
-    [BackboneType("NutritionOrder.oralDiet.nutrient")]
+    [FhirType("NutritionOrder.oralDiet.nutrient", IsBackboneType=true)]
     public partial class NutrientComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "NutritionOrder#Nutrient"; } }
+      public override string TypeName { get { return "NutritionOrder.oralDiet.nutrient"; } }
 
       /// <summary>
       /// Type of nutrient that is being modified
@@ -560,14 +558,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("NutritionOrder#Texture")]
-    [BackboneType("NutritionOrder.oralDiet.texture")]
+    [FhirType("NutritionOrder.oralDiet.texture", IsBackboneType=true)]
     public partial class TextureComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "NutritionOrder#Texture"; } }
+      public override string TypeName { get { return "NutritionOrder.oralDiet.texture"; } }
 
       /// <summary>
       /// Code to indicate how to alter the texture of the foods, e.g. pureed
@@ -713,14 +710,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("NutritionOrder#Supplement")]
-    [BackboneType("NutritionOrder.supplement")]
+    [FhirType("NutritionOrder.supplement", IsBackboneType=true)]
     public partial class SupplementComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "NutritionOrder#Supplement"; } }
+      public override string TypeName { get { return "NutritionOrder.supplement"; } }
 
       /// <summary>
       /// Type of supplement product requested
@@ -977,14 +973,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("NutritionOrder#EnteralFormula")]
-    [BackboneType("NutritionOrder.enteralFormula")]
+    [FhirType("NutritionOrder.enteralFormula", IsBackboneType=true)]
     public partial class EnteralFormulaComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "NutritionOrder#EnteralFormula"; } }
+      public override string TypeName { get { return "NutritionOrder.enteralFormula"; } }
 
       /// <summary>
       /// Type of enteral or infant formula
@@ -1362,14 +1357,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("NutritionOrder#Administration")]
-    [BackboneType("NutritionOrder.enteralFormula.administration")]
+    [FhirType("NutritionOrder.enteralFormula.administration", IsBackboneType=true)]
     public partial class AdministrationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "NutritionOrder#Administration"; } }
+      public override string TypeName { get { return "NutritionOrder.enteralFormula.administration"; } }
 
       /// <summary>
       /// Scheduled frequency of enteral feeding
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Observation.cs b/src/Hl7.Fhir.STU3/Model/Generated/Observation.cs
index 79b8e62523..185cd5186b 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/Observation.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/Observation.cs
@@ -115,14 +115,13 @@ public enum ObservationRelationshipType
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Observation#ReferenceRange")]
-    [BackboneType("Observation.referenceRange")]
+    [FhirType("Observation.referenceRange", IsBackboneType=true)]
     public partial class ReferenceRangeComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Observation#ReferenceRange"; } }
+      public override string TypeName { get { return "Observation.referenceRange"; } }
 
       /// <summary>
       /// Low Range, if relevant
@@ -388,14 +387,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Observation#Related")]
-    [BackboneType("Observation.related")]
+    [FhirType("Observation.related", IsBackboneType=true)]
     public partial class RelatedComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Observation#Related"; } }
+      public override string TypeName { get { return "Observation.related"; } }
 
       /// <summary>
       /// has-member | derived-from | sequel-to | replaces | qualified-by | interfered-by
@@ -563,14 +561,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Observation#Component")]
-    [BackboneType("Observation.component")]
+    [FhirType("Observation.component", IsBackboneType=true)]
     public partial class ComponentComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Observation#Component"; } }
+      public override string TypeName { get { return "Observation.component"; } }
 
       /// <summary>
       /// Type of component observation (code / type)
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/OperationDefinition.cs b/src/Hl7.Fhir.STU3/Model/Generated/OperationDefinition.cs
index fa06cfa615..9db7c6b0f3 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/OperationDefinition.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/OperationDefinition.cs
@@ -90,14 +90,13 @@ public enum OperationKind
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("OperationDefinition#Parameter")]
-    [BackboneType("OperationDefinition.parameter")]
+    [FhirType("OperationDefinition.parameter", IsBackboneType=true)]
     public partial class ParameterComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "OperationDefinition#Parameter"; } }
+      public override string TypeName { get { return "OperationDefinition.parameter"; } }
 
       /// <summary>
       /// Name in Parameters.parameter.name or in URL
@@ -580,14 +579,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("OperationDefinition#Binding")]
-    [BackboneType("OperationDefinition.parameter.binding")]
+    [FhirType("OperationDefinition.parameter.binding", IsBackboneType=true)]
     public partial class BindingComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "OperationDefinition#Binding"; } }
+      public override string TypeName { get { return "OperationDefinition.parameter.binding"; } }
 
       /// <summary>
       /// required | extensible | preferred | example
@@ -757,14 +755,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("OperationDefinition#Overload")]
-    [BackboneType("OperationDefinition.overload")]
+    [FhirType("OperationDefinition.overload", IsBackboneType=true)]
     public partial class OverloadComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "OperationDefinition#Overload"; } }
+      public override string TypeName { get { return "OperationDefinition.overload"; } }
 
       /// <summary>
       /// Name of parameter to include in overload
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Organization.cs b/src/Hl7.Fhir.STU3/Model/Generated/Organization.cs
index 29705f66ce..6874f08bf4 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/Organization.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/Organization.cs
@@ -67,14 +67,13 @@ public partial class Organization : Hl7.Fhir.Model.DomainResource, IIdentifiable
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Organization#Contact")]
-    [BackboneType("Organization.contact")]
+    [FhirType("Organization.contact", IsBackboneType=true)]
     public partial class ContactComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Organization#Contact"; } }
+      public override string TypeName { get { return "Organization.contact"; } }
 
       /// <summary>
       /// The type of contact
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Patient.cs b/src/Hl7.Fhir.STU3/Model/Generated/Patient.cs
index 0114722cec..9a4233879f 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/Patient.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/Patient.cs
@@ -101,14 +101,13 @@ public enum LinkType
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Patient#Contact")]
-    [BackboneType("Patient.contact")]
+    [FhirType("Patient.contact", IsBackboneType=true)]
     public partial class ContactComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Patient#Contact"; } }
+      public override string TypeName { get { return "Patient.contact"; } }
 
       /// <summary>
       /// The kind of relationship
@@ -403,14 +402,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Patient#Animal")]
-    [BackboneType("Patient.animal")]
+    [FhirType("Patient.animal", IsBackboneType=true)]
     public partial class AnimalComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Patient#Animal"; } }
+      public override string TypeName { get { return "Patient.animal"; } }
 
       /// <summary>
       /// E.g. Dog, Cow
@@ -584,14 +582,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Patient#Communication")]
-    [BackboneType("Patient.communication")]
+    [FhirType("Patient.communication", IsBackboneType=true)]
     public partial class CommunicationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Patient#Communication"; } }
+      public override string TypeName { get { return "Patient.communication"; } }
 
       /// <summary>
       /// The language which can be used to communicate with the patient about his or her health
@@ -757,14 +754,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Patient#Link")]
-    [BackboneType("Patient.link")]
+    [FhirType("Patient.link", IsBackboneType=true)]
     public partial class LinkComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Patient#Link"; } }
+      public override string TypeName { get { return "Patient.link"; } }
 
       /// <summary>
       /// The other patient or related person resource that the link refers to
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/PaymentReconciliation.cs b/src/Hl7.Fhir.STU3/Model/Generated/PaymentReconciliation.cs
index b417a43090..385f15c0fb 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/PaymentReconciliation.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/PaymentReconciliation.cs
@@ -67,14 +67,13 @@ public partial class PaymentReconciliation : Hl7.Fhir.Model.DomainResource, IIde
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("PaymentReconciliation#Details")]
-    [BackboneType("PaymentReconciliation.detail")]
+    [FhirType("PaymentReconciliation.detail", IsBackboneType=true)]
     public partial class DetailsComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "PaymentReconciliation#Details"; } }
+      public override string TypeName { get { return "PaymentReconciliation.detail"; } }
 
       /// <summary>
       /// Type code
@@ -371,14 +370,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("PaymentReconciliation#Notes")]
-    [BackboneType("PaymentReconciliation.processNote")]
+    [FhirType("PaymentReconciliation.processNote", IsBackboneType=true)]
     public partial class NotesComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "PaymentReconciliation#Notes"; } }
+      public override string TypeName { get { return "PaymentReconciliation.processNote"; } }
 
       /// <summary>
       /// display | print | printoper
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Person.cs b/src/Hl7.Fhir.STU3/Model/Generated/Person.cs
index 9281d3f7be..e14a782e54 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/Person.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/Person.cs
@@ -99,14 +99,13 @@ public enum IdentityAssuranceLevel
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Person#Link")]
-    [BackboneType("Person.link")]
+    [FhirType("Person.link", IsBackboneType=true)]
     public partial class LinkComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Person#Link"; } }
+      public override string TypeName { get { return "Person.link"; } }
 
       /// <summary>
       /// The resource to which this actual person is associated
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/PlanDefinition.cs b/src/Hl7.Fhir.STU3/Model/Generated/PlanDefinition.cs
index 0ae8c32b20..0fec26c656 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/PlanDefinition.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/PlanDefinition.cs
@@ -67,14 +67,13 @@ public partial class PlanDefinition : Hl7.Fhir.Model.DomainResource, IIdentifiab
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("PlanDefinition#Goal")]
-    [BackboneType("PlanDefinition.goal")]
+    [FhirType("PlanDefinition.goal", IsBackboneType=true)]
     public partial class GoalComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "PlanDefinition#Goal"; } }
+      public override string TypeName { get { return "PlanDefinition.goal"; } }
 
       /// <summary>
       /// E.g. Treatment, dietary, behavioral, etc
@@ -352,14 +351,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("PlanDefinition#Target")]
-    [BackboneType("PlanDefinition.goal.target")]
+    [FhirType("PlanDefinition.goal.target", IsBackboneType=true)]
     public partial class TargetComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "PlanDefinition#Target"; } }
+      public override string TypeName { get { return "PlanDefinition.goal.target"; } }
 
       /// <summary>
       /// The parameter whose value is to be tracked
@@ -531,14 +529,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("PlanDefinition#Action")]
-    [BackboneType("PlanDefinition.action")]
+    [FhirType("PlanDefinition.action", IsBackboneType=true)]
     public partial class ActionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "PlanDefinition#Action"; } }
+      public override string TypeName { get { return "PlanDefinition.action"; } }
 
       /// <summary>
       /// User-visible label for the action (e.g. 1. or A.)
@@ -1466,14 +1463,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("PlanDefinition#Condition")]
-    [BackboneType("PlanDefinition.action.condition")]
+    [FhirType("PlanDefinition.action.condition", IsBackboneType=true)]
     public partial class ConditionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "PlanDefinition#Condition"; } }
+      public override string TypeName { get { return "PlanDefinition.action.condition"; } }
 
       /// <summary>
       /// applicability | start | stop
@@ -1743,14 +1739,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("PlanDefinition#RelatedAction")]
-    [BackboneType("PlanDefinition.action.relatedAction")]
+    [FhirType("PlanDefinition.action.relatedAction", IsBackboneType=true)]
     public partial class RelatedActionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "PlanDefinition#RelatedAction"; } }
+      public override string TypeName { get { return "PlanDefinition.action.relatedAction"; } }
 
       /// <summary>
       /// What action is this related to
@@ -1961,14 +1956,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("PlanDefinition#Participant")]
-    [BackboneType("PlanDefinition.action.participant")]
+    [FhirType("PlanDefinition.action.participant", IsBackboneType=true)]
     public partial class ParticipantComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "PlanDefinition#Participant"; } }
+      public override string TypeName { get { return "PlanDefinition.action.participant"; } }
 
       /// <summary>
       /// patient | practitioner | related-person
@@ -2134,14 +2128,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("PlanDefinition#DynamicValue")]
-    [BackboneType("PlanDefinition.action.dynamicValue")]
+    [FhirType("PlanDefinition.action.dynamicValue", IsBackboneType=true)]
     public partial class DynamicValueComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "PlanDefinition#DynamicValue"; } }
+      public override string TypeName { get { return "PlanDefinition.action.dynamicValue"; } }
 
       /// <summary>
       /// Natural language description of the dynamic value
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Practitioner.cs b/src/Hl7.Fhir.STU3/Model/Generated/Practitioner.cs
index 2d02c02df0..18ad5c4fe7 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/Practitioner.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/Practitioner.cs
@@ -65,14 +65,13 @@ public partial class Practitioner : Hl7.Fhir.Model.DomainResource, IIdentifiable
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("Practitioner#Qualification")]
-    [BackboneType("Practitioner.qualification")]
+    [FhirType("Practitioner.qualification", IsBackboneType=true)]
     public partial class QualificationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Practitioner#Qualification"; } }
+      public override string TypeName { get { return "Practitioner.qualification"; } }
 
       /// <summary>
       /// An identifier for this qualification for the practitioner
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/PractitionerRole.cs b/src/Hl7.Fhir.STU3/Model/Generated/PractitionerRole.cs
index 57654f8d86..d52cb205c6 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/PractitionerRole.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/PractitionerRole.cs
@@ -68,14 +68,13 @@ public partial class PractitionerRole : Hl7.Fhir.Model.DomainResource, IIdentifi
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("PractitionerRole#AvailableTime")]
-    [BackboneType("PractitionerRole.availableTime")]
+    [FhirType("PractitionerRole.availableTime", IsBackboneType=true)]
     public partial class AvailableTimeComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "PractitionerRole#AvailableTime"; } }
+      public override string TypeName { get { return "PractitionerRole.availableTime"; } }
 
       /// <summary>
       /// mon | tue | wed | thu | fri | sat | sun
@@ -344,14 +343,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("PractitionerRole#NotAvailable")]
-    [BackboneType("PractitionerRole.notAvailable")]
+    [FhirType("PractitionerRole.notAvailable", IsBackboneType=true)]
     public partial class NotAvailableComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "PractitionerRole#NotAvailable"; } }
+      public override string TypeName { get { return "PractitionerRole.notAvailable"; } }
 
       /// <summary>
       /// Reason presented to the user explaining why time not available
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Procedure.cs b/src/Hl7.Fhir.STU3/Model/Generated/Procedure.cs
index bac3aeb121..3153141786 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/Procedure.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/Procedure.cs
@@ -67,14 +67,13 @@ public partial class Procedure : Hl7.Fhir.Model.DomainResource, IIdentifiable<Li
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Procedure#Performer")]
-    [BackboneType("Procedure.performer")]
+    [FhirType("Procedure.performer", IsBackboneType=true)]
     public partial class PerformerComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Procedure#Performer"; } }
+      public override string TypeName { get { return "Procedure.performer"; } }
 
       /// <summary>
       /// The role the actor was in
@@ -249,14 +248,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Procedure#FocalDevice")]
-    [BackboneType("Procedure.focalDevice")]
+    [FhirType("Procedure.focalDevice", IsBackboneType=true)]
     public partial class FocalDeviceComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Procedure#FocalDevice"; } }
+      public override string TypeName { get { return "Procedure.focalDevice"; } }
 
       /// <summary>
       /// Kind of change to device
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/ProcedureRequest.cs b/src/Hl7.Fhir.STU3/Model/Generated/ProcedureRequest.cs
index 49b4b83e1b..df3a51bc57 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/ProcedureRequest.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/ProcedureRequest.cs
@@ -68,14 +68,13 @@ public partial class ProcedureRequest : Hl7.Fhir.Model.DomainResource, IIdentifi
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ProcedureRequest#Requester")]
-    [BackboneType("ProcedureRequest.requester")]
+    [FhirType("ProcedureRequest.requester", IsBackboneType=true)]
     public partial class RequesterComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ProcedureRequest#Requester"; } }
+      public override string TypeName { get { return "ProcedureRequest.requester"; } }
 
       /// <summary>
       /// Individual making the request
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/ProcessRequest.cs b/src/Hl7.Fhir.STU3/Model/Generated/ProcessRequest.cs
index 563fdf85e5..a41fb5d822 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/ProcessRequest.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/ProcessRequest.cs
@@ -101,14 +101,13 @@ public enum ActionList
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ProcessRequest#Items")]
-    [BackboneType("ProcessRequest.item")]
+    [FhirType("ProcessRequest.item", IsBackboneType=true)]
     public partial class ItemsComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ProcessRequest#Items"; } }
+      public override string TypeName { get { return "ProcessRequest.item"; } }
 
       /// <summary>
       /// Service instance
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/ProcessResponse.cs b/src/Hl7.Fhir.STU3/Model/Generated/ProcessResponse.cs
index cf38488c68..77d69bb48d 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/ProcessResponse.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/ProcessResponse.cs
@@ -67,14 +67,13 @@ public partial class ProcessResponse : Hl7.Fhir.Model.DomainResource, IIdentifia
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ProcessResponse#ProcessNote")]
-    [BackboneType("ProcessResponse.processNote")]
+    [FhirType("ProcessResponse.processNote", IsBackboneType=true)]
     public partial class ProcessNoteComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ProcessResponse#ProcessNote"; } }
+      public override string TypeName { get { return "ProcessResponse.processNote"; } }
 
       /// <summary>
       /// display | print | printoper
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Provenance.cs b/src/Hl7.Fhir.STU3/Model/Generated/Provenance.cs
index a6da9469ed..171abc6ff8 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/Provenance.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/Provenance.cs
@@ -109,14 +109,13 @@ public enum ProvenanceEntityRole
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Provenance#Agent")]
-    [BackboneType("Provenance.agent")]
+    [FhirType("Provenance.agent", IsBackboneType=true)]
     public partial class AgentComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Provenance#Agent"; } }
+      public override string TypeName { get { return "Provenance.agent"; } }
 
       /// <summary>
       /// What the agents role was
@@ -320,14 +319,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Provenance#Entity")]
-    [BackboneType("Provenance.entity")]
+    [FhirType("Provenance.entity", IsBackboneType=true)]
     public partial class EntityComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Provenance#Entity"; } }
+      public override string TypeName { get { return "Provenance.entity"; } }
 
       /// <summary>
       /// derivation | revision | quotation | source | removal
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Questionnaire.cs b/src/Hl7.Fhir.STU3/Model/Generated/Questionnaire.cs
index 5abcf6fb33..3dfa393aa4 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/Questionnaire.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/Questionnaire.cs
@@ -174,14 +174,13 @@ public enum QuestionnaireItemType
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Questionnaire#Item")]
-    [BackboneType("Questionnaire.item")]
+    [FhirType("Questionnaire.item", IsBackboneType=true)]
     public partial class ItemComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Questionnaire#Item"; } }
+      public override string TypeName { get { return "Questionnaire.item"; } }
 
       /// <summary>
       /// Unique id for item in questionnaire
@@ -829,14 +828,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Questionnaire#EnableWhen")]
-    [BackboneType("Questionnaire.item.enableWhen")]
+    [FhirType("Questionnaire.item.enableWhen", IsBackboneType=true)]
     public partial class EnableWhenComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Questionnaire#EnableWhen"; } }
+      public override string TypeName { get { return "Questionnaire.item.enableWhen"; } }
 
       /// <summary>
       /// Question that determines whether item is enabled
@@ -1047,14 +1045,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Questionnaire#Option")]
-    [BackboneType("Questionnaire.item.option")]
+    [FhirType("Questionnaire.item.option", IsBackboneType=true)]
     public partial class OptionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Questionnaire#Option"; } }
+      public override string TypeName { get { return "Questionnaire.item.option"; } }
 
       /// <summary>
       /// Answer value
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/QuestionnaireResponse.cs b/src/Hl7.Fhir.STU3/Model/Generated/QuestionnaireResponse.cs
index 6b9b4c2e49..c49032f8cf 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/QuestionnaireResponse.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/QuestionnaireResponse.cs
@@ -109,14 +109,13 @@ public enum QuestionnaireResponseStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("QuestionnaireResponse#Item")]
-    [BackboneType("QuestionnaireResponse.item")]
+    [FhirType("QuestionnaireResponse.item", IsBackboneType=true)]
     public partial class ItemComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "QuestionnaireResponse#Item"; } }
+      public override string TypeName { get { return "QuestionnaireResponse.item"; } }
 
       /// <summary>
       /// Pointer to specific item from Questionnaire
@@ -420,14 +419,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("QuestionnaireResponse#Answer")]
-    [BackboneType("QuestionnaireResponse.item.answer")]
+    [FhirType("QuestionnaireResponse.item.answer", IsBackboneType=true)]
     public partial class AnswerComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "QuestionnaireResponse#Answer"; } }
+      public override string TypeName { get { return "QuestionnaireResponse.item.answer"; } }
 
       /// <summary>
       /// Single-valued answer to the question
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/ReferralRequest.cs b/src/Hl7.Fhir.STU3/Model/Generated/ReferralRequest.cs
index cbb5c39ce5..4148eddf47 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/ReferralRequest.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/ReferralRequest.cs
@@ -67,14 +67,13 @@ public partial class ReferralRequest : Hl7.Fhir.Model.DomainResource, IIdentifia
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ReferralRequest#Requester")]
-    [BackboneType("ReferralRequest.requester")]
+    [FhirType("ReferralRequest.requester", IsBackboneType=true)]
     public partial class RequesterComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ReferralRequest#Requester"; } }
+      public override string TypeName { get { return "ReferralRequest.requester"; } }
 
       /// <summary>
       /// Individual making the request
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/RequestGroup.cs b/src/Hl7.Fhir.STU3/Model/Generated/RequestGroup.cs
index 91389a5959..f792a40c20 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/RequestGroup.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/RequestGroup.cs
@@ -67,14 +67,13 @@ public partial class RequestGroup : Hl7.Fhir.Model.DomainResource, IIdentifiable
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("RequestGroup#Action")]
-    [BackboneType("RequestGroup.action")]
+    [FhirType("RequestGroup.action", IsBackboneType=true)]
     public partial class ActionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "RequestGroup#Action"; } }
+      public override string TypeName { get { return "RequestGroup.action"; } }
 
       /// <summary>
       /// User-visible label for the action (e.g. 1. or A.)
@@ -803,14 +802,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("RequestGroup#Condition")]
-    [BackboneType("RequestGroup.action.condition")]
+    [FhirType("RequestGroup.action.condition", IsBackboneType=true)]
     public partial class ConditionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "RequestGroup#Condition"; } }
+      public override string TypeName { get { return "RequestGroup.action.condition"; } }
 
       /// <summary>
       /// applicability | start | stop
@@ -1079,14 +1077,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("RequestGroup#RelatedAction")]
-    [BackboneType("RequestGroup.action.relatedAction")]
+    [FhirType("RequestGroup.action.relatedAction", IsBackboneType=true)]
     public partial class RelatedActionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "RequestGroup#RelatedAction"; } }
+      public override string TypeName { get { return "RequestGroup.action.relatedAction"; } }
 
       /// <summary>
       /// What action this is related to
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/ResearchStudy.cs b/src/Hl7.Fhir.STU3/Model/Generated/ResearchStudy.cs
index 4437c6bb74..094d0bb2bf 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/ResearchStudy.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/ResearchStudy.cs
@@ -114,14 +114,13 @@ public enum ResearchStudyStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ResearchStudy#Arm")]
-    [BackboneType("ResearchStudy.arm")]
+    [FhirType("ResearchStudy.arm", IsBackboneType=true)]
     public partial class ArmComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ResearchStudy#Arm"; } }
+      public override string TypeName { get { return "ResearchStudy.arm"; } }
 
       /// <summary>
       /// Label for study arm
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/RiskAssessment.cs b/src/Hl7.Fhir.STU3/Model/Generated/RiskAssessment.cs
index 9574aafc4d..7aa7525aa3 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/RiskAssessment.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/RiskAssessment.cs
@@ -68,14 +68,13 @@ public partial class RiskAssessment : Hl7.Fhir.Model.DomainResource, IIdentifiab
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("RiskAssessment#Prediction")]
-    [BackboneType("RiskAssessment.prediction")]
+    [FhirType("RiskAssessment.prediction", IsBackboneType=true)]
     public partial class PredictionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "RiskAssessment#Prediction"; } }
+      public override string TypeName { get { return "RiskAssessment.prediction"; } }
 
       /// <summary>
       /// Possible outcome for the subject
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/SearchParameter.cs b/src/Hl7.Fhir.STU3/Model/Generated/SearchParameter.cs
index 8a761a8243..1bee272449 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/SearchParameter.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/SearchParameter.cs
@@ -242,14 +242,13 @@ public enum SearchModifierCode
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("SearchParameter#Component")]
-    [BackboneType("SearchParameter.component")]
+    [FhirType("SearchParameter.component", IsBackboneType=true)]
     public partial class ComponentComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "SearchParameter#Component"; } }
+      public override string TypeName { get { return "SearchParameter.component"; } }
 
       /// <summary>
       /// Defines how the part works
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Sequence.cs b/src/Hl7.Fhir.STU3/Model/Generated/Sequence.cs
index a73ff0be4a..54f11c3388 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/Sequence.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/Sequence.cs
@@ -135,14 +135,13 @@ public enum RepositoryType
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Sequence#ReferenceSeq")]
-    [BackboneType("Sequence.referenceSeq")]
+    [FhirType("Sequence.referenceSeq", IsBackboneType=true)]
     public partial class ReferenceSeqComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Sequence#ReferenceSeq"; } }
+      public override string TypeName { get { return "Sequence.referenceSeq"; } }
 
       /// <summary>
       /// Chromosome containing genetic finding
@@ -532,14 +531,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Sequence#Variant")]
-    [BackboneType("Sequence.variant")]
+    [FhirType("Sequence.variant", IsBackboneType=true)]
     public partial class VariantComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Sequence#Variant"; } }
+      public override string TypeName { get { return "Sequence.variant"; } }
 
       /// <summary>
       /// Start position of the variant on the  reference sequence
@@ -875,14 +873,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Sequence#Quality")]
-    [BackboneType("Sequence.quality")]
+    [FhirType("Sequence.quality", IsBackboneType=true)]
     public partial class QualityComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Sequence#Quality"; } }
+      public override string TypeName { get { return "Sequence.quality"; } }
 
       /// <summary>
       /// indel | snp | unknown
@@ -1529,14 +1526,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Sequence#Repository")]
-    [BackboneType("Sequence.repository")]
+    [FhirType("Sequence.repository", IsBackboneType=true)]
     public partial class RepositoryComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Sequence#Repository"; } }
+      public override string TypeName { get { return "Sequence.repository"; } }
 
       /// <summary>
       /// directlink | openapi | login | oauth | other
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Specimen.cs b/src/Hl7.Fhir.STU3/Model/Generated/Specimen.cs
index 4a8be9edb6..5cdfdec5fa 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/Specimen.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/Specimen.cs
@@ -101,14 +101,13 @@ public enum SpecimenStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Specimen#Collection")]
-    [BackboneType("Specimen.collection")]
+    [FhirType("Specimen.collection", IsBackboneType=true)]
     public partial class CollectionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Specimen#Collection"; } }
+      public override string TypeName { get { return "Specimen.collection"; } }
 
       /// <summary>
       /// Who collected the specimen
@@ -333,14 +332,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Specimen#Processing")]
-    [BackboneType("Specimen.processing")]
+    [FhirType("Specimen.processing", IsBackboneType=true)]
     public partial class ProcessingComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Specimen#Processing"; } }
+      public override string TypeName { get { return "Specimen.processing"; } }
 
       /// <summary>
       /// Textual description of procedure
@@ -558,14 +556,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Specimen#Container")]
-    [BackboneType("Specimen.container")]
+    [FhirType("Specimen.container", IsBackboneType=true)]
     public partial class ContainerComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Specimen#Container"; } }
+      public override string TypeName { get { return "Specimen.container"; } }
 
       /// <summary>
       /// Id for the container
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/StructureDefinition.cs b/src/Hl7.Fhir.STU3/Model/Generated/StructureDefinition.cs
index a3588ad4ac..ad81b424ff 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/StructureDefinition.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/StructureDefinition.cs
@@ -151,14 +151,13 @@ public enum TypeDerivationRule
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("StructureDefinition#Mapping")]
-    [BackboneType("StructureDefinition.mapping")]
+    [FhirType("StructureDefinition.mapping", IsBackboneType=true)]
     public partial class MappingComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "StructureDefinition#Mapping"; } }
+      public override string TypeName { get { return "StructureDefinition.mapping"; } }
 
       /// <summary>
       /// Internal id when this mapping is used
@@ -425,14 +424,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("StructureDefinition#Snapshot")]
-    [BackboneType("StructureDefinition.snapshot")]
+    [FhirType("StructureDefinition.snapshot", IsBackboneType=true)]
     public partial class SnapshotComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "StructureDefinition#Snapshot"; } }
+      public override string TypeName { get { return "StructureDefinition.snapshot"; } }
 
       /// <summary>
       /// Definition of elements in the resource (if no StructureDefinition)
@@ -552,14 +550,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("StructureDefinition#Differential")]
-    [BackboneType("StructureDefinition.differential")]
+    [FhirType("StructureDefinition.differential", IsBackboneType=true)]
     public partial class DifferentialComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "StructureDefinition#Differential"; } }
+      public override string TypeName { get { return "StructureDefinition.differential"; } }
 
       /// <summary>
       /// Definition of elements in the resource (if no StructureDefinition)
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/StructureMap.cs b/src/Hl7.Fhir.STU3/Model/Generated/StructureMap.cs
index b5e3986a2a..448ea855f2 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/StructureMap.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/StructureMap.cs
@@ -357,14 +357,13 @@ public enum StructureMapTransform
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("StructureMap#Structure")]
-    [BackboneType("StructureMap.structure")]
+    [FhirType("StructureMap.structure", IsBackboneType=true)]
     public partial class StructureComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "StructureMap#Structure"; } }
+      public override string TypeName { get { return "StructureMap.structure"; } }
 
       /// <summary>
       /// Canonical URL for structure definition
@@ -634,14 +633,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("StructureMap#Group")]
-    [BackboneType("StructureMap.group")]
+    [FhirType("StructureMap.group", IsBackboneType=true)]
     public partial class GroupComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "StructureMap#Group"; } }
+      public override string TypeName { get { return "StructureMap.group"; } }
 
       /// <summary>
       /// Human-readable label
@@ -964,14 +962,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("StructureMap#Input")]
-    [BackboneType("StructureMap.group.input")]
+    [FhirType("StructureMap.group.input", IsBackboneType=true)]
     public partial class InputComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "StructureMap#Input"; } }
+      public override string TypeName { get { return "StructureMap.group.input"; } }
 
       /// <summary>
       /// Name for this instance of data
@@ -1238,14 +1235,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("StructureMap#Rule")]
-    [BackboneType("StructureMap.group.rule")]
+    [FhirType("StructureMap.group.rule", IsBackboneType=true)]
     public partial class RuleComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "StructureMap#Rule"; } }
+      public override string TypeName { get { return "StructureMap.group.rule"; } }
 
       /// <summary>
       /// Name of the rule for internal references
@@ -1527,14 +1523,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("StructureMap#Source")]
-    [BackboneType("StructureMap.group.rule.source")]
+    [FhirType("StructureMap.group.rule.source", IsBackboneType=true)]
     public partial class SourceComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "StructureMap#Source"; } }
+      public override string TypeName { get { return "StructureMap.group.rule.source"; } }
 
       /// <summary>
       /// Type or variable this rule applies to
@@ -2042,14 +2037,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("StructureMap#Target")]
-    [BackboneType("StructureMap.group.rule.target")]
+    [FhirType("StructureMap.group.rule.target", IsBackboneType=true)]
     public partial class TargetComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "StructureMap#Target"; } }
+      public override string TypeName { get { return "StructureMap.group.rule.target"; } }
 
       /// <summary>
       /// Type or variable this rule applies to
@@ -2474,14 +2468,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("StructureMap#Parameter")]
-    [BackboneType("StructureMap.group.rule.target.parameter")]
+    [FhirType("StructureMap.group.rule.target.parameter", IsBackboneType=true)]
     public partial class ParameterComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "StructureMap#Parameter"; } }
+      public override string TypeName { get { return "StructureMap.group.rule.target.parameter"; } }
 
       /// <summary>
       /// Parameter value - variable or literal
@@ -2600,14 +2593,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("StructureMap#Dependent")]
-    [BackboneType("StructureMap.group.rule.dependent")]
+    [FhirType("StructureMap.group.rule.dependent", IsBackboneType=true)]
     public partial class DependentComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "StructureMap#Dependent"; } }
+      public override string TypeName { get { return "StructureMap.group.rule.dependent"; } }
 
       /// <summary>
       /// Name of a rule or group to apply
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Subscription.cs b/src/Hl7.Fhir.STU3/Model/Generated/Subscription.cs
index 80174c605b..8f57fabaef 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/Subscription.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/Subscription.cs
@@ -141,14 +141,13 @@ public enum SubscriptionChannelType
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Subscription#Channel")]
-    [BackboneType("Subscription.channel")]
+    [FhirType("Subscription.channel", IsBackboneType=true)]
     public partial class ChannelComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Subscription#Channel"; } }
+      public override string TypeName { get { return "Subscription.channel"; } }
 
       /// <summary>
       /// rest-hook | websocket | email | sms | message
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Substance.cs b/src/Hl7.Fhir.STU3/Model/Generated/Substance.cs
index 9f751a503a..11ee00031e 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/Substance.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/Substance.cs
@@ -92,14 +92,13 @@ public enum FHIRSubstanceStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Substance#Instance")]
-    [BackboneType("Substance.instance")]
+    [FhirType("Substance.instance", IsBackboneType=true)]
     public partial class InstanceComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Substance#Instance"; } }
+      public override string TypeName { get { return "Substance.instance"; } }
 
       /// <summary>
       /// Identifier of the package/container
@@ -286,14 +285,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Substance#Ingredient")]
-    [BackboneType("Substance.ingredient")]
+    [FhirType("Substance.ingredient", IsBackboneType=true)]
     public partial class IngredientComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Substance#Ingredient"; } }
+      public override string TypeName { get { return "Substance.ingredient"; } }
 
       /// <summary>
       /// Optional amount (concentration)
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/SupplyDelivery.cs b/src/Hl7.Fhir.STU3/Model/Generated/SupplyDelivery.cs
index bbdb871ea6..1f28cc8785 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/SupplyDelivery.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/SupplyDelivery.cs
@@ -123,14 +123,13 @@ public enum SupplyItemType
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("SupplyDelivery#SuppliedItem")]
-    [BackboneType("SupplyDelivery.suppliedItem")]
+    [FhirType("SupplyDelivery.suppliedItem", IsBackboneType=true)]
     public partial class SuppliedItemComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "SupplyDelivery#SuppliedItem"; } }
+      public override string TypeName { get { return "SupplyDelivery.suppliedItem"; } }
 
       /// <summary>
       /// Amount dispensed
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/SupplyRequest.cs b/src/Hl7.Fhir.STU3/Model/Generated/SupplyRequest.cs
index 14af537cae..7e9a41489b 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/SupplyRequest.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/SupplyRequest.cs
@@ -116,14 +116,13 @@ public enum SupplyRequestStatus
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("SupplyRequest#OrderedItem")]
-    [BackboneType("SupplyRequest.orderedItem")]
+    [FhirType("SupplyRequest.orderedItem", IsBackboneType=true)]
     public partial class OrderedItemComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "SupplyRequest#OrderedItem"; } }
+      public override string TypeName { get { return "SupplyRequest.orderedItem"; } }
 
       /// <summary>
       /// The requested amount of the item indicated
@@ -272,14 +271,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("SupplyRequest#Requester")]
-    [BackboneType("SupplyRequest.requester")]
+    [FhirType("SupplyRequest.requester", IsBackboneType=true)]
     public partial class RequesterComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "SupplyRequest#Requester"; } }
+      public override string TypeName { get { return "SupplyRequest.requester"; } }
 
       /// <summary>
       /// Individual making the request
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Task.cs b/src/Hl7.Fhir.STU3/Model/Generated/Task.cs
index db4a1b9c2e..46c34603ad 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/Task.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/Task.cs
@@ -146,14 +146,13 @@ public enum TaskStatus
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Task#Requester")]
-    [BackboneType("Task.requester")]
+    [FhirType("Task.requester", IsBackboneType=true)]
     public partial class RequesterComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Task#Requester"; } }
+      public override string TypeName { get { return "Task.requester"; } }
 
       /// <summary>
       /// Individual asking for task
@@ -302,14 +301,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Task#Restriction")]
-    [BackboneType("Task.restriction")]
+    [FhirType("Task.restriction", IsBackboneType=true)]
     public partial class RestrictionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Task#Restriction"; } }
+      public override string TypeName { get { return "Task.restriction"; } }
 
       /// <summary>
       /// How many times to repeat
@@ -499,14 +497,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Task#Parameter")]
-    [BackboneType("Task.input")]
+    [FhirType("Task.input", IsBackboneType=true)]
     public partial class ParameterComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Task#Parameter"; } }
+      public override string TypeName { get { return "Task.input"; } }
 
       /// <summary>
       /// Label for the input
@@ -655,14 +652,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Task#Output")]
-    [BackboneType("Task.output")]
+    [FhirType("Task.output", IsBackboneType=true)]
     public partial class OutputComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Task#Output"; } }
+      public override string TypeName { get { return "Task.output"; } }
 
       /// <summary>
       /// Label for output
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/TestReport.cs b/src/Hl7.Fhir.STU3/Model/Generated/TestReport.cs
index 572cddbf8b..aa629b8704 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/TestReport.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/TestReport.cs
@@ -200,14 +200,13 @@ public enum TestReportActionResult
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("TestReport#Participant")]
-    [BackboneType("TestReport.participant")]
+    [FhirType("TestReport.participant", IsBackboneType=true)]
     public partial class ParticipantComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TestReport#Participant"; } }
+      public override string TypeName { get { return "TestReport.participant"; } }
 
       /// <summary>
       /// test-engine | client | server
@@ -431,14 +430,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("TestReport#Setup")]
-    [BackboneType("TestReport.setup")]
+    [FhirType("TestReport.setup", IsBackboneType=true)]
     public partial class SetupComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TestReport#Setup"; } }
+      public override string TypeName { get { return "TestReport.setup"; } }
 
       /// <summary>
       /// A setup operation or assert that was executed
@@ -559,14 +557,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestReport#SetupAction")]
-    [BackboneType("TestReport.setup.action")]
+    [FhirType("TestReport.setup.action", IsBackboneType=true)]
     public partial class SetupActionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TestReport#SetupAction"; } }
+      public override string TypeName { get { return "TestReport.setup.action"; } }
 
       /// <summary>
       /// The operation to perform
@@ -710,14 +707,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestReport#Operation")]
-    [BackboneType("TestReport.setup.action.operation")]
+    [FhirType("TestReport.setup.action.operation", IsBackboneType=true)]
     public partial class OperationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TestReport#Operation"; } }
+      public override string TypeName { get { return "TestReport.setup.action.operation"; } }
 
       /// <summary>
       /// pass | skip | fail | warning | error
@@ -943,14 +939,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestReport#Assert")]
-    [BackboneType("TestReport.setup.action.assert")]
+    [FhirType("TestReport.setup.action.assert", IsBackboneType=true)]
     public partial class AssertComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TestReport#Assert"; } }
+      public override string TypeName { get { return "TestReport.setup.action.assert"; } }
 
       /// <summary>
       /// pass | skip | fail | warning | error
@@ -1173,14 +1168,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("TestReport#Test")]
-    [BackboneType("TestReport.test")]
+    [FhirType("TestReport.test", IsBackboneType=true)]
     public partial class TestComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TestReport#Test"; } }
+      public override string TypeName { get { return "TestReport.test"; } }
 
       /// <summary>
       /// Tracking/logging name of this test
@@ -1387,14 +1381,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestReport#TestAction")]
-    [BackboneType("TestReport.test.action")]
+    [FhirType("TestReport.test.action", IsBackboneType=true)]
     public partial class TestActionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TestReport#TestAction"; } }
+      public override string TypeName { get { return "TestReport.test.action"; } }
 
       /// <summary>
       /// The operation performed
@@ -1538,14 +1531,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestReport#Teardown")]
-    [BackboneType("TestReport.teardown")]
+    [FhirType("TestReport.teardown", IsBackboneType=true)]
     public partial class TeardownComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TestReport#Teardown"; } }
+      public override string TypeName { get { return "TestReport.teardown"; } }
 
       /// <summary>
       /// One or more teardown operations performed
@@ -1666,14 +1658,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestReport#TeardownAction")]
-    [BackboneType("TestReport.teardown.action")]
+    [FhirType("TestReport.teardown.action", IsBackboneType=true)]
     public partial class TeardownActionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TestReport#TeardownAction"; } }
+      public override string TypeName { get { return "TestReport.teardown.action"; } }
 
       /// <summary>
       /// The teardown operation performed
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/TestScript.cs b/src/Hl7.Fhir.STU3/Model/Generated/TestScript.cs
index 056a599635..ae3a855c25 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/TestScript.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/TestScript.cs
@@ -328,14 +328,13 @@ public enum AssertionResponseTypes
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#Origin")]
-    [BackboneType("TestScript.origin")]
+    [FhirType("TestScript.origin", IsBackboneType=true)]
     public partial class OriginComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TestScript#Origin"; } }
+      public override string TypeName { get { return "TestScript.origin"; } }
 
       /// <summary>
       /// The index of the abstract origin server starting at 1
@@ -501,14 +500,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#Destination")]
-    [BackboneType("TestScript.destination")]
+    [FhirType("TestScript.destination", IsBackboneType=true)]
     public partial class DestinationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TestScript#Destination"; } }
+      public override string TypeName { get { return "TestScript.destination"; } }
 
       /// <summary>
       /// The index of the abstract destination server starting at 1
@@ -673,14 +671,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#Metadata")]
-    [BackboneType("TestScript.metadata")]
+    [FhirType("TestScript.metadata", IsBackboneType=true)]
     public partial class MetadataComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TestScript#Metadata"; } }
+      public override string TypeName { get { return "TestScript.metadata"; } }
 
       /// <summary>
       /// Links to the FHIR specification
@@ -826,14 +823,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#Link")]
-    [BackboneType("TestScript.metadata.link")]
+    [FhirType("TestScript.metadata.link", IsBackboneType=true)]
     public partial class LinkComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TestScript#Link"; } }
+      public override string TypeName { get { return "TestScript.metadata.link"; } }
 
       /// <summary>
       /// URL to the specification
@@ -1015,14 +1011,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#Capability")]
-    [BackboneType("TestScript.metadata.capability")]
+    [FhirType("TestScript.metadata.capability", IsBackboneType=true)]
     public partial class CapabilityComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TestScript#Capability"; } }
+      public override string TypeName { get { return "TestScript.metadata.capability"; } }
 
       /// <summary>
       /// Are the capabilities required?
@@ -1404,14 +1399,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#Fixture")]
-    [BackboneType("TestScript.fixture")]
+    [FhirType("TestScript.fixture", IsBackboneType=true)]
     public partial class FixtureComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TestScript#Fixture"; } }
+      public override string TypeName { get { return "TestScript.fixture"; } }
 
       /// <summary>
       /// Whether or not to implicitly create the fixture during setup
@@ -1619,14 +1613,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#Variable")]
-    [BackboneType("TestScript.variable")]
+    [FhirType("TestScript.variable", IsBackboneType=true)]
     public partial class VariableComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TestScript#Variable"; } }
+      public override string TypeName { get { return "TestScript.variable"; } }
 
       /// <summary>
       /// Descriptive name for this variable
@@ -2066,14 +2059,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#Rule")]
-    [BackboneType("TestScript.rule")]
+    [FhirType("TestScript.rule", IsBackboneType=true)]
     public partial class RuleComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TestScript#Rule"; } }
+      public override string TypeName { get { return "TestScript.rule"; } }
 
       /// <summary>
       /// Assert rule resource reference
@@ -2222,14 +2214,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#RuleParam")]
-    [BackboneType("TestScript.rule.param")]
+    [FhirType("TestScript.rule.param", IsBackboneType=true)]
     public partial class RuleParamComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TestScript#RuleParam"; } }
+      public override string TypeName { get { return "TestScript.rule.param"; } }
 
       /// <summary>
       /// Parameter name matching external assert rule parameter
@@ -2411,14 +2402,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#Ruleset")]
-    [BackboneType("TestScript.ruleset")]
+    [FhirType("TestScript.ruleset", IsBackboneType=true)]
     public partial class RulesetComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TestScript#Ruleset"; } }
+      public override string TypeName { get { return "TestScript.ruleset"; } }
 
       /// <summary>
       /// Assert ruleset resource reference
@@ -2567,14 +2557,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#RulesetRule")]
-    [BackboneType("TestScript.ruleset.rule")]
+    [FhirType("TestScript.ruleset.rule", IsBackboneType=true)]
     public partial class RulesetRuleComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TestScript#RulesetRule"; } }
+      public override string TypeName { get { return "TestScript.ruleset.rule"; } }
 
       /// <summary>
       /// Id of referenced rule within the ruleset
@@ -2739,14 +2728,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#RulesetRuleParam")]
-    [BackboneType("TestScript.ruleset.rule.param")]
+    [FhirType("TestScript.ruleset.rule.param", IsBackboneType=true)]
     public partial class RulesetRuleParamComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TestScript#RulesetRuleParam"; } }
+      public override string TypeName { get { return "TestScript.ruleset.rule.param"; } }
 
       /// <summary>
       /// Parameter name matching external assert ruleset rule parameter
@@ -2924,14 +2912,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#Setup")]
-    [BackboneType("TestScript.setup")]
+    [FhirType("TestScript.setup", IsBackboneType=true)]
     public partial class SetupComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TestScript#Setup"; } }
+      public override string TypeName { get { return "TestScript.setup"; } }
 
       /// <summary>
       /// A setup operation or assert to perform
@@ -3052,14 +3039,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#SetupAction")]
-    [BackboneType("TestScript.setup.action")]
+    [FhirType("TestScript.setup.action", IsBackboneType=true)]
     public partial class SetupActionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TestScript#SetupAction"; } }
+      public override string TypeName { get { return "TestScript.setup.action"; } }
 
       /// <summary>
       /// The setup operation to perform
@@ -3203,14 +3189,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#Operation")]
-    [BackboneType("TestScript.setup.action.operation")]
+    [FhirType("TestScript.setup.action.operation", IsBackboneType=true)]
     public partial class OperationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TestScript#Operation"; } }
+      public override string TypeName { get { return "TestScript.setup.action.operation"; } }
 
       /// <summary>
       /// The operation code type that will be executed
@@ -3965,14 +3950,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#RequestHeader")]
-    [BackboneType("TestScript.setup.action.operation.requestHeader")]
+    [FhirType("TestScript.setup.action.operation.requestHeader", IsBackboneType=true)]
     public partial class RequestHeaderComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TestScript#RequestHeader"; } }
+      public override string TypeName { get { return "TestScript.setup.action.operation.requestHeader"; } }
 
       /// <summary>
       /// HTTP header field name
@@ -4155,14 +4139,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#Assert")]
-    [BackboneType("TestScript.setup.action.assert")]
+    [FhirType("TestScript.setup.action.assert", IsBackboneType=true)]
     public partial class AssertComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TestScript#Assert"; } }
+      public override string TypeName { get { return "TestScript.setup.action.assert"; } }
 
       /// <summary>
       /// Tracking/logging assertion label
@@ -5265,14 +5248,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#ActionAssertRule")]
-    [BackboneType("TestScript.setup.action.assert.rule")]
+    [FhirType("TestScript.setup.action.assert.rule", IsBackboneType=true)]
     public partial class ActionAssertRuleComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TestScript#ActionAssertRule"; } }
+      public override string TypeName { get { return "TestScript.setup.action.assert.rule"; } }
 
       /// <summary>
       /// Id of the TestScript.rule
@@ -5437,14 +5419,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#ActionAssertRuleParam")]
-    [BackboneType("TestScript.setup.action.assert.rule.param")]
+    [FhirType("TestScript.setup.action.assert.rule.param", IsBackboneType=true)]
     public partial class ActionAssertRuleParamComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TestScript#ActionAssertRuleParam"; } }
+      public override string TypeName { get { return "TestScript.setup.action.assert.rule.param"; } }
 
       /// <summary>
       /// Parameter name matching external assert rule parameter
@@ -5627,14 +5608,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#ActionAssertRuleset")]
-    [BackboneType("TestScript.setup.action.assert.ruleset")]
+    [FhirType("TestScript.setup.action.assert.ruleset", IsBackboneType=true)]
     public partial class ActionAssertRulesetComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TestScript#ActionAssertRuleset"; } }
+      public override string TypeName { get { return "TestScript.setup.action.assert.ruleset"; } }
 
       /// <summary>
       /// Id of the TestScript.ruleset
@@ -5799,14 +5779,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#ActionAssertRulesetRule")]
-    [BackboneType("TestScript.setup.action.assert.ruleset.rule")]
+    [FhirType("TestScript.setup.action.assert.ruleset.rule", IsBackboneType=true)]
     public partial class ActionAssertRulesetRuleComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TestScript#ActionAssertRulesetRule"; } }
+      public override string TypeName { get { return "TestScript.setup.action.assert.ruleset.rule"; } }
 
       /// <summary>
       /// Id of referenced rule within the ruleset
@@ -5971,14 +5950,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#Param")]
-    [BackboneType("TestScript.setup.action.assert.ruleset.rule.param")]
+    [FhirType("TestScript.setup.action.assert.ruleset.rule.param", IsBackboneType=true)]
     public partial class ParamComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TestScript#Param"; } }
+      public override string TypeName { get { return "TestScript.setup.action.assert.ruleset.rule.param"; } }
 
       /// <summary>
       /// Parameter name matching external assert ruleset rule parameter
@@ -6157,14 +6135,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </summary>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#Test")]
-    [BackboneType("TestScript.test")]
+    [FhirType("TestScript.test", IsBackboneType=true)]
     public partial class TestComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TestScript#Test"; } }
+      public override string TypeName { get { return "TestScript.test"; } }
 
       /// <summary>
       /// Tracking/logging name of this test
@@ -6371,14 +6348,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#TestAction")]
-    [BackboneType("TestScript.test.action")]
+    [FhirType("TestScript.test.action", IsBackboneType=true)]
     public partial class TestActionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TestScript#TestAction"; } }
+      public override string TypeName { get { return "TestScript.test.action"; } }
 
       /// <summary>
       /// The setup operation to perform
@@ -6522,14 +6498,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#Teardown")]
-    [BackboneType("TestScript.teardown")]
+    [FhirType("TestScript.teardown", IsBackboneType=true)]
     public partial class TeardownComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TestScript#Teardown"; } }
+      public override string TypeName { get { return "TestScript.teardown"; } }
 
       /// <summary>
       /// One or more teardown operations to perform
@@ -6650,14 +6625,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("TestScript#TeardownAction")]
-    [BackboneType("TestScript.teardown.action")]
+    [FhirType("TestScript.teardown.action", IsBackboneType=true)]
     public partial class TeardownActionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "TestScript#TeardownAction"; } }
+      public override string TypeName { get { return "TestScript.teardown.action"; } }
 
       /// <summary>
       /// The teardown operation to perform
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Timing.cs b/src/Hl7.Fhir.STU3/Model/Generated/Timing.cs
index f1dbbd33eb..1477b47a04 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/Timing.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/Timing.cs
@@ -248,14 +248,13 @@ public enum EventTiming
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("Timing#Repeat")]
-    [BackboneType("Timing.repeat")]
+    [FhirType("Timing.repeat", IsBackboneType=true)]
     public partial class RepeatComponent : Hl7.Fhir.Model.Element
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "Timing#Repeat"; } }
+      public override string TypeName { get { return "Timing.repeat"; } }
 
       /// <summary>
       /// Length/Range of lengths, or (Start and/or end) limits
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/ValueSet.cs b/src/Hl7.Fhir.STU3/Model/Generated/ValueSet.cs
index 5300ef5f0c..f716e3b478 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/ValueSet.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/ValueSet.cs
@@ -67,14 +67,13 @@ public partial class ValueSet : Hl7.Fhir.Model.DomainResource, IIdentifiable<Lis
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ValueSet#Compose")]
-    [BackboneType("ValueSet.compose")]
+    [FhirType("ValueSet.compose", IsBackboneType=true)]
     public partial class ComposeComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ValueSet#Compose"; } }
+      public override string TypeName { get { return "ValueSet.compose"; } }
 
       /// <summary>
       /// Fixed date for version-less references (transitive)
@@ -306,14 +305,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ValueSet#ConceptSet")]
-    [BackboneType("ValueSet.compose.include")]
+    [FhirType("ValueSet.compose.include", IsBackboneType=true)]
     public partial class ConceptSetComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ValueSet#ConceptSet"; } }
+      public override string TypeName { get { return "ValueSet.compose.include"; } }
 
       /// <summary>
       /// The system the codes come from
@@ -590,14 +588,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ValueSet#ConceptReference")]
-    [BackboneType("ValueSet.compose.include.concept")]
+    [FhirType("ValueSet.compose.include.concept", IsBackboneType=true)]
     public partial class ConceptReferenceComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ValueSet#ConceptReference"; } }
+      public override string TypeName { get { return "ValueSet.compose.include.concept"; } }
 
       /// <summary>
       /// Code or expression from system
@@ -804,14 +801,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ValueSet#Designation")]
-    [BackboneType("ValueSet.compose.include.concept.designation")]
+    [FhirType("ValueSet.compose.include.concept.designation", IsBackboneType=true)]
     public partial class DesignationComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ValueSet#Designation"; } }
+      public override string TypeName { get { return "ValueSet.compose.include.concept.designation"; } }
 
       /// <summary>
       /// Human language of the designation
@@ -1020,14 +1016,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ValueSet#Filter")]
-    [BackboneType("ValueSet.compose.include.filter")]
+    [FhirType("ValueSet.compose.include.filter", IsBackboneType=true)]
     public partial class FilterComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ValueSet#Filter"; } }
+      public override string TypeName { get { return "ValueSet.compose.include.filter"; } }
 
       /// <summary>
       /// A property defined by the code system
@@ -1256,14 +1251,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ValueSet#Expansion")]
-    [BackboneType("ValueSet.expansion")]
+    [FhirType("ValueSet.expansion", IsBackboneType=true)]
     public partial class ExpansionComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ValueSet#Expansion"; } }
+      public override string TypeName { get { return "ValueSet.expansion"; } }
 
       /// <summary>
       /// Uniquely identifies this expansion
@@ -1584,14 +1578,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ValueSet#Parameter")]
-    [BackboneType("ValueSet.expansion.parameter")]
+    [FhirType("ValueSet.expansion.parameter", IsBackboneType=true)]
     public partial class ParameterComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ValueSet#Parameter"; } }
+      public override string TypeName { get { return "ValueSet.expansion.parameter"; } }
 
       /// <summary>
       /// Name as assigned by the server
@@ -1756,14 +1749,13 @@ protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("ValueSet#Contains")]
-    [BackboneType("ValueSet.expansion.contains")]
+    [FhirType("ValueSet.expansion.contains", IsBackboneType=true)]
     public partial class ContainsComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "ValueSet#Contains"; } }
+      public override string TypeName { get { return "ValueSet.expansion.contains"; } }
 
       /// <summary>
       /// System value for the code
diff --git a/src/Hl7.Fhir.STU3/Model/Generated/VisionPrescription.cs b/src/Hl7.Fhir.STU3/Model/Generated/VisionPrescription.cs
index e2db17de91..46ca88afef 100644
--- a/src/Hl7.Fhir.STU3/Model/Generated/VisionPrescription.cs
+++ b/src/Hl7.Fhir.STU3/Model/Generated/VisionPrescription.cs
@@ -123,14 +123,13 @@ public enum VisionBase
     /// </remarks>
     [Serializable]
     [DataContract]
-    [FhirType("VisionPrescription#Dispense")]
-    [BackboneType("VisionPrescription.dispense")]
+    [FhirType("VisionPrescription.dispense", IsBackboneType=true)]
     public partial class DispenseComponent : Hl7.Fhir.Model.BackboneElement
     {
       /// <summary>
       /// FHIR Type Name
       /// </summary>
-      public override string TypeName { get { return "VisionPrescription#Dispense"; } }
+      public override string TypeName { get { return "VisionPrescription.dispense"; } }
 
       /// <summary>
       /// Product to be supplied
diff --git a/src/Hl7.Fhir.Specification.STU3.Tests/Snapshot/SnapshotGeneratorTest.cs b/src/Hl7.Fhir.Specification.STU3.Tests/Snapshot/SnapshotGeneratorTest.cs
index 04c280575f..1f2a91c413 100644
--- a/src/Hl7.Fhir.Specification.STU3.Tests/Snapshot/SnapshotGeneratorTest.cs
+++ b/src/Hl7.Fhir.Specification.STU3.Tests/Snapshot/SnapshotGeneratorTest.cs
@@ -49,7 +49,7 @@ public class SnapshotGeneratorTest2
         {
             // Throw on unresolved profile references; must include in TestData folder
             GenerateSnapshotForExternalProfiles = true,
-            ForceRegenerateSnapshots = true,
+            RegenerationBehaviour = RegenerationSettings.REGENERATE_ONCE,
             GenerateExtensionsOnConstraints = false,
             GenerateAnnotationsOnConstraints = false,
             GenerateElementIds = true // STU3
diff --git a/src/Hl7.FhirPath.R4.Tests/PocoTests/FhirPathParallelTest.cs b/src/Hl7.FhirPath.R4.Tests/PocoTests/FhirPathParallelTest.cs
index 2ef35840a9..5bf1883468 100644
--- a/src/Hl7.FhirPath.R4.Tests/PocoTests/FhirPathParallelTest.cs
+++ b/src/Hl7.FhirPath.R4.Tests/PocoTests/FhirPathParallelTest.cs
@@ -130,7 +130,7 @@ private static CompiledExpression GetCompiledExpression(string expression)
         public static IEnumerable<ITypedElement> Select(this ITypedElement input, string expression, EvaluationContext ctx = null)
         {
             var evaluator = GetCompiledExpression(expression);
-            return evaluator(input, ctx ?? EvaluationContext.CreateDefault());
+            return evaluator(input, ctx ?? new EvaluationContext());
         }
 
     }

From f2afb0b3f01e66759ba375e0034cf4173c1c6d80 Mon Sep 17 00:00:00 2001
From: Kasdejong <k.j2.de.jong@student.vu.nl>
Date: Tue, 22 Oct 2024 14:03:27 +0200
Subject: [PATCH 08/18] changed SSG setting usage

---
 .../Snapshot/SnapshotGenerator.cs             | 27 ++++++++++++-------
 .../Snapshot/SnapshotGenerator.cs             | 23 ++++++++++++----
 .../Snapshot/SnapshotGeneratorSettings.cs     |  4 +--
 3 files changed, 37 insertions(+), 17 deletions(-)

diff --git a/src/Hl7.Fhir.Conformance/Specification/Snapshot/SnapshotGenerator.cs b/src/Hl7.Fhir.Conformance/Specification/Snapshot/SnapshotGenerator.cs
index 3ab2d39af4..225ce4f18b 100644
--- a/src/Hl7.Fhir.Conformance/Specification/Snapshot/SnapshotGenerator.cs
+++ b/src/Hl7.Fhir.Conformance/Specification/Snapshot/SnapshotGenerator.cs
@@ -2224,11 +2224,15 @@ private async Tasks.Task<bool> ensureSnapshot(StructureDefinition sd, string pro
 
             try
             {
-                if (_settings.GenerateSnapshotForExternalProfiles
-#pragma warning disable CS0618 // Type or member is obsolete
-                && (!sd.HasSnapshot || (_settings.ForceRegenerateSnapshots && !sd.Snapshot.IsCreatedBySnapshotGenerator()))
-                )
-#pragma warning restore CS0618 // Type or member is obsolete
+                var shouldGenerate = _settings.RegenerationBehaviour switch
+                {
+                    RegenerationSettings.TRY_USE_EXISTING => !sd.HasSnapshot,
+                    RegenerationSettings.REGENERATE_ONCE => !sd.HasSnapshot || !sd.Snapshot.IsCreatedBySnapshotGenerator(),
+                    RegenerationSettings.FORCE_REGENERATE => true,
+                    _ => throw new InvalidOperationException($"Invalid RegenerationSettings value {_settings.RegenerationBehaviour}")
+                };
+                
+                if (_settings.GenerateSnapshotForExternalProfiles && shouldGenerate)
                 {
                     // Automatically expand external profiles on demand
                     // Debug.Print($"[{nameof(SnapshotGenerator)}.{nameof(ensureSnapshot)}] Recursively generate snapshot for type profile with url: '{sd.Url}' ...");
@@ -2310,11 +2314,16 @@ private async Tasks.Task<ElementDefinition> getSnapshotRootElement(StructureDefi
             var cachedRoot = sd.GetSnapshotRootElementAnnotation();
             if (cachedRoot != null) { return cachedRoot; }
 #endif
-
+            var hasValidRoot = _settings.RegenerationBehaviour switch
+            {
+                RegenerationSettings.TRY_USE_EXISTING => sd.HasSnapshot,
+                RegenerationSettings.REGENERATE_ONCE => sd.HasSnapshot,
+                RegenerationSettings.FORCE_REGENERATE => sd.HasSnapshot && sd.Snapshot.IsCreatedBySnapshotGenerator(),
+                _ => throw new InvalidOperationException($"Invalid RegenerationSettings value {_settings.RegenerationBehaviour}")
+            };
+            
             // 2. Return root element definition from existing (pre-generated) snapshot, if it exists
-#pragma warning disable CS0618 // Type or member is obsolete
-            if (sd.HasSnapshot && (sd.Snapshot.IsCreatedBySnapshotGenerator() || !_settings.ForceRegenerateSnapshots))
-#pragma warning restore CS0618 // Type or member is obsolete
+            if (hasValidRoot)
             {
                 // Debug.Print($"[{nameof(SnapshotGenerator)}.{nameof(getSnapshotRootElement)}] {nameof(profileUri)} = '{profileUri}' - use existing root element definition from snapshot: #{sd.Snapshot.Element[0].GetHashCode()}");
                 // No need to save root ElemDef annotation, as the snapshot has already been fully expanded
diff --git a/src/Hl7.Fhir.STU3/Specification/Snapshot/SnapshotGenerator.cs b/src/Hl7.Fhir.STU3/Specification/Snapshot/SnapshotGenerator.cs
index 662f8531ea..6381c17e48 100644
--- a/src/Hl7.Fhir.STU3/Specification/Snapshot/SnapshotGenerator.cs
+++ b/src/Hl7.Fhir.STU3/Specification/Snapshot/SnapshotGenerator.cs
@@ -1940,9 +1940,15 @@ private async Tasks.Task<bool> ensureSnapshot(StructureDefinition sd, string pro
 
             try
             {
-                if (_settings.GenerateSnapshotForExternalProfiles
-                && (!sd.HasSnapshot || (_settings.RegenerationBehaviour == RegenerationSettings.FORCE_REGENERATE && !sd.Snapshot.IsCreatedBySnapshotGenerator()))
-                )
+                var shouldGenerate = _settings.RegenerationBehaviour switch
+                {
+                    RegenerationSettings.TRY_USE_EXISTING => !sd.HasSnapshot,
+                    RegenerationSettings.REGENERATE_ONCE => !sd.HasSnapshot || !sd.Snapshot.IsCreatedBySnapshotGenerator(),
+                    RegenerationSettings.FORCE_REGENERATE => true,
+                    _ => throw new InvalidOperationException($"Invalid RegenerationSettings value {_settings.RegenerationBehaviour}")
+                };
+                
+                if (_settings.GenerateSnapshotForExternalProfiles && shouldGenerate)
                 {
                     // Automatically expand external profiles on demand
                     // Debug.Print($"[{nameof(SnapshotGenerator)}.{nameof(ensureSnapshot)}] Recursively generate snapshot for type profile with url: '{sd.Url}' ...");
@@ -2024,9 +2030,16 @@ private async Tasks.Task<ElementDefinition> getSnapshotRootElement(StructureDefi
             var cachedRoot = sd.GetSnapshotRootElementAnnotation();
             if (cachedRoot != null) { return cachedRoot; }
 #endif
-
+            var hasValidRoot = _settings.RegenerationBehaviour switch
+            {
+                RegenerationSettings.TRY_USE_EXISTING => sd.HasSnapshot,
+                RegenerationSettings.REGENERATE_ONCE => sd.HasSnapshot,
+                RegenerationSettings.FORCE_REGENERATE => sd.HasSnapshot && sd.Snapshot.IsCreatedBySnapshotGenerator(),
+                _ => throw new InvalidOperationException($"Invalid RegenerationSettings value {_settings.RegenerationBehaviour}")
+            };
+            
             // 2. Return root element definition from existing (pre-generated) snapshot, if it exists
-            if (sd.HasSnapshot && (sd.Snapshot.IsCreatedBySnapshotGenerator() || _settings.RegenerationBehaviour != RegenerationSettings.FORCE_REGENERATE))
+            if (hasValidRoot)
             {
                 // Debug.Print($"[{nameof(SnapshotGenerator)}.{nameof(getSnapshotRootElement)}] {nameof(profileUri)} = '{profileUri}' - use existing root element definition from snapshot: #{sd.Snapshot.Element[0].GetHashCode()}");
                 // No need to save root ElemDef annotation, as the snapshot has already been fully expanded
diff --git a/src/Hl7.Fhir.Shims.Base/Specification/Snapshot/SnapshotGeneratorSettings.cs b/src/Hl7.Fhir.Shims.Base/Specification/Snapshot/SnapshotGeneratorSettings.cs
index f4490475af..508d14e72a 100644
--- a/src/Hl7.Fhir.Shims.Base/Specification/Snapshot/SnapshotGeneratorSettings.cs
+++ b/src/Hl7.Fhir.Shims.Base/Specification/Snapshot/SnapshotGeneratorSettings.cs
@@ -35,9 +35,7 @@ public void CopyTo(SnapshotGeneratorSettings other)
         {
             if (other == null) { throw Error.ArgumentNull(nameof(other)); }
             other.GenerateSnapshotForExternalProfiles = GenerateSnapshotForExternalProfiles;
-#pragma warning disable CS0618 // Type or member is obsolete
-            other.ForceRegenerateSnapshots = ForceRegenerateSnapshots;
-#pragma warning restore CS0618 // Type or member is obsolete
+            other.RegenerationBehaviour = RegenerationBehaviour;
             other.GenerateExtensionsOnConstraints = GenerateExtensionsOnConstraints;
             other.GenerateAnnotationsOnConstraints = GenerateAnnotationsOnConstraints;
             other.GenerateElementIds = GenerateElementIds;

From 807d161f6f5b4f8dc53a8cfa9fe9baa43492a28c Mon Sep 17 00:00:00 2001
From: Kasdejong <k.j2.de.jong@student.vu.nl>
Date: Tue, 22 Oct 2024 14:14:20 +0200
Subject: [PATCH 09/18] this should make the tests run!

---
 .../Snapshot/SnapshotGeneratorTest.cs                           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Hl7.Fhir.Specification.Shared.Tests/Snapshot/SnapshotGeneratorTest.cs b/src/Hl7.Fhir.Specification.Shared.Tests/Snapshot/SnapshotGeneratorTest.cs
index 48fb3b9acd..125a983907 100644
--- a/src/Hl7.Fhir.Specification.Shared.Tests/Snapshot/SnapshotGeneratorTest.cs
+++ b/src/Hl7.Fhir.Specification.Shared.Tests/Snapshot/SnapshotGeneratorTest.cs
@@ -57,7 +57,7 @@ public partial class SnapshotGeneratorTest2
         {
             // Throw on unresolved profile references; must include in TestData folder
             GenerateSnapshotForExternalProfiles = true,
-            ForceRegenerateSnapshots = true,
+            RegenerationBehaviour = RegenerationSettings.REGENERATE_ONCE,
             GenerateExtensionsOnConstraints = false,
             GenerateAnnotationsOnConstraints = false,
             GenerateElementIds = true // STU3

From e88481406b2892bc11ecf06fa83e2f5d31e6dc6f Mon Sep 17 00:00:00 2001
From: Kasdejong <k.j2.de.jong@student.vu.nl>
Date: Tue, 22 Oct 2024 14:22:56 +0200
Subject: [PATCH 10/18] Changed the behaviour of force-regenerate to be more in
 line with the old behaviour. There is still a key difference in root
 elementDef handling

---
 .../Specification/Snapshot/SnapshotGenerator.cs                 | 2 +-
 src/Hl7.Fhir.STU3/Specification/Snapshot/SnapshotGenerator.cs   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Hl7.Fhir.Conformance/Specification/Snapshot/SnapshotGenerator.cs b/src/Hl7.Fhir.Conformance/Specification/Snapshot/SnapshotGenerator.cs
index 225ce4f18b..42758d1ab6 100644
--- a/src/Hl7.Fhir.Conformance/Specification/Snapshot/SnapshotGenerator.cs
+++ b/src/Hl7.Fhir.Conformance/Specification/Snapshot/SnapshotGenerator.cs
@@ -2228,7 +2228,7 @@ private async Tasks.Task<bool> ensureSnapshot(StructureDefinition sd, string pro
                 {
                     RegenerationSettings.TRY_USE_EXISTING => !sd.HasSnapshot,
                     RegenerationSettings.REGENERATE_ONCE => !sd.HasSnapshot || !sd.Snapshot.IsCreatedBySnapshotGenerator(),
-                    RegenerationSettings.FORCE_REGENERATE => true,
+                    RegenerationSettings.FORCE_REGENERATE => !sd.HasSnapshot || !sd.Snapshot.IsCreatedBySnapshotGenerator(), // cannot set to true, infinite recursion!
                     _ => throw new InvalidOperationException($"Invalid RegenerationSettings value {_settings.RegenerationBehaviour}")
                 };
                 
diff --git a/src/Hl7.Fhir.STU3/Specification/Snapshot/SnapshotGenerator.cs b/src/Hl7.Fhir.STU3/Specification/Snapshot/SnapshotGenerator.cs
index 6381c17e48..6807d40279 100644
--- a/src/Hl7.Fhir.STU3/Specification/Snapshot/SnapshotGenerator.cs
+++ b/src/Hl7.Fhir.STU3/Specification/Snapshot/SnapshotGenerator.cs
@@ -1944,7 +1944,7 @@ private async Tasks.Task<bool> ensureSnapshot(StructureDefinition sd, string pro
                 {
                     RegenerationSettings.TRY_USE_EXISTING => !sd.HasSnapshot,
                     RegenerationSettings.REGENERATE_ONCE => !sd.HasSnapshot || !sd.Snapshot.IsCreatedBySnapshotGenerator(),
-                    RegenerationSettings.FORCE_REGENERATE => true,
+                    RegenerationSettings.FORCE_REGENERATE => !sd.HasSnapshot || !sd.Snapshot.IsCreatedBySnapshotGenerator(), // cannot put true here, infinite recursion!
                     _ => throw new InvalidOperationException($"Invalid RegenerationSettings value {_settings.RegenerationBehaviour}")
                 };
                 

From 5c1468e7c311cbeb268d36ec1e018a6ebc6215a0 Mon Sep 17 00:00:00 2001
From: Kasdejong <k.j2.de.jong@student.vu.nl>
Date: Tue, 22 Oct 2024 14:22:56 +0200
Subject: [PATCH 11/18] Changed the behaviour of force-regenerate to be more in
 line with the old behaviour. There is still a key difference in root
 elementDef handling

---
 .../Snapshot/SnapshotGenerator.cs             | 10 +++++++---
 .../Snapshot/SnapshotGenerator.cs             |  6 +++++-
 .../Snapshot/SnapshotGeneratorSettings.cs     |  1 +
 .../Specification/Source/SnapshotSource.cs    | 19 +++++++++++--------
 .../Snapshot/SnapshotGeneratorTest.cs         |  1 -
 5 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/src/Hl7.Fhir.Conformance/Specification/Snapshot/SnapshotGenerator.cs b/src/Hl7.Fhir.Conformance/Specification/Snapshot/SnapshotGenerator.cs
index 225ce4f18b..e34c273918 100644
--- a/src/Hl7.Fhir.Conformance/Specification/Snapshot/SnapshotGenerator.cs
+++ b/src/Hl7.Fhir.Conformance/Specification/Snapshot/SnapshotGenerator.cs
@@ -2228,7 +2228,9 @@ private async Tasks.Task<bool> ensureSnapshot(StructureDefinition sd, string pro
                 {
                     RegenerationSettings.TRY_USE_EXISTING => !sd.HasSnapshot,
                     RegenerationSettings.REGENERATE_ONCE => !sd.HasSnapshot || !sd.Snapshot.IsCreatedBySnapshotGenerator(),
-                    RegenerationSettings.FORCE_REGENERATE => true,
+#pragma warning disable CS0618 // Type or member is obsolete
+                    RegenerationSettings.FORCE_REGENERATE => true, // possible infinite recursion
+#pragma warning restore CS0618 // Type or member is obsolete
                     _ => throw new InvalidOperationException($"Invalid RegenerationSettings value {_settings.RegenerationBehaviour}")
                 };
                 
@@ -2317,8 +2319,10 @@ private async Tasks.Task<ElementDefinition> getSnapshotRootElement(StructureDefi
             var hasValidRoot = _settings.RegenerationBehaviour switch
             {
                 RegenerationSettings.TRY_USE_EXISTING => sd.HasSnapshot,
-                RegenerationSettings.REGENERATE_ONCE => sd.HasSnapshot,
-                RegenerationSettings.FORCE_REGENERATE => sd.HasSnapshot && sd.Snapshot.IsCreatedBySnapshotGenerator(),
+                RegenerationSettings.REGENERATE_ONCE => sd.HasSnapshot && sd.Snapshot.IsCreatedBySnapshotGenerator(),
+#pragma warning disable CS0618 // Type or member is obsolete
+                RegenerationSettings.FORCE_REGENERATE => false,
+#pragma warning restore CS0618 // Type or member is obsolete
                 _ => throw new InvalidOperationException($"Invalid RegenerationSettings value {_settings.RegenerationBehaviour}")
             };
             
diff --git a/src/Hl7.Fhir.STU3/Specification/Snapshot/SnapshotGenerator.cs b/src/Hl7.Fhir.STU3/Specification/Snapshot/SnapshotGenerator.cs
index 6381c17e48..e269f21791 100644
--- a/src/Hl7.Fhir.STU3/Specification/Snapshot/SnapshotGenerator.cs
+++ b/src/Hl7.Fhir.STU3/Specification/Snapshot/SnapshotGenerator.cs
@@ -1944,7 +1944,9 @@ private async Tasks.Task<bool> ensureSnapshot(StructureDefinition sd, string pro
                 {
                     RegenerationSettings.TRY_USE_EXISTING => !sd.HasSnapshot,
                     RegenerationSettings.REGENERATE_ONCE => !sd.HasSnapshot || !sd.Snapshot.IsCreatedBySnapshotGenerator(),
+#pragma warning disable CS0618 // Type or member is obsolete
                     RegenerationSettings.FORCE_REGENERATE => true,
+#pragma warning restore CS0618 // Type or member is obsolete
                     _ => throw new InvalidOperationException($"Invalid RegenerationSettings value {_settings.RegenerationBehaviour}")
                 };
                 
@@ -2034,7 +2036,9 @@ private async Tasks.Task<ElementDefinition> getSnapshotRootElement(StructureDefi
             {
                 RegenerationSettings.TRY_USE_EXISTING => sd.HasSnapshot,
                 RegenerationSettings.REGENERATE_ONCE => sd.HasSnapshot,
-                RegenerationSettings.FORCE_REGENERATE => sd.HasSnapshot && sd.Snapshot.IsCreatedBySnapshotGenerator(),
+#pragma warning disable CS0618 // Type or member is obsolete
+                RegenerationSettings.FORCE_REGENERATE => false,
+#pragma warning restore CS0618 // Type or member is obsolete
                 _ => throw new InvalidOperationException($"Invalid RegenerationSettings value {_settings.RegenerationBehaviour}")
             };
             
diff --git a/src/Hl7.Fhir.Shims.Base/Specification/Snapshot/SnapshotGeneratorSettings.cs b/src/Hl7.Fhir.Shims.Base/Specification/Snapshot/SnapshotGeneratorSettings.cs
index 508d14e72a..113b01343a 100644
--- a/src/Hl7.Fhir.Shims.Base/Specification/Snapshot/SnapshotGeneratorSettings.cs
+++ b/src/Hl7.Fhir.Shims.Base/Specification/Snapshot/SnapshotGeneratorSettings.cs
@@ -113,6 +113,7 @@ public enum RegenerationSettings
         /// <summary>
         /// Regenerate the snapshot every time. This is useful for debugging and testing purposes.
         /// </summary>
+        [Obsolete("Watch out when using this setting! it could lead to infinite recursion and is mainly meant for debugging and testing purposes. If you previously had ForceRegenerateSnapshots set to true, consider using REGENERATE_ONCE instead.")]
         FORCE_REGENERATE,
     }
 }
diff --git a/src/Hl7.Fhir.Shims.Base/Specification/Source/SnapshotSource.cs b/src/Hl7.Fhir.Shims.Base/Specification/Source/SnapshotSource.cs
index 9ce593ae01..01b5a880c0 100644
--- a/src/Hl7.Fhir.Shims.Base/Specification/Source/SnapshotSource.cs
+++ b/src/Hl7.Fhir.Shims.Base/Specification/Source/SnapshotSource.cs
@@ -98,14 +98,17 @@ private async Tasks.Task<Resource> ensureSnapshot(Resource res)
         {
             if (res is StructureDefinition sd)
             {
-                if (
-                    !sd.HasSnapshot || 
-                    Generator.Settings.RegenerationBehaviour == RegenerationSettings.FORCE_REGENERATE || 
-                    (
-                        !sd.Snapshot.IsCreatedBySnapshotGenerator() && 
-                        Generator.Settings.RegenerationBehaviour == RegenerationSettings.REGENERATE_ONCE
-                    )
-                )
+                var shouldGenerate = Generator.Settings.RegenerationBehaviour switch
+                {
+                    RegenerationSettings.TRY_USE_EXISTING => !sd.HasSnapshot,
+                    RegenerationSettings.REGENERATE_ONCE => !sd.HasSnapshot || !sd.Snapshot.IsCreatedBySnapshotGenerator(),
+#pragma warning disable CS0618 // Type or member is obsolete
+                    RegenerationSettings.FORCE_REGENERATE => true,
+#pragma warning restore CS0618 // Type or member is obsolete
+                    _ => throw Error.NotSupported($"Unknown regeneration behaviour: {Generator.Settings.RegenerationBehaviour}")
+                };
+                
+                if (shouldGenerate)
                 {
                     await Generator.UpdateAsync(sd).ConfigureAwait(false);
                 }
diff --git a/src/Hl7.Fhir.Specification.STU3.Tests/Snapshot/SnapshotGeneratorTest.cs b/src/Hl7.Fhir.Specification.STU3.Tests/Snapshot/SnapshotGeneratorTest.cs
index 04c280575f..25f416a478 100644
--- a/src/Hl7.Fhir.Specification.STU3.Tests/Snapshot/SnapshotGeneratorTest.cs
+++ b/src/Hl7.Fhir.Specification.STU3.Tests/Snapshot/SnapshotGeneratorTest.cs
@@ -7979,7 +7979,6 @@ public async Tasks.Task TestConstraintSource()
             var element = snapshot.Should().Contain(e => e.Path == "Observation.subject").Subject;
             var constraint = element.Constraint.Where(c => c.Key == "ref-1").FirstOrDefault();
             constraint.Source.Should().Be("http://hl7.org/fhir/StructureDefinition/Reference");
-
         }
 
 

From 9522fb3d626f98d5228918a8fafdf22f2299f0bd Mon Sep 17 00:00:00 2001
From: Kasdejong <k.j2.de.jong@student.vu.nl>
Date: Tue, 22 Oct 2024 14:59:33 +0200
Subject: [PATCH 12/18] ForceRegenerate should now ACTUALLY force regeneration.
 Naturally, this should not be used.

---
 .../Specification/Snapshot/SnapshotGeneratorSettings.cs     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Hl7.Fhir.Shims.Base/Specification/Snapshot/SnapshotGeneratorSettings.cs b/src/Hl7.Fhir.Shims.Base/Specification/Snapshot/SnapshotGeneratorSettings.cs
index 113b01343a..09ca863da8 100644
--- a/src/Hl7.Fhir.Shims.Base/Specification/Snapshot/SnapshotGeneratorSettings.cs
+++ b/src/Hl7.Fhir.Shims.Base/Specification/Snapshot/SnapshotGeneratorSettings.cs
@@ -57,11 +57,11 @@ public void CopyTo(SnapshotGeneratorSettings other)
         /// If disabled (default), then the snapshot generator relies on existing snapshot components, if they exist.
         /// </summary>
         [Obsolete(
-            "This setting does not work as intended. When set to true, it regenerates a snapshot every time (which is not useful), and when set to false, it still regenerates a snapshot once, even if it already exists. We will consider removing it in a future major release. Use the new RegenerationBehaviour setting instead. See also https://github.com/FirelyTeam/firely-net-sdk/pull/2803")]
+            "This setting does not work as intended. We will maintain the old behaviour for now, and we will consider removing it in a future major release. Use the new RegenerationBehaviour setting instead. See also https://github.com/FirelyTeam/firely-net-sdk/pull/2803")]
         public bool ForceRegenerateSnapshots
         {
-            get { return this.RegenerationBehaviour == RegenerationSettings.FORCE_REGENERATE; } 
-            set { this.RegenerationBehaviour = value ? RegenerationSettings.FORCE_REGENERATE : RegenerationSettings.REGENERATE_ONCE; }
+            get { return this.RegenerationBehaviour == RegenerationSettings.REGENERATE_ONCE; } 
+            set { this.RegenerationBehaviour = value ? RegenerationSettings.REGENERATE_ONCE : RegenerationSettings.TRY_USE_EXISTING; }
         } // ForceExpandAll
         
         /// <summary>

From 75925eff18058c63006e385734f0a5830e178de8 Mon Sep 17 00:00:00 2001
From: Kasdejong <k.j2.de.jong@student.vu.nl>
Date: Tue, 22 Oct 2024 15:05:06 +0200
Subject: [PATCH 13/18] Forgot to align this with the Specification SSG

---
 src/Hl7.Fhir.STU3/Specification/Snapshot/SnapshotGenerator.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Hl7.Fhir.STU3/Specification/Snapshot/SnapshotGenerator.cs b/src/Hl7.Fhir.STU3/Specification/Snapshot/SnapshotGenerator.cs
index e269f21791..80dab2d014 100644
--- a/src/Hl7.Fhir.STU3/Specification/Snapshot/SnapshotGenerator.cs
+++ b/src/Hl7.Fhir.STU3/Specification/Snapshot/SnapshotGenerator.cs
@@ -2035,7 +2035,7 @@ private async Tasks.Task<ElementDefinition> getSnapshotRootElement(StructureDefi
             var hasValidRoot = _settings.RegenerationBehaviour switch
             {
                 RegenerationSettings.TRY_USE_EXISTING => sd.HasSnapshot,
-                RegenerationSettings.REGENERATE_ONCE => sd.HasSnapshot,
+                RegenerationSettings.REGENERATE_ONCE => sd.HasSnapshot && sd.Snapshot.IsCreatedBySnapshotGenerator(),
 #pragma warning disable CS0618 // Type or member is obsolete
                 RegenerationSettings.FORCE_REGENERATE => false,
 #pragma warning restore CS0618 // Type or member is obsolete

From 44237fb02f2b587752e71fbf2a8866840c5075da Mon Sep 17 00:00:00 2001
From: Kasdejong <k.j2.de.jong@student.vu.nl>
Date: Tue, 22 Oct 2024 15:27:44 +0200
Subject: [PATCH 14/18] Fixed obsoletes

---
 ...ValidateAllExamplesSearchExtractionTest.cs |  2 +-
 .../Validation/SearchDataExtraction.cs        |  5 +-
 .../Validation/SearchDataExtraction.cs        |  2 +-
 .../Snapshot/SnapshotGeneratorTest.cs         |  2 +-
 .../SnapshotGeneratorManifestTests.cs         |  4 +-
 .../FhirPath/FhirPathTests.cs                 |  6 +--
 .../PocoTests/FhirPathEvaluatorTest.cs        |  2 +-
 .../FhirPathEvaluatorTestFromSpec.cs          |  2 +-
 .../PocoTests/FhirPathParallelTest.cs         |  4 +-
 .../PocoTests/FhirPathTest.cs                 | 50 ++++++++++---------
 .../Functions/FunctionsTests.cs               |  3 +-
 .../Tests/EnviromentTests.cs                  |  5 +-
 12 files changed, 46 insertions(+), 41 deletions(-)

diff --git a/src/Hl7.Fhir.STU3.Tests/Model/ValidateAllExamplesSearchExtractionTest.cs b/src/Hl7.Fhir.STU3.Tests/Model/ValidateAllExamplesSearchExtractionTest.cs
index 0ddb477ff2..508b850b7c 100644
--- a/src/Hl7.Fhir.STU3.Tests/Model/ValidateAllExamplesSearchExtractionTest.cs
+++ b/src/Hl7.Fhir.STU3.Tests/Model/ValidateAllExamplesSearchExtractionTest.cs
@@ -154,7 +154,7 @@ private static void ExtractExamplesFromResource(Dictionary<ModelInfo.SearchParam
 
             try
             {
-                var results = resourceModel.Select(index.Expression, new EvaluationContext(resourceModel));
+                var results = resourceModel.Select(index.Expression, new EvaluationContext());
                 if (results.Count() > 0)
                 {
                     foreach (var t2 in results)
diff --git a/src/Hl7.Fhir.STU3.Tests/Validation/SearchDataExtraction.cs b/src/Hl7.Fhir.STU3.Tests/Validation/SearchDataExtraction.cs
index d0637007cf..f33881ae31 100644
--- a/src/Hl7.Fhir.STU3.Tests/Validation/SearchDataExtraction.cs
+++ b/src/Hl7.Fhir.STU3.Tests/Validation/SearchDataExtraction.cs
@@ -20,6 +20,7 @@
 using System.IO.Compression;
 using System.Linq;
 using System.Xml;
+using FhirEvaluationContext = Hl7.Fhir.FhirPath.FhirEvaluationContext;
 
 namespace Hl7.Fhir.Test.Validation
 {
@@ -34,7 +35,7 @@ public class ValidateSearchExtractionAllExamplesTest
         [TestCategory("LongRunner")]
         public void SearchExtractionAllExamples()
         {
-            string examplesZip = @"TestData\examples.zip";
+            string examplesZip = @"TestData/examples.zip";
 
             FhirXmlParser parser = new FhirXmlParser();
             int errorCount = 0;
@@ -130,7 +131,7 @@ private static void ExtractValuesForSearchParameterFromFile(Dictionary<string, i
 
         private static void ExtractExamplesFromResource(Dictionary<string, int> exampleSearchValues, Resource resource, ModelInfo.SearchParamDefinition index, string key)
         {
-            var results = resource.Select(index.Expression, new FhirEvaluationContext(resource.ToTypedElement()));
+            var results = resource.Select(index.Expression, new FhirEvaluationContext());
             if (results.Any())
             {
                 // we perform the Select on a Poco, because then we get the FHIR dialect of FhirPath as well.
diff --git a/src/Hl7.Fhir.Shared.Tests/Validation/SearchDataExtraction.cs b/src/Hl7.Fhir.Shared.Tests/Validation/SearchDataExtraction.cs
index 6e4f982a63..d2f0489612 100644
--- a/src/Hl7.Fhir.Shared.Tests/Validation/SearchDataExtraction.cs
+++ b/src/Hl7.Fhir.Shared.Tests/Validation/SearchDataExtraction.cs
@@ -131,7 +131,7 @@ private static void ExtractExamplesFromResource(Dictionary<string, int> exampleS
             try
             {
                 // we perform the Select on a Poco, because then we get the FHIR dialect of FhirPath as well.
-                results = resource.Select(index.Expression, new FhirEvaluationContext(resource.ToTypedElement()) { ElementResolver = mockResolver });
+                results = resource.Select(index.Expression!, new FhirEvaluationContext { ElementResolver = mockResolver });
             }
             catch (Exception)
             {
diff --git a/src/Hl7.Fhir.Specification.STU3.Tests/Snapshot/SnapshotGeneratorTest.cs b/src/Hl7.Fhir.Specification.STU3.Tests/Snapshot/SnapshotGeneratorTest.cs
index 25f416a478..f7030fd88c 100644
--- a/src/Hl7.Fhir.Specification.STU3.Tests/Snapshot/SnapshotGeneratorTest.cs
+++ b/src/Hl7.Fhir.Specification.STU3.Tests/Snapshot/SnapshotGeneratorTest.cs
@@ -49,7 +49,7 @@ public class SnapshotGeneratorTest2
         {
             // Throw on unresolved profile references; must include in TestData folder
             GenerateSnapshotForExternalProfiles = true,
-            ForceRegenerateSnapshots = true,
+            RegenerationBehaviour = RegenerationSettings.REGENERATE_ONCE,
             GenerateExtensionsOnConstraints = false,
             GenerateAnnotationsOnConstraints = false,
             GenerateElementIds = true // STU3
diff --git a/src/Hl7.Fhir.Specification.Shared.Tests/Snapshot/SnapshotGeneratorManifestTests.cs b/src/Hl7.Fhir.Specification.Shared.Tests/Snapshot/SnapshotGeneratorManifestTests.cs
index 75f814e8a0..c14bc028f6 100644
--- a/src/Hl7.Fhir.Specification.Shared.Tests/Snapshot/SnapshotGeneratorManifestTests.cs
+++ b/src/Hl7.Fhir.Specification.Shared.Tests/Snapshot/SnapshotGeneratorManifestTests.cs
@@ -83,7 +83,7 @@ public class SnapshotGeneratorManifestTests
 
         static readonly SnapshotGeneratorSettings _snapGenSettings = new SnapshotGeneratorSettings()
         {
-            ForceRegenerateSnapshots = true,
+            RegenerationBehaviour = RegenerationSettings.REGENERATE_ONCE,
             GenerateSnapshotForExternalProfiles = true
         };
 
@@ -788,7 +788,7 @@ class SnapshotEvaluationContext : FhirEvaluationContext
 
             public SnapshotEvaluationContext(
                 string testPath, IResourceResolver resolver, string id,
-                StructureDefinition input, StructureDefinition generated) : base(generated.ToTypedElement())
+                StructureDefinition input, StructureDefinition generated)
             {
                 _testPath = testPath ?? throw new ArgumentNullException(nameof(testPath));
                 TestResolver = resolver ?? throw new ArgumentNullException(nameof(resolver));
diff --git a/src/Hl7.Fhir.Support.Tests/FhirPath/FhirPathTests.cs b/src/Hl7.Fhir.Support.Tests/FhirPath/FhirPathTests.cs
index 873132117e..30b882bfcd 100644
--- a/src/Hl7.Fhir.Support.Tests/FhirPath/FhirPathTests.cs
+++ b/src/Hl7.Fhir.Support.Tests/FhirPath/FhirPathTests.cs
@@ -39,7 +39,7 @@ public void ResolveOnEmptyTest()
         {
             // resolve should handle an empty collection as input
             var evaluator = _compiler.Compile("{}.resolve()");
-            var result = evaluator(null, FhirEvaluationContext.CreateDefault());
+            var result = evaluator(null, new FhirEvaluationContext());
 
             Assert.IsFalse(result.Any());
         }
@@ -56,7 +56,7 @@ public void ResolveOnEmptyTest()
         public void HtmlChecks(string xml, bool expected, string because)
         {
             var evaluator = _compiler.Compile("htmlChecks()");
-            evaluator.Predicate(ElementNode.ForPrimitive(xml), FhirEvaluationContext.CreateDefault()).Should().Be(expected, because);
+            evaluator.Predicate(ElementNode.ForPrimitive(xml), new FhirEvaluationContext()).Should().Be(expected, because);
         }
 
         [DataTestMethod]
@@ -150,7 +150,7 @@ public static IEnumerable<object[]> AllTestCases() =>
         public void AssertFhirPathTestcases(string expression, bool expected)
         {
             var evaluator = _compiler.Compile(expression);
-            var result = evaluator(null, FhirEvaluationContext.CreateDefault());
+            var result = evaluator(null, new FhirEvaluationContext());
 
             if (result.Any())
             {
diff --git a/src/Hl7.FhirPath.R4.Tests/PocoTests/FhirPathEvaluatorTest.cs b/src/Hl7.FhirPath.R4.Tests/PocoTests/FhirPathEvaluatorTest.cs
index 53ce38a0c6..5b620b5da0 100644
--- a/src/Hl7.FhirPath.R4.Tests/PocoTests/FhirPathEvaluatorTest.cs
+++ b/src/Hl7.FhirPath.R4.Tests/PocoTests/FhirPathEvaluatorTest.cs
@@ -606,7 +606,7 @@ public void defineVariable_with_compile_success()
             var expr = "defineVariable('root', 'r1-').select(defineVariable('v1', 'v1').defineVariable('v2', 'v2').select(%v1 | %v2)).select(%root & $this)";
             var compiler = new FhirPathCompiler();
             var exprCompiled = compiler.Compile(expr);
-            var r = exprCompiled(fixture.PatientExample.ToTypedElement(), FhirEvaluationContext.CreateDefault());
+            var r = exprCompiled(fixture.PatientExample.ToTypedElement(), new FhirEvaluationContext());
             Assert.AreEqual(2, r.Count());
             Assert.AreEqual("r1-v1", r.First().ToString());
             Assert.AreEqual("r1-v2", r.Skip(1).First().ToString());
diff --git a/src/Hl7.FhirPath.R4.Tests/PocoTests/FhirPathEvaluatorTestFromSpec.cs b/src/Hl7.FhirPath.R4.Tests/PocoTests/FhirPathEvaluatorTestFromSpec.cs
index e3c2110692..28269d9649 100644
--- a/src/Hl7.FhirPath.R4.Tests/PocoTests/FhirPathEvaluatorTestFromSpec.cs
+++ b/src/Hl7.FhirPath.R4.Tests/PocoTests/FhirPathEvaluatorTestFromSpec.cs
@@ -69,7 +69,7 @@ private void testBoolean(Model.Resource resource, Model.Base focus, String focus
             var input = focus.ToTypedElement();
             var container = resource?.ToTypedElement();
 
-            Assert.IsTrue(input.IsBoolean(expression, value, new EvaluationContext(container)));
+            Assert.IsTrue(input.IsBoolean(expression, value, new EvaluationContext()));
         }
 
         private enum ErrorType
diff --git a/src/Hl7.FhirPath.R4.Tests/PocoTests/FhirPathParallelTest.cs b/src/Hl7.FhirPath.R4.Tests/PocoTests/FhirPathParallelTest.cs
index 2ef35840a9..c08b10229c 100644
--- a/src/Hl7.FhirPath.R4.Tests/PocoTests/FhirPathParallelTest.cs
+++ b/src/Hl7.FhirPath.R4.Tests/PocoTests/FhirPathParallelTest.cs
@@ -53,7 +53,7 @@ public static async Tasks.Task MassiveParallelSelectsShouldBeCorrect(string test
             var processor = new ActionBlock<ValueSet>(r =>
                 {
                     var typedElement = r.ToTypedElement();
-                    var evalContext = new EvaluationContext(typedElement);
+                    var evalContext = new EvaluationContext();
                     var canonical = selector(typedElement, "url", evalContext).Single().Value.ToString();
                     actual.Add((canonical, r));
                 }
@@ -130,7 +130,7 @@ private static CompiledExpression GetCompiledExpression(string expression)
         public static IEnumerable<ITypedElement> Select(this ITypedElement input, string expression, EvaluationContext ctx = null)
         {
             var evaluator = GetCompiledExpression(expression);
-            return evaluator(input, ctx ?? EvaluationContext.CreateDefault());
+            return evaluator(input, ctx ?? new EvaluationContext());
         }
 
     }
diff --git a/src/Hl7.FhirPath.R4.Tests/PocoTests/FhirPathTest.cs b/src/Hl7.FhirPath.R4.Tests/PocoTests/FhirPathTest.cs
index fb2810ce09..d02e02eb21 100644
--- a/src/Hl7.FhirPath.R4.Tests/PocoTests/FhirPathTest.cs
+++ b/src/Hl7.FhirPath.R4.Tests/PocoTests/FhirPathTest.cs
@@ -200,34 +200,40 @@ public void TestFhirPathRootResource()
             var patBundle = new ScopedNode(bundle.ToTypedElement());
 
             // focus on the contained resource
-            EvaluationContext ctx = new FhirEvaluationContext(patBundle.Select("entry.first().resource.contained")?.FirstOrDefault() as ScopedNode);
-            Assert.AreEqual("contained-1", patBundle.Scalar("%resource.id", ctx));
-            Assert.AreEqual("patient-1", patBundle.Scalar("%rootResource.id", ctx));
+            var testNode = patBundle.Select("entry.first().resource.contained")?.FirstOrDefault() as ScopedNode;
+            EvaluationContext ctx = new FhirEvaluationContext();
+            Assert.AreEqual("contained-1", testNode.Scalar("%resource.id", ctx));
+            Assert.AreEqual("patient-1", testNode.Scalar("%rootResource.id", ctx));
 
             // focus on the id of the contained resource
-            ctx = new FhirEvaluationContext(patBundle.Select("entry.first().resource.contained.id")?.FirstOrDefault() as ScopedNode);
-            Assert.AreEqual("contained-1", patBundle.Scalar("%resource.id", ctx));
-            Assert.AreEqual("patient-1", patBundle.Scalar("%rootResource.id", ctx));
+            testNode = patBundle.Select("entry.first().resource.contained.id")?.FirstOrDefault() as ScopedNode;
+            ctx = new FhirEvaluationContext();
+            Assert.AreEqual("contained-1", testNode.Scalar("%resource.id", ctx));
+            Assert.AreEqual("patient-1", testNode.Scalar("%rootResource.id", ctx));
 
             // focus on the property of the entry resource
-            ctx = new FhirEvaluationContext(patBundle.Select("entry.first().resource.id")?.FirstOrDefault() as ScopedNode);
-            Assert.AreEqual("patient-1", patBundle.Scalar("%resource.id", ctx));
-            Assert.AreEqual("patient-1", patBundle.Scalar("%rootResource.id", ctx));
+            testNode = patBundle.Select("entry.first().resource.id")?.FirstOrDefault() as ScopedNode;
+            ctx = new FhirEvaluationContext();
+            Assert.AreEqual("patient-1", testNode.Scalar("%resource.id", ctx));
+            Assert.AreEqual("patient-1", testNode.Scalar("%rootResource.id", ctx));
 
             // focus on the entry resource
-            ctx = new FhirEvaluationContext(patBundle.Select("entry.first().resource")?.FirstOrDefault() as ScopedNode);
-            Assert.AreEqual("patient-1", patBundle.Scalar("%resource.id", ctx));
-            Assert.AreEqual("patient-1", patBundle.Scalar("%rootResource.id", ctx));
+            testNode = patBundle.Select("entry.first().resource")?.FirstOrDefault() as ScopedNode;
+            ctx = new FhirEvaluationContext();
+            Assert.AreEqual("patient-1", testNode.Scalar("%resource.id", ctx));
+            Assert.AreEqual("patient-1", testNode.Scalar("%rootResource.id", ctx));
 
             // focus on bundle 
-            ctx = new FhirEvaluationContext(patBundle);
-            Assert.AreEqual("bundle-1", patBundle.Scalar("%resource.id", ctx));
-            Assert.AreEqual("bundle-1", patBundle.Scalar("%rootResource.id", ctx));
+            testNode = patBundle;
+            ctx = new FhirEvaluationContext();
+            Assert.AreEqual("bundle-1", testNode.Scalar("%resource.id", ctx));
+            Assert.AreEqual("bundle-1", testNode.Scalar("%rootResource.id", ctx));
 
             // focus on a property of the bundle 
-            ctx = new FhirEvaluationContext(patBundle.Select("id")?.FirstOrDefault() as ScopedNode);
-            Assert.AreEqual("bundle-1", patBundle.Scalar("%resource.id", ctx));
-            Assert.AreEqual("bundle-1", patBundle.Scalar("%rootResource.id", ctx));
+            testNode = patBundle.Select("id")?.FirstOrDefault() as ScopedNode;
+            ctx = new FhirEvaluationContext();
+            Assert.AreEqual("bundle-1", testNode.Scalar("%resource.id", ctx));
+            Assert.AreEqual("bundle-1", testNode.Scalar("%rootResource.id", ctx));
 
             // Testing %context and $this
             var node = patBundle.Select("entry.first().resource.contained")?.FirstOrDefault();
@@ -350,8 +356,7 @@ public void TestFhirPathResolve()
         [DynamicData(nameof(MemberOfTestData), DynamicDataSourceType.Method)]
         public void MemberOfTests(Base poco, string expression, bool? expectedResult)
         {
-            var context = FhirEvaluationContext.CreateDefault();
-            context.TerminologyService = new LocalTerminologyService(resolver: ZipSource.CreateValidationSource());
+            var context = new FhirEvaluationContext { TerminologyService = new LocalTerminologyService(resolver: ZipSource.CreateValidationSource()) };
 
             var result = poco.Scalar(expression, context);
 
@@ -405,7 +410,7 @@ public static IEnumerable<object[]> MemberOfTestData()
         [TestMethod]
         public void MemberOfTestsWithoutTerminologyService()
         {
-            var context = FhirEvaluationContext.CreateDefault();
+            var context = new FhirEvaluationContext();
 
             Action action = () => new Code("male").Scalar("memberOf('http://hl7.org/fhir/ValueSet/administrative-gender')", context);
 
@@ -415,8 +420,7 @@ public void MemberOfTestsWithoutTerminologyService()
         [TestMethod]
         public void MemberOfTestWithExampleFromSpecification()
         {
-            var context = FhirEvaluationContext.CreateDefault();
-            context.TerminologyService = new LocalTerminologyService(resolver: ZipSource.CreateValidationSource());
+            var context = new FhirEvaluationContext { TerminologyService = new LocalTerminologyService(resolver: ZipSource.CreateValidationSource()) };
 
             Observation observation = new()
             {
diff --git a/src/Hl7.FhirPath.Tests/Functions/FunctionsTests.cs b/src/Hl7.FhirPath.Tests/Functions/FunctionsTests.cs
index 3c750631c1..b4f63d3a12 100644
--- a/src/Hl7.FhirPath.Tests/Functions/FunctionsTests.cs
+++ b/src/Hl7.FhirPath.Tests/Functions/FunctionsTests.cs
@@ -517,8 +517,7 @@ public void AssertTestcases(string expression, bool expected, bool invalid = fal
         public void TraceTest()
         {
             ITypedElement dummy = ElementNode.ForPrimitive(true);
-            var ctx = EvaluationContext.CreateDefault();
-            ctx.Tracer = tracer;
+            var ctx = new EvaluationContext { Tracer = tracer };
             dummy.IsBoolean("(1 | 2).trace('test').empty()", true, ctx);
 
             static void tracer(string name, IEnumerable<ITypedElement> list)
diff --git a/src/Hl7.FhirPath.Tests/Tests/EnviromentTests.cs b/src/Hl7.FhirPath.Tests/Tests/EnviromentTests.cs
index b0be0fe2e0..c06df154a5 100644
--- a/src/Hl7.FhirPath.Tests/Tests/EnviromentTests.cs
+++ b/src/Hl7.FhirPath.Tests/Tests/EnviromentTests.cs
@@ -1,3 +1,4 @@
+using FluentAssertions;
 using Hl7.Fhir.ElementModel;
 using Hl7.FhirPath;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
@@ -15,7 +16,7 @@ public void TestEnvironment()
         var compiler = new FhirPathCompiler();
         var expr = compiler.Compile("%var = 1");
         
-        expr.IsTrue(null, new EvaluationContext(null, null, new Dictionary<string, IEnumerable<ITypedElement>> { { "var", new [] { ElementNode.ForPrimitive(1) } } }));
-        expr.IsBoolean(false, null, new EvaluationContext(null, null, new Dictionary<string, IEnumerable<ITypedElement>> { { "var", new[] { ElementNode.ForPrimitive(2) } } }));
+        expr.IsTrue(null!, new EvaluationContext { Environment = new Dictionary<string, IEnumerable<ITypedElement>> {{ "var", new [] { ElementNode.ForPrimitive(1) }}}} ).Should().BeTrue();
+        expr.IsTrue(null!, new EvaluationContext { Environment = new Dictionary<string, IEnumerable<ITypedElement>> {{ "var", new [] { ElementNode.ForPrimitive(2) }}}} ).Should().BeFalse();
     }
 }
\ No newline at end of file

From 81aa4a2f39bd7d8c3993b9fe62beb33e3967584e Mon Sep 17 00:00:00 2001
From: Kasdejong <k.j2.de.jong@student.vu.nl>
Date: Tue, 22 Oct 2024 16:24:34 +0200
Subject: [PATCH 15/18] made "WithResourceOverrides" a static method. I hope
 this makes more sense :)

---
 src/Hl7.Fhir.Base/FhirPath/EvaluationContext.cs  | 16 ++++++++++------
 .../FhirPath/FhirEvaluationContext.cs            |  7 +------
 .../Snapshot/SnapshotGeneratorManifestTests.cs   |  2 +-
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/src/Hl7.Fhir.Base/FhirPath/EvaluationContext.cs b/src/Hl7.Fhir.Base/FhirPath/EvaluationContext.cs
index a69511bb98..9b71ec64f2 100644
--- a/src/Hl7.Fhir.Base/FhirPath/EvaluationContext.cs
+++ b/src/Hl7.Fhir.Base/FhirPath/EvaluationContext.cs
@@ -41,12 +41,6 @@ public EvaluationContext(ITypedElement? resource, ITypedElement? rootResource, I
     {
         Environment = environment;
     }
-
-    /// <summary>
-    /// Explicitly override the values of %resource and %rootResource in the evaluation context.
-    /// </summary>
-    public static EvaluationContext WithResourceOverrides(ITypedElement? resource, ITypedElement? rootResource = null) =>
-        new EvaluationContext { Resource = resource, RootResource = rootResource ?? resource };
     
     /// <summary>
     /// The data represented by <c>%rootResource</c>.
@@ -67,4 +61,14 @@ public static EvaluationContext WithResourceOverrides(ITypedElement? resource, I
     /// A delegate that handles the output for the <c>trace()</c> function.
     /// </summary>
     public Action<string, IEnumerable<ITypedElement>>? Tracer { get; set; }
+}
+
+public static class EvaluationContextExtensions
+{
+    public static T WithResourceOverrides<T>(this T context, ITypedElement? resource, ITypedElement? rootResource = null) where T : EvaluationContext
+    {
+        context.Resource = resource;
+        context.RootResource = rootResource ?? resource;
+        return context;
+    }
 }
\ No newline at end of file
diff --git a/src/Hl7.Fhir.Base/FhirPath/FhirEvaluationContext.cs b/src/Hl7.Fhir.Base/FhirPath/FhirEvaluationContext.cs
index e5b50a4ef5..0ca50bb703 100644
--- a/src/Hl7.Fhir.Base/FhirPath/FhirEvaluationContext.cs
+++ b/src/Hl7.Fhir.Base/FhirPath/FhirEvaluationContext.cs
@@ -63,12 +63,7 @@ public FhirEvaluationContext(ScopedNode node)
         {
             RootResource = Resource is ScopedNode sn ? sn.ResourceContext : node;
         }
-
-        /// <summary>
-        /// Explicitly override the values of %resource and %rootResource in the evaluation context.
-        /// </summary>
-        public static new FhirEvaluationContext WithResourceOverrides(ITypedElement? resource, ITypedElement? rootResource = null) =>
-            (FhirEvaluationContext)EvaluationContext.WithResourceOverrides(resource, rootResource);
+        
         public ITerminologyService? TerminologyService { get; set; }
 
         private static ITypedElement toNearestResource(ScopedNode node)
diff --git a/src/Hl7.Fhir.Specification.Shared.Tests/Snapshot/SnapshotGeneratorManifestTests.cs b/src/Hl7.Fhir.Specification.Shared.Tests/Snapshot/SnapshotGeneratorManifestTests.cs
index 9e422ac5e8..e9764a5f14 100644
--- a/src/Hl7.Fhir.Specification.Shared.Tests/Snapshot/SnapshotGeneratorManifestTests.cs
+++ b/src/Hl7.Fhir.Specification.Shared.Tests/Snapshot/SnapshotGeneratorManifestTests.cs
@@ -800,7 +800,7 @@ public SnapshotEvaluationContext(
                 Assert.AreEqual(id, generated.Id);
                 this.Tracer = this.Trace;
 
-                WithResourceOverrides(Generated);
+                this.WithResourceOverrides(Generated);
             }
 
             void Trace(string msg, IEnumerable<ITypedElement> elems)

From 8f12cdcd60adbf61ebf95044642de988d57c2f57 Mon Sep 17 00:00:00 2001
From: Kasdejong <k.j2.de.jong@student.vu.nl>
Date: Tue, 22 Oct 2024 16:49:49 +0200
Subject: [PATCH 16/18] compatibility suppressions

---
 .../CompatibilitySuppressions.xml             | 298 ++++++++++--------
 1 file changed, 163 insertions(+), 135 deletions(-)

diff --git a/src/Hl7.Fhir.Base/CompatibilitySuppressions.xml b/src/Hl7.Fhir.Base/CompatibilitySuppressions.xml
index 9fb77ceaae..df5428cd9e 100644
--- a/src/Hl7.Fhir.Base/CompatibilitySuppressions.xml
+++ b/src/Hl7.Fhir.Base/CompatibilitySuppressions.xml
@@ -3,14 +3,14 @@
 <Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Hl7.Fhir.Introspection.BackboneTypeAttribute</Target>
+    <Target>T:Hl7.Fhir.ElementModel.IBaseElementNavigator`1</Target>
     <Left>lib/net8.0/Hl7.Fhir.Base.dll</Left>
     <Right>lib/net8.0/Hl7.Fhir.Base.dll</Right>
     <IsBaselineSuppression>true</IsBaselineSuppression>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Hl7.Fhir.ElementModel.IBaseElementNavigator`1</Target>
+    <Target>T:Hl7.Fhir.Introspection.BackboneTypeAttribute</Target>
     <Left>lib/net8.0/Hl7.Fhir.Base.dll</Left>
     <Right>lib/net8.0/Hl7.Fhir.Base.dll</Right>
     <IsBaselineSuppression>true</IsBaselineSuppression>
@@ -28,6 +28,13 @@
     <Right>lib/netstandard2.0/Hl7.Fhir.Base.dll</Right>
     <IsBaselineSuppression>true</IsBaselineSuppression>
   </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:Hl7.Fhir.Introspection.BackboneTypeAttribute</Target>
+    <Left>lib/netstandard2.0/Hl7.Fhir.Base.dll</Left>
+    <Right>lib/netstandard2.0/Hl7.Fhir.Base.dll</Right>
+    <IsBaselineSuppression>true</IsBaselineSuppression>
+  </Suppression>
   <Suppression>
     <DiagnosticId>CP0002</DiagnosticId>
     <Target>M:Hl7.Fhir.ElementModel.TypedElementExtensions.IsExactlyEqualTo``1(``0,``0,System.Boolean)</Target>
@@ -91,6 +98,69 @@
     <Right>lib/net8.0/Hl7.Fhir.Base.dll</Right>
     <IsBaselineSuppression>true</IsBaselineSuppression>
   </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:Hl7.Fhir.FhirPath.FhirEvaluationContext.WithResourceOverrides(Hl7.Fhir.ElementModel.ITypedElement,Hl7.Fhir.ElementModel.ITypedElement)</Target>
+    <Left>lib/net8.0/Hl7.Fhir.Base.dll</Left>
+    <Right>lib/net8.0/Hl7.Fhir.Base.dll</Right>
+    <IsBaselineSuppression>true</IsBaselineSuppression>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:Hl7.Fhir.Introspection.ClassMapping.get_DefinitionPath</Target>
+    <Left>lib/net8.0/Hl7.Fhir.Base.dll</Left>
+    <Right>lib/net8.0/Hl7.Fhir.Base.dll</Right>
+    <IsBaselineSuppression>true</IsBaselineSuppression>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:Hl7.Fhir.Introspection.FhirTypeAttribute.get_IsNestedType</Target>
+    <Left>lib/net8.0/Hl7.Fhir.Base.dll</Left>
+    <Right>lib/net8.0/Hl7.Fhir.Base.dll</Right>
+    <IsBaselineSuppression>true</IsBaselineSuppression>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:Hl7.Fhir.Introspection.FhirTypeAttribute.get_IsResource</Target>
+    <Left>lib/net8.0/Hl7.Fhir.Base.dll</Left>
+    <Right>lib/net8.0/Hl7.Fhir.Base.dll</Right>
+    <IsBaselineSuppression>true</IsBaselineSuppression>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:Hl7.Fhir.Introspection.FhirTypeAttribute.set_IsNestedType(System.Boolean)</Target>
+    <Left>lib/net8.0/Hl7.Fhir.Base.dll</Left>
+    <Right>lib/net8.0/Hl7.Fhir.Base.dll</Right>
+    <IsBaselineSuppression>true</IsBaselineSuppression>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:Hl7.Fhir.Introspection.FhirTypeAttribute.set_IsResource(System.Boolean)</Target>
+    <Left>lib/net8.0/Hl7.Fhir.Base.dll</Left>
+    <Right>lib/net8.0/Hl7.Fhir.Base.dll</Right>
+    <IsBaselineSuppression>true</IsBaselineSuppression>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:Hl7.Fhir.Model.Parameters.get_Item(System.String)</Target>
+    <Left>lib/net8.0/Hl7.Fhir.Base.dll</Left>
+    <Right>lib/net8.0/Hl7.Fhir.Base.dll</Right>
+    <IsBaselineSuppression>true</IsBaselineSuppression>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:Hl7.Fhir.Rest.ContentType.BuildContentType(Hl7.Fhir.Rest.ResourceFormat,System.String)</Target>
+    <Left>lib/net8.0/Hl7.Fhir.Base.dll</Left>
+    <Right>lib/net8.0/Hl7.Fhir.Base.dll</Right>
+    <IsBaselineSuppression>true</IsBaselineSuppression>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:Hl7.Fhir.Rest.ContentType.BuildMediaType(Hl7.Fhir.Rest.ResourceFormat,System.String)</Target>
+    <Left>lib/net8.0/Hl7.Fhir.Base.dll</Left>
+    <Right>lib/net8.0/Hl7.Fhir.Base.dll</Right>
+    <IsBaselineSuppression>true</IsBaselineSuppression>
+  </Suppression>
   <Suppression>
     <DiagnosticId>CP0002</DiagnosticId>
     <Target>M:Hl7.Fhir.Serialization.IFhirSerializationEngine.SerializeToXml(Hl7.Fhir.Model.Resource)</Target>
@@ -112,6 +182,20 @@
     <Right>lib/net8.0/Hl7.Fhir.Base.dll</Right>
     <IsBaselineSuppression>true</IsBaselineSuppression>
   </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:Hl7.Fhir.Utility.ReflectionHelper.IsTypedCollection(System.Type)</Target>
+    <Left>lib/net8.0/Hl7.Fhir.Base.dll</Left>
+    <Right>lib/net8.0/Hl7.Fhir.Base.dll</Right>
+    <IsBaselineSuppression>true</IsBaselineSuppression>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:Hl7.FhirPath.EvaluationContext.WithResourceOverrides(Hl7.Fhir.ElementModel.ITypedElement,Hl7.Fhir.ElementModel.ITypedElement)</Target>
+    <Left>lib/net8.0/Hl7.Fhir.Base.dll</Left>
+    <Right>lib/net8.0/Hl7.Fhir.Base.dll</Right>
+    <IsBaselineSuppression>true</IsBaselineSuppression>
+  </Suppression>
   <Suppression>
     <DiagnosticId>CP0002</DiagnosticId>
     <Target>M:Hl7.Fhir.ElementModel.TypedElementExtensions.IsExactlyEqualTo``1(``0,``0,System.Boolean)</Target>
@@ -175,6 +259,69 @@
     <Right>lib/netstandard2.0/Hl7.Fhir.Base.dll</Right>
     <IsBaselineSuppression>true</IsBaselineSuppression>
   </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:Hl7.Fhir.FhirPath.FhirEvaluationContext.WithResourceOverrides(Hl7.Fhir.ElementModel.ITypedElement,Hl7.Fhir.ElementModel.ITypedElement)</Target>
+    <Left>lib/netstandard2.0/Hl7.Fhir.Base.dll</Left>
+    <Right>lib/netstandard2.0/Hl7.Fhir.Base.dll</Right>
+    <IsBaselineSuppression>true</IsBaselineSuppression>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:Hl7.Fhir.Introspection.ClassMapping.get_DefinitionPath</Target>
+    <Left>lib/netstandard2.0/Hl7.Fhir.Base.dll</Left>
+    <Right>lib/netstandard2.0/Hl7.Fhir.Base.dll</Right>
+    <IsBaselineSuppression>true</IsBaselineSuppression>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:Hl7.Fhir.Introspection.FhirTypeAttribute.get_IsNestedType</Target>
+    <Left>lib/netstandard2.0/Hl7.Fhir.Base.dll</Left>
+    <Right>lib/netstandard2.0/Hl7.Fhir.Base.dll</Right>
+    <IsBaselineSuppression>true</IsBaselineSuppression>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:Hl7.Fhir.Introspection.FhirTypeAttribute.get_IsResource</Target>
+    <Left>lib/netstandard2.0/Hl7.Fhir.Base.dll</Left>
+    <Right>lib/netstandard2.0/Hl7.Fhir.Base.dll</Right>
+    <IsBaselineSuppression>true</IsBaselineSuppression>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:Hl7.Fhir.Introspection.FhirTypeAttribute.set_IsNestedType(System.Boolean)</Target>
+    <Left>lib/netstandard2.0/Hl7.Fhir.Base.dll</Left>
+    <Right>lib/netstandard2.0/Hl7.Fhir.Base.dll</Right>
+    <IsBaselineSuppression>true</IsBaselineSuppression>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:Hl7.Fhir.Introspection.FhirTypeAttribute.set_IsResource(System.Boolean)</Target>
+    <Left>lib/netstandard2.0/Hl7.Fhir.Base.dll</Left>
+    <Right>lib/netstandard2.0/Hl7.Fhir.Base.dll</Right>
+    <IsBaselineSuppression>true</IsBaselineSuppression>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:Hl7.Fhir.Model.Parameters.get_Item(System.String)</Target>
+    <Left>lib/netstandard2.0/Hl7.Fhir.Base.dll</Left>
+    <Right>lib/netstandard2.0/Hl7.Fhir.Base.dll</Right>
+    <IsBaselineSuppression>true</IsBaselineSuppression>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:Hl7.Fhir.Rest.ContentType.BuildContentType(Hl7.Fhir.Rest.ResourceFormat,System.String)</Target>
+    <Left>lib/netstandard2.0/Hl7.Fhir.Base.dll</Left>
+    <Right>lib/netstandard2.0/Hl7.Fhir.Base.dll</Right>
+    <IsBaselineSuppression>true</IsBaselineSuppression>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:Hl7.Fhir.Rest.ContentType.BuildMediaType(Hl7.Fhir.Rest.ResourceFormat,System.String)</Target>
+    <Left>lib/netstandard2.0/Hl7.Fhir.Base.dll</Left>
+    <Right>lib/netstandard2.0/Hl7.Fhir.Base.dll</Right>
+    <IsBaselineSuppression>true</IsBaselineSuppression>
+  </Suppression>
   <Suppression>
     <DiagnosticId>CP0002</DiagnosticId>
     <Target>M:Hl7.Fhir.Serialization.IFhirSerializationEngine.SerializeToXml(Hl7.Fhir.Model.Resource)</Target>
@@ -196,6 +343,20 @@
     <Right>lib/netstandard2.0/Hl7.Fhir.Base.dll</Right>
     <IsBaselineSuppression>true</IsBaselineSuppression>
   </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:Hl7.Fhir.Utility.ReflectionHelper.IsTypedCollection(System.Type)</Target>
+    <Left>lib/netstandard2.0/Hl7.Fhir.Base.dll</Left>
+    <Right>lib/netstandard2.0/Hl7.Fhir.Base.dll</Right>
+    <IsBaselineSuppression>true</IsBaselineSuppression>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:Hl7.FhirPath.EvaluationContext.WithResourceOverrides(Hl7.Fhir.ElementModel.ITypedElement,Hl7.Fhir.ElementModel.ITypedElement)</Target>
+    <Left>lib/netstandard2.0/Hl7.Fhir.Base.dll</Left>
+    <Right>lib/netstandard2.0/Hl7.Fhir.Base.dll</Right>
+    <IsBaselineSuppression>true</IsBaselineSuppression>
+  </Suppression>
   <Suppression>
     <DiagnosticId>CP0006</DiagnosticId>
     <Target>M:Hl7.Fhir.ElementModel.ITypedElement.Children(System.String)</Target>
@@ -336,137 +497,4 @@
     <Right>lib/netstandard2.0/Hl7.Fhir.Base.dll</Right>
     <IsBaselineSuppression>true</IsBaselineSuppression>
   </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0001</DiagnosticId>
-    <Target>T:Hl7.Fhir.Introspection.BackboneTypeAttribute</Target>
-    <Left>lib/netstandard2.0/Hl7.Fhir.Base.dll</Left>
-    <Right>lib/netstandard2.0/Hl7.Fhir.Base.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Hl7.Fhir.Introspection.ClassMapping.get_DefinitionPath</Target>
-    <Left>lib/net8.0/Hl7.Fhir.Base.dll</Left>
-    <Right>lib/net8.0/Hl7.Fhir.Base.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Hl7.Fhir.Introspection.FhirTypeAttribute.get_IsNestedType</Target>
-    <Left>lib/net8.0/Hl7.Fhir.Base.dll</Left>
-    <Right>lib/net8.0/Hl7.Fhir.Base.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Hl7.Fhir.Introspection.FhirTypeAttribute.get_IsResource</Target>
-    <Left>lib/net8.0/Hl7.Fhir.Base.dll</Left>
-    <Right>lib/net8.0/Hl7.Fhir.Base.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Hl7.Fhir.Introspection.FhirTypeAttribute.set_IsNestedType(System.Boolean)</Target>
-    <Left>lib/net8.0/Hl7.Fhir.Base.dll</Left>
-    <Right>lib/net8.0/Hl7.Fhir.Base.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Hl7.Fhir.Introspection.FhirTypeAttribute.set_IsResource(System.Boolean)</Target>
-    <Left>lib/net8.0/Hl7.Fhir.Base.dll</Left>
-    <Right>lib/net8.0/Hl7.Fhir.Base.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Hl7.Fhir.Model.Parameters.get_Item(System.String)</Target>
-    <Left>lib/net8.0/Hl7.Fhir.Base.dll</Left>
-    <Right>lib/net8.0/Hl7.Fhir.Base.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Hl7.Fhir.Utility.ReflectionHelper.IsTypedCollection(System.Type)</Target>
-    <Left>lib/net8.0/Hl7.Fhir.Base.dll</Left>
-    <Right>lib/net8.0/Hl7.Fhir.Base.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Hl7.Fhir.Introspection.ClassMapping.get_DefinitionPath</Target>
-    <Left>lib/netstandard2.0/Hl7.Fhir.Base.dll</Left>
-    <Right>lib/netstandard2.0/Hl7.Fhir.Base.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Hl7.Fhir.Introspection.FhirTypeAttribute.get_IsNestedType</Target>
-    <Left>lib/netstandard2.0/Hl7.Fhir.Base.dll</Left>
-    <Right>lib/netstandard2.0/Hl7.Fhir.Base.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Hl7.Fhir.Introspection.FhirTypeAttribute.get_IsResource</Target>
-    <Left>lib/netstandard2.0/Hl7.Fhir.Base.dll</Left>
-    <Right>lib/netstandard2.0/Hl7.Fhir.Base.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Hl7.Fhir.Introspection.FhirTypeAttribute.set_IsNestedType(System.Boolean)</Target>
-    <Left>lib/netstandard2.0/Hl7.Fhir.Base.dll</Left>
-    <Right>lib/netstandard2.0/Hl7.Fhir.Base.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Hl7.Fhir.Introspection.FhirTypeAttribute.set_IsResource(System.Boolean)</Target>
-    <Left>lib/netstandard2.0/Hl7.Fhir.Base.dll</Left>
-    <Right>lib/netstandard2.0/Hl7.Fhir.Base.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Hl7.Fhir.Model.Parameters.get_Item(System.String)</Target>
-    <Left>lib/netstandard2.0/Hl7.Fhir.Base.dll</Left>
-    <Right>lib/netstandard2.0/Hl7.Fhir.Base.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Hl7.Fhir.Utility.ReflectionHelper.IsTypedCollection(System.Type)</Target>
-    <Left>lib/netstandard2.0/Hl7.Fhir.Base.dll</Left>
-    <Right>lib/netstandard2.0/Hl7.Fhir.Base.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Hl7.Fhir.Rest.ContentType.BuildContentType(Hl7.Fhir.Rest.ResourceFormat,System.String)</Target>
-    <Left>lib/net8.0/Hl7.Fhir.Base.dll</Left>
-    <Right>lib/net8.0/Hl7.Fhir.Base.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Hl7.Fhir.Rest.ContentType.BuildMediaType(Hl7.Fhir.Rest.ResourceFormat,System.String)</Target>
-    <Left>lib/net8.0/Hl7.Fhir.Base.dll</Left>
-    <Right>lib/net8.0/Hl7.Fhir.Base.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Hl7.Fhir.Rest.ContentType.BuildContentType(Hl7.Fhir.Rest.ResourceFormat,System.String)</Target>
-    <Left>lib/netstandard2.0/Hl7.Fhir.Base.dll</Left>
-    <Right>lib/netstandard2.0/Hl7.Fhir.Base.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Hl7.Fhir.Rest.ContentType.BuildMediaType(Hl7.Fhir.Rest.ResourceFormat,System.String)</Target>
-    <Left>lib/netstandard2.0/Hl7.Fhir.Base.dll</Left>
-    <Right>lib/netstandard2.0/Hl7.Fhir.Base.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
 </Suppressions>
\ No newline at end of file

From 5479d86a4d82832469df173559c8ba3954b0ffad Mon Sep 17 00:00:00 2001
From: Ewout Kramer <ewout@fire.ly>
Date: Tue, 22 Oct 2024 17:30:36 +0200
Subject: [PATCH 17/18] Small fix to unit test, since the name of backbones has
 changed.

---
 .../Introspection/PropertyMappingTest.cs      | 305 +++++++++---------
 1 file changed, 152 insertions(+), 153 deletions(-)

diff --git a/src/Hl7.Fhir.Support.Tests/Introspection/PropertyMappingTest.cs b/src/Hl7.Fhir.Support.Tests/Introspection/PropertyMappingTest.cs
index 3bcd6cef6c..18c0c46608 100644
--- a/src/Hl7.Fhir.Support.Tests/Introspection/PropertyMappingTest.cs
+++ b/src/Hl7.Fhir.Support.Tests/Introspection/PropertyMappingTest.cs
@@ -13,179 +13,178 @@
 using System;
 using System.Diagnostics;
 
-namespace Hl7.Fhir.Tests.Introspection
+namespace Hl7.Fhir.Tests.Introspection;
+
+[TestClass]
+public class ModelInspectorMembersTest
 {
-    [TestClass]
-    public class ModelInspectorMembersTest
+    [TestMethod]
+    public void TestPrimitiveDataTypeMapping()
     {
-        [TestMethod]
-        public void TestPrimitiveDataTypeMapping()
-        {
-            Assert.IsTrue(ClassMapping.TryCreate(typeof(Base64Binary), out var mapping));
-            Assert.AreEqual("base64Binary", mapping.Name);
-            Assert.IsTrue(mapping.HasPrimitiveValueMember);
-            Assert.AreEqual(3, mapping.PropertyMappings.Count); // id, extension, fhir_comments & value
-            var valueProp = mapping.PrimitiveValueProperty;
-            Assert.IsNotNull(valueProp);
-            Assert.AreEqual("value", valueProp.Name);
-            Assert.IsFalse(valueProp.IsCollection);     // don't see byte[] as a collection of byte in FHIR
-            Assert.IsTrue(valueProp.RepresentsValueElement);
-
-            Assert.IsTrue(ClassMapping.TryCreate(typeof(Code<SomeEnum>), out mapping));
-            Assert.AreEqual("codeOfT<Hl7.Fhir.Tests.Introspection.SomeEnum>", mapping.Name);
-            Assert.IsTrue(mapping.HasPrimitiveValueMember);
-            Assert.AreEqual(3, mapping.PropertyMappings.Count); // id, extension, fhir_comments & value
-            valueProp = mapping.PrimitiveValueProperty;
-            Assert.IsNotNull(valueProp);
-            Assert.IsFalse(valueProp.IsCollection);
-            Assert.IsTrue(valueProp.RepresentsValueElement);
-            Assert.AreEqual(typeof(SomeEnum), valueProp.ImplementingType);
-
-            Assert.IsTrue(ClassMapping.TryCreate(typeof(FhirUri), out mapping));
-            Assert.AreEqual("uri", mapping.Name);
-            Assert.IsTrue(mapping.HasPrimitiveValueMember);
-            Assert.AreEqual(3, mapping.PropertyMappings.Count); // id, extension, fhir_comments & value
-            valueProp = mapping.PrimitiveValueProperty;
-            Assert.IsNotNull(valueProp);
-            Assert.IsFalse(valueProp.IsCollection);
-            Assert.IsTrue(valueProp.RepresentsValueElement);
-            Assert.AreEqual(typeof(string), valueProp.ImplementingType);
-        }
+        Assert.IsTrue(ClassMapping.TryCreate(typeof(Base64Binary), out var mapping));
+        Assert.AreEqual("base64Binary", mapping.Name);
+        Assert.IsTrue(mapping.HasPrimitiveValueMember);
+        Assert.AreEqual(3, mapping.PropertyMappings.Count); // id, extension, fhir_comments & value
+        var valueProp = mapping.PrimitiveValueProperty;
+        Assert.IsNotNull(valueProp);
+        Assert.AreEqual("value", valueProp.Name);
+        Assert.IsFalse(valueProp.IsCollection);     // don't see byte[] as a collection of byte in FHIR
+        Assert.IsTrue(valueProp.RepresentsValueElement);
+
+        Assert.IsTrue(ClassMapping.TryCreate(typeof(Code<SomeEnum>), out mapping));
+        Assert.AreEqual("codeOfT<Hl7.Fhir.Tests.Introspection.SomeEnum>", mapping.Name);
+        Assert.IsTrue(mapping.HasPrimitiveValueMember);
+        Assert.AreEqual(3, mapping.PropertyMappings.Count); // id, extension, fhir_comments & value
+        valueProp = mapping.PrimitiveValueProperty;
+        Assert.IsNotNull(valueProp);
+        Assert.IsFalse(valueProp.IsCollection);
+        Assert.IsTrue(valueProp.RepresentsValueElement);
+        Assert.AreEqual(typeof(SomeEnum), valueProp.ImplementingType);
+
+        Assert.IsTrue(ClassMapping.TryCreate(typeof(FhirUri), out mapping));
+        Assert.AreEqual("uri", mapping.Name);
+        Assert.IsTrue(mapping.HasPrimitiveValueMember);
+        Assert.AreEqual(3, mapping.PropertyMappings.Count); // id, extension, fhir_comments & value
+        valueProp = mapping.PrimitiveValueProperty;
+        Assert.IsNotNull(valueProp);
+        Assert.IsFalse(valueProp.IsCollection);
+        Assert.IsTrue(valueProp.RepresentsValueElement);
+        Assert.AreEqual(typeof(string), valueProp.ImplementingType);
+    }
 
-        [TestMethod]
-        public void TestVersionSpecificMapping()
-        {
-            Assert.IsTrue(ClassMapping.TryCreate(typeof(Meta), out var mapping, Specification.FhirRelease.DSTU1));
-            Assert.IsNull(mapping.FindMappedElementByName("source"));
-            var profile = mapping.FindMappedElementByName("profile");
-            Assert.IsNotNull(profile);
-            Assert.AreEqual(typeof(FhirUri), profile.PropertyTypeMapping.NativeType);
-
-            Assert.IsTrue(ClassMapping.TryCreate(typeof(Meta), out mapping, Specification.FhirRelease.R4));
-            Assert.IsNotNull(mapping.FindMappedElementByName("source"));
-            profile = mapping.FindMappedElementByName("profile");
-            Assert.IsNotNull(profile);
-            Assert.AreEqual(typeof(Canonical), profile.PropertyTypeMapping.NativeType);
-        }
+    [TestMethod]
+    public void TestVersionSpecificMapping()
+    {
+        Assert.IsTrue(ClassMapping.TryCreate(typeof(Meta), out var mapping, Specification.FhirRelease.DSTU1));
+        Assert.IsNull(mapping.FindMappedElementByName("source"));
+        var profile = mapping.FindMappedElementByName("profile");
+        Assert.IsNotNull(profile);
+        Assert.AreEqual(typeof(FhirUri), profile.PropertyTypeMapping.NativeType);
+
+        Assert.IsTrue(ClassMapping.TryCreate(typeof(Meta), out mapping, Specification.FhirRelease.R4));
+        Assert.IsNotNull(mapping.FindMappedElementByName("source"));
+        profile = mapping.FindMappedElementByName("profile");
+        Assert.IsNotNull(profile);
+        Assert.AreEqual(typeof(Canonical), profile.PropertyTypeMapping.NativeType);
+    }
 
-        [TestMethod]
-        public void TestGetByName()
-        {
-            ClassMapping.TryCreate(typeof(Extension), out var cm).Should().BeTrue();
-            cm.FindMappedElementByName("url").Should().NotBeNull();
-            cm.FindMappedElementByName("urlx").Should().BeNull();
-            cm.FindMappedElementByName("ur").Should().BeNull();
-            cm.FindMappedElementByName("value").Should().NotBeNull();
-
-            cm.FindMappedElementByChoiceName("value").Should().NotBeNull();
-            cm.FindMappedElementByChoiceName("valu").Should().BeNull();
-            cm.FindMappedElementByChoiceName("valueString").Should().NotBeNull();
-
-            var urlChild = cm.FindMappedElementByName("url");
-            urlChild.DeclaringClass.Should().Be(cm);
-        }
+    [TestMethod]
+    public void TestGetByName()
+    {
+        ClassMapping.TryCreate(typeof(Extension), out var cm).Should().BeTrue();
+        cm.FindMappedElementByName("url").Should().NotBeNull();
+        cm.FindMappedElementByName("urlx").Should().BeNull();
+        cm.FindMappedElementByName("ur").Should().BeNull();
+        cm.FindMappedElementByName("value").Should().NotBeNull();
+
+        cm.FindMappedElementByChoiceName("value").Should().NotBeNull();
+        cm.FindMappedElementByChoiceName("valu").Should().BeNull();
+        cm.FindMappedElementByChoiceName("valueString").Should().NotBeNull();
+
+        var urlChild = cm.FindMappedElementByName("url");
+        urlChild.DeclaringClass.Should().Be(cm);
+    }
 
-        [TestMethod]
-        public void TestPropsWithRedirect()
-        {
-            Assert.IsTrue(ClassMapping.TryCreate(typeof(TypeWithCodeOfT), out var mapping));
+    [TestMethod]
+    public void TestPropsWithRedirect()
+    {
+        Assert.IsTrue(ClassMapping.TryCreate(typeof(TypeWithCodeOfT), out var mapping));
 
-            var propMapping = mapping.FindMappedElementByName("type1");
-            Assert.AreEqual(typeof(Code<SomeEnum>), propMapping.ImplementingType);
-            Assert.AreEqual(typeof(FhirString), propMapping.PropertyTypeMapping.NativeType);
-        }
+        var propMapping = mapping.FindMappedElementByName("type1");
+        Assert.AreEqual(typeof(Code<SomeEnum>), propMapping.ImplementingType);
+        Assert.AreEqual(typeof(FhirString), propMapping.PropertyTypeMapping.NativeType);
+    }
 
 
-        [TestMethod]
-        public void GetClassMappingForProperty()
-        {
-            // Canonical.Value - a system primitive
-            ClassMapping.TryCreate(typeof(Canonical), out var canonicalMapping);
-            canonicalMapping.FindMappedElementByName("value").PropertyTypeMapping.Name.Should().Be("System.String");
+    [TestMethod]
+    public void GetClassMappingForProperty()
+    {
+        // Canonical.Value - a system primitive
+        ClassMapping.TryCreate(typeof(Canonical), out var canonicalMapping);
+        canonicalMapping.FindMappedElementByName("value").PropertyTypeMapping.Name.Should().Be("System.String");
 
-            // ConcactPoint.System - a Code<T> -> Code
-            ClassMapping.TryCreate(typeof(ContactPoint), out var contactPointMapping);
-            contactPointMapping.FindMappedElementByName("system").PropertyTypeMapping.Name.Should().Be("code");
+        // ConcactPoint.System - a Code<T> -> Code
+        ClassMapping.TryCreate(typeof(ContactPoint), out var contactPointMapping);
+        contactPointMapping.FindMappedElementByName("system").PropertyTypeMapping.Name.Should().Be("code");
 
-            // ContactPoint.Value - a FhirString
-            contactPointMapping.FindMappedElementByName("value").PropertyTypeMapping.Name.Should().Be("string");
+        // ContactPoint.Value - a FhirString
+        contactPointMapping.FindMappedElementByName("value").PropertyTypeMapping.Name.Should().Be("string");
 
-            // Extension.Url - a system primitive
-            ClassMapping.TryCreate(typeof(Extension), out var extensionMapping);
-            extensionMapping.FindMappedElementByName("url").PropertyTypeMapping.Name.Should().Be("System.String");
+        // Extension.Url - a system primitive
+        ClassMapping.TryCreate(typeof(Extension), out var extensionMapping);
+        extensionMapping.FindMappedElementByName("url").PropertyTypeMapping.Name.Should().Be("System.String");
 
-            // Extension.Value - an abstract DataType
-            extensionMapping.FindMappedElementByName("value").PropertyTypeMapping.Name.Should().Be("DataType");
+        // Extension.Value - an abstract DataType
+        extensionMapping.FindMappedElementByName("value").PropertyTypeMapping.Name.Should().Be("DataType");
 
-            // Parameters.Parameter - a backbone
-            ClassMapping.TryCreate(typeof(Parameters), out var parametersMapping);
-            var parameterComponentMapping = parametersMapping.FindMappedElementByName("parameter").PropertyTypeMapping;
+        // Parameters.Parameter - a backbone
+        ClassMapping.TryCreate(typeof(Parameters), out var parametersMapping);
+        var parameterComponentMapping = parametersMapping.FindMappedElementByName("parameter").PropertyTypeMapping;
+        parameterComponentMapping.Name.Should().Be("Parameters.parameter");
 
-            parameterComponentMapping.Name.Should().Be("Parameters#Parameter");
-            parameterComponentMapping.FindMappedElementByName("resource").PropertyTypeMapping.Name.Should().Be("Resource");
-        }
+        parameterComponentMapping.FindMappedElementByName("resource").PropertyTypeMapping.Name.Should().Be("Resource");
+    }
 
-        [FhirType("TypeWithCodeOfT")]
-        public class TypeWithCodeOfT
-        {
-            [FhirElement("type1")]
-            [DeclaredType(Type = typeof(FhirString))]
-            public Code<SomeEnum> Type1 { get; set; }
-        }
+    [FhirType("TypeWithCodeOfT")]
+    public class TypeWithCodeOfT
+    {
+        [FhirElement("type1")]
+        [DeclaredType(Type = typeof(FhirString))]
+        public Code<SomeEnum> Type1 { get; set; }
+    }
 
-        [FhirType("BindableClass")]
-        [Bindable(true)]
-        public class BindableClass
-        {
-        }
+    [FhirType("BindableClass")]
+    [Bindable(true)]
+    public class BindableClass
+    {
+    }
 
-        [FhirType("NonBindableClass")]
-        [Bindable(false)]
-        public class NonBindableClass
-        {
-        }
+    [FhirType("NonBindableClass")]
+    [Bindable(false)]
+    public class NonBindableClass
+    {
+    }
 
-        [TestMethod]
-        public void IsBindableTest()
-        {
-            ClassMapping.TryCreate(typeof(BindableClass), out var mapping);
-            mapping.Should().NotBeNull();
-            mapping.IsBindable.Should().BeTrue();
+    [TestMethod]
+    public void IsBindableTest()
+    {
+        ClassMapping.TryCreate(typeof(BindableClass), out var mapping);
+        mapping.Should().NotBeNull();
+        mapping.IsBindable.Should().BeTrue();
 
-            ClassMapping.TryCreate(typeof(NonBindableClass), out mapping);
-            mapping.Should().NotBeNull();
-            mapping.IsBindable.Should().BeFalse();
-        }
+        ClassMapping.TryCreate(typeof(NonBindableClass), out mapping);
+        mapping.Should().NotBeNull();
+        mapping.IsBindable.Should().BeFalse();
+    }
 
-        [TestMethod]
-        public void TestPerformanceOfMapping()
+    [TestMethod]
+    public void TestPerformanceOfMapping()
+    {
+        // just a random list of POCO types available in common
+        var typesToTest = new Type[] { typeof(BackboneElement), typeof(BackboneType),
+            typeof(Base64Binary), typeof(Canonical), typeof(Element), typeof(FhirString),
+            typeof(Extension), typeof(Resource), typeof(Meta), typeof(XHtml) };
+
+
+        var sw = new Stopwatch();
+        sw.Start();
+        for (int i = 0; i < 1000; i++)
+            foreach (var testee in typesToTest)
+                createMapping(testee);
+        sw.Stop();
+        Console.WriteLine($"No props: {sw.ElapsedMilliseconds}");
+
+        sw.Restart();
+        for (int i = 0; i < 1000; i++)
+            foreach (var testee in typesToTest)
+                createMapping(testee, touchProps: true);
+        sw.Stop();
+        Console.WriteLine($"With props: {sw.ElapsedMilliseconds}");
+
+        int createMapping(Type t, bool touchProps = false)
         {
-            // just a random list of POCO types available in common
-            var typesToTest = new Type[] { typeof(BackboneElement), typeof(BackboneType),
-                typeof(Base64Binary), typeof(Canonical), typeof(Element), typeof(FhirString),
-                typeof(Extension), typeof(Resource), typeof(Meta), typeof(XHtml) };
-
-
-            var sw = new Stopwatch();
-            sw.Start();
-            for (int i = 0; i < 1000; i++)
-                foreach (var testee in typesToTest)
-                    createMapping(testee);
-            sw.Stop();
-            Console.WriteLine($"No props: {sw.ElapsedMilliseconds}");
-
-            sw.Restart();
-            for (int i = 0; i < 1000; i++)
-                foreach (var testee in typesToTest)
-                    createMapping(testee, touchProps: true);
-            sw.Stop();
-            Console.WriteLine($"With props: {sw.ElapsedMilliseconds}");
-
-            int createMapping(Type t, bool touchProps = false)
-            {
-                ClassMapping.TryCreate(t, out var mapping);
-                return touchProps ? mapping.PropertyMappings.Count : -1;
-            }
+            ClassMapping.TryCreate(t, out var mapping);
+            return touchProps ? mapping.PropertyMappings.Count : -1;
         }
     }
-}
+}
\ No newline at end of file

From be68c7b26cebf9637d467863d940e068ebd2c386 Mon Sep 17 00:00:00 2001
From: Kasdejong <k.j2.de.jong@student.vu.nl>
Date: Wed, 23 Oct 2024 12:03:50 +0200
Subject: [PATCH 18/18] updated CompatibilitySuppressions.xml

---
 .../CompatibilitySuppressions.xml             | 98 +++----------------
 1 file changed, 14 insertions(+), 84 deletions(-)

diff --git a/src/Hl7.Fhir.Base/CompatibilitySuppressions.xml b/src/Hl7.Fhir.Base/CompatibilitySuppressions.xml
index e27ef04622..c5bb7b18b9 100644
--- a/src/Hl7.Fhir.Base/CompatibilitySuppressions.xml
+++ b/src/Hl7.Fhir.Base/CompatibilitySuppressions.xml
@@ -100,77 +100,49 @@
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Hl7.Fhir.FhirPath.FhirEvaluationContext.WithResourceOverrides(Hl7.Fhir.ElementModel.ITypedElement,Hl7.Fhir.ElementModel.ITypedElement)</Target>
-    <Left>lib/net8.0/Hl7.Fhir.Base.dll</Left>
-    <Right>lib/net8.0/Hl7.Fhir.Base.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Hl7.Fhir.Introspection.ClassMapping.get_DefinitionPath</Target>
-    <Left>lib/net8.0/Hl7.Fhir.Base.dll</Left>
-    <Right>lib/net8.0/Hl7.Fhir.Base.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Hl7.Fhir.Introspection.FhirTypeAttribute.get_IsNestedType</Target>
-    <Left>lib/net8.0/Hl7.Fhir.Base.dll</Left>
-    <Right>lib/net8.0/Hl7.Fhir.Base.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Hl7.Fhir.Introspection.FhirTypeAttribute.get_IsResource</Target>
-    <Left>lib/net8.0/Hl7.Fhir.Base.dll</Left>
-    <Right>lib/net8.0/Hl7.Fhir.Base.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Hl7.Fhir.Introspection.FhirTypeAttribute.set_IsNestedType(System.Boolean)</Target>
+    <Target>M:Hl7.Fhir.FhirPath.FhirEvaluationContext.get_TerminologyService</Target>
     <Left>lib/net8.0/Hl7.Fhir.Base.dll</Left>
     <Right>lib/net8.0/Hl7.Fhir.Base.dll</Right>
     <IsBaselineSuppression>true</IsBaselineSuppression>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Hl7.Fhir.Introspection.FhirTypeAttribute.set_IsResource(System.Boolean)</Target>
+    <Target>M:Hl7.Fhir.FhirPath.FhirEvaluationContext.WithResourceOverrides(Hl7.Fhir.ElementModel.ITypedElement,Hl7.Fhir.ElementModel.ITypedElement)</Target>
     <Left>lib/net8.0/Hl7.Fhir.Base.dll</Left>
     <Right>lib/net8.0/Hl7.Fhir.Base.dll</Right>
     <IsBaselineSuppression>true</IsBaselineSuppression>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Hl7.Fhir.Model.Parameters.get_Item(System.String)</Target>
+    <Target>M:Hl7.Fhir.Introspection.ClassMapping.get_DefinitionPath</Target>
     <Left>lib/net8.0/Hl7.Fhir.Base.dll</Left>
     <Right>lib/net8.0/Hl7.Fhir.Base.dll</Right>
     <IsBaselineSuppression>true</IsBaselineSuppression>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Hl7.Fhir.Rest.ContentType.BuildContentType(Hl7.Fhir.Rest.ResourceFormat,System.String)</Target>
+    <Target>M:Hl7.Fhir.Introspection.FhirTypeAttribute.get_IsNestedType</Target>
     <Left>lib/net8.0/Hl7.Fhir.Base.dll</Left>
     <Right>lib/net8.0/Hl7.Fhir.Base.dll</Right>
     <IsBaselineSuppression>true</IsBaselineSuppression>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Hl7.Fhir.Rest.ContentType.BuildMediaType(Hl7.Fhir.Rest.ResourceFormat,System.String)</Target>
+    <Target>M:Hl7.Fhir.Introspection.FhirTypeAttribute.get_IsResource</Target>
     <Left>lib/net8.0/Hl7.Fhir.Base.dll</Left>
     <Right>lib/net8.0/Hl7.Fhir.Base.dll</Right>
     <IsBaselineSuppression>true</IsBaselineSuppression>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Hl7.Fhir.FhirPath.FhirEvaluationContext.get_TerminologyService</Target>
+    <Target>M:Hl7.Fhir.Introspection.FhirTypeAttribute.set_IsNestedType(System.Boolean)</Target>
     <Left>lib/net8.0/Hl7.Fhir.Base.dll</Left>
     <Right>lib/net8.0/Hl7.Fhir.Base.dll</Right>
     <IsBaselineSuppression>true</IsBaselineSuppression>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Hl7.Fhir.FhirPath.FhirEvaluationContext.WithResourceOverrides(Hl7.Fhir.ElementModel.ITypedElement,Hl7.Fhir.ElementModel.ITypedElement)</Target>
+    <Target>M:Hl7.Fhir.Introspection.FhirTypeAttribute.set_IsResource(System.Boolean)</Target>
     <Left>lib/net8.0/Hl7.Fhir.Base.dll</Left>
     <Right>lib/net8.0/Hl7.Fhir.Base.dll</Right>
     <IsBaselineSuppression>true</IsBaselineSuppression>
@@ -231,20 +203,6 @@
     <Right>lib/net8.0/Hl7.Fhir.Base.dll</Right>
     <IsBaselineSuppression>true</IsBaselineSuppression>
   </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Hl7.Fhir.Utility.ReflectionHelper.IsTypedCollection(System.Type)</Target>
-    <Left>lib/net8.0/Hl7.Fhir.Base.dll</Left>
-    <Right>lib/net8.0/Hl7.Fhir.Base.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Hl7.FhirPath.EvaluationContext.WithResourceOverrides(Hl7.Fhir.ElementModel.ITypedElement,Hl7.Fhir.ElementModel.ITypedElement)</Target>
-    <Left>lib/net8.0/Hl7.Fhir.Base.dll</Left>
-    <Right>lib/net8.0/Hl7.Fhir.Base.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
   <Suppression>
     <DiagnosticId>CP0002</DiagnosticId>
     <Target>M:Hl7.Fhir.ElementModel.TypedElementExtensions.IsExactlyEqualTo``1(``0,``0,System.Boolean)</Target>
@@ -310,77 +268,49 @@
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Hl7.Fhir.FhirPath.FhirEvaluationContext.WithResourceOverrides(Hl7.Fhir.ElementModel.ITypedElement,Hl7.Fhir.ElementModel.ITypedElement)</Target>
-    <Left>lib/netstandard2.0/Hl7.Fhir.Base.dll</Left>
-    <Right>lib/netstandard2.0/Hl7.Fhir.Base.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Hl7.Fhir.Introspection.ClassMapping.get_DefinitionPath</Target>
-    <Left>lib/netstandard2.0/Hl7.Fhir.Base.dll</Left>
-    <Right>lib/netstandard2.0/Hl7.Fhir.Base.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Hl7.Fhir.Introspection.FhirTypeAttribute.get_IsNestedType</Target>
-    <Left>lib/netstandard2.0/Hl7.Fhir.Base.dll</Left>
-    <Right>lib/netstandard2.0/Hl7.Fhir.Base.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Hl7.Fhir.Introspection.FhirTypeAttribute.get_IsResource</Target>
-    <Left>lib/netstandard2.0/Hl7.Fhir.Base.dll</Left>
-    <Right>lib/netstandard2.0/Hl7.Fhir.Base.dll</Right>
-    <IsBaselineSuppression>true</IsBaselineSuppression>
-  </Suppression>
-  <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Hl7.Fhir.Introspection.FhirTypeAttribute.set_IsNestedType(System.Boolean)</Target>
+    <Target>M:Hl7.Fhir.FhirPath.FhirEvaluationContext.get_TerminologyService</Target>
     <Left>lib/netstandard2.0/Hl7.Fhir.Base.dll</Left>
     <Right>lib/netstandard2.0/Hl7.Fhir.Base.dll</Right>
     <IsBaselineSuppression>true</IsBaselineSuppression>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Hl7.Fhir.Introspection.FhirTypeAttribute.set_IsResource(System.Boolean)</Target>
+    <Target>M:Hl7.Fhir.FhirPath.FhirEvaluationContext.WithResourceOverrides(Hl7.Fhir.ElementModel.ITypedElement,Hl7.Fhir.ElementModel.ITypedElement)</Target>
     <Left>lib/netstandard2.0/Hl7.Fhir.Base.dll</Left>
     <Right>lib/netstandard2.0/Hl7.Fhir.Base.dll</Right>
     <IsBaselineSuppression>true</IsBaselineSuppression>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Hl7.Fhir.Model.Parameters.get_Item(System.String)</Target>
+    <Target>M:Hl7.Fhir.Introspection.ClassMapping.get_DefinitionPath</Target>
     <Left>lib/netstandard2.0/Hl7.Fhir.Base.dll</Left>
     <Right>lib/netstandard2.0/Hl7.Fhir.Base.dll</Right>
     <IsBaselineSuppression>true</IsBaselineSuppression>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Hl7.Fhir.Rest.ContentType.BuildContentType(Hl7.Fhir.Rest.ResourceFormat,System.String)</Target>
+    <Target>M:Hl7.Fhir.Introspection.FhirTypeAttribute.get_IsNestedType</Target>
     <Left>lib/netstandard2.0/Hl7.Fhir.Base.dll</Left>
     <Right>lib/netstandard2.0/Hl7.Fhir.Base.dll</Right>
     <IsBaselineSuppression>true</IsBaselineSuppression>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Hl7.Fhir.Rest.ContentType.BuildMediaType(Hl7.Fhir.Rest.ResourceFormat,System.String)</Target>
+    <Target>M:Hl7.Fhir.Introspection.FhirTypeAttribute.get_IsResource</Target>
     <Left>lib/netstandard2.0/Hl7.Fhir.Base.dll</Left>
     <Right>lib/netstandard2.0/Hl7.Fhir.Base.dll</Right>
     <IsBaselineSuppression>true</IsBaselineSuppression>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Hl7.Fhir.FhirPath.FhirEvaluationContext.get_TerminologyService</Target>
+    <Target>M:Hl7.Fhir.Introspection.FhirTypeAttribute.set_IsNestedType(System.Boolean)</Target>
     <Left>lib/netstandard2.0/Hl7.Fhir.Base.dll</Left>
     <Right>lib/netstandard2.0/Hl7.Fhir.Base.dll</Right>
     <IsBaselineSuppression>true</IsBaselineSuppression>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Hl7.Fhir.FhirPath.FhirEvaluationContext.WithResourceOverrides(Hl7.Fhir.ElementModel.ITypedElement,Hl7.Fhir.ElementModel.ITypedElement)</Target>
+    <Target>M:Hl7.Fhir.Introspection.FhirTypeAttribute.set_IsResource(System.Boolean)</Target>
     <Left>lib/netstandard2.0/Hl7.Fhir.Base.dll</Left>
     <Right>lib/netstandard2.0/Hl7.Fhir.Base.dll</Right>
     <IsBaselineSuppression>true</IsBaselineSuppression>