diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/resources40_50/Enumerations40_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/resources40_50/Enumerations40_50.java
index af0a66a27..84a211e98 100644
--- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/resources40_50/Enumerations40_50.java
+++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/resources40_50/Enumerations40_50.java
@@ -230,12 +230,6 @@ public class Enumerations40_50 {
       case _4_3_0:
         tgt.setValue(org.hl7.fhir.r5.model.Enumerations.FHIRVersion._4_3_0);
         break;
-      case _4_3_0_CIBUILD:
-        tgt.setValue(org.hl7.fhir.r5.model.Enumerations.FHIRVersion._4_3_0CIBUILD);
-        break;
-      case _4_3_0_SNAPSHOT1:
-        tgt.setValue(org.hl7.fhir.r5.model.Enumerations.FHIRVersion._4_3_0SNAPSHOT1);
-        break;
       case _5_0_0:
         tgt.setValue(org.hl7.fhir.r5.model.Enumerations.FHIRVersion._5_0_0);
         break;
@@ -254,6 +248,15 @@ public class Enumerations40_50 {
       case _5_0_0DRAFTFINAL:
         tgt.setValue(org.hl7.fhir.r5.model.Enumerations.FHIRVersion._5_0_0DRAFTFINAL);
         break;
+      case _6_0_0:
+        tgt.setValue(org.hl7.fhir.r5.model.Enumerations.FHIRVersion._6_0_0);
+        break;
+      case _6_0_0_BALLOT1:
+        tgt.setValue(org.hl7.fhir.r5.model.Enumerations.FHIRVersion._6_0_0_BALLOT1);
+        break;
+      case _6_0_0_BALLOT2:
+        tgt.setValue(org.hl7.fhir.r5.model.Enumerations.FHIRVersion._6_0_0_BALLOT2);
+        break;
       default:
         tgt.setValue(org.hl7.fhir.r5.model.Enumerations.FHIRVersion.NULL);
         break;
@@ -342,12 +345,6 @@ public class Enumerations40_50 {
       case _4_3_0:
         tgt.setValue(org.hl7.fhir.r4.model.Enumerations.FHIRVersion._4_3_0);
         break;
-      case _4_3_0CIBUILD:
-        tgt.setValue(org.hl7.fhir.r4.model.Enumerations.FHIRVersion._4_3_0_CIBUILD);
-        break;
-      case _4_3_0SNAPSHOT1:
-        tgt.setValue(org.hl7.fhir.r4.model.Enumerations.FHIRVersion._4_3_0_SNAPSHOT1);
-        break;
       case _5_0_0:
         tgt.setValue(org.hl7.fhir.r4.model.Enumerations.FHIRVersion._5_0_0);
         break;
@@ -366,6 +363,15 @@ public class Enumerations40_50 {
       case _5_0_0DRAFTFINAL:
         tgt.setValue(org.hl7.fhir.r4.model.Enumerations.FHIRVersion._5_0_0DRAFTFINAL);
         break;
+      case _6_0_0:
+        tgt.setValue(org.hl7.fhir.r4.model.Enumerations.FHIRVersion._6_0_0);
+        break;
+      case _6_0_0_BALLOT1:
+        tgt.setValue(org.hl7.fhir.r4.model.Enumerations.FHIRVersion._6_0_0_BALLOT1);
+        break;
+      case _6_0_0_BALLOT2:
+        tgt.setValue(org.hl7.fhir.r4.model.Enumerations.FHIRVersion._6_0_0_BALLOT2);
+        break;
         
       default:
         tgt.setValue(org.hl7.fhir.r4.model.Enumerations.FHIRVersion.NULL);
diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Enumerations.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Enumerations.java
index d2ce3d418..8da4196d8 100644
--- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Enumerations.java
+++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Enumerations.java
@@ -1,6 +1,7 @@
 package org.hl7.fhir.r4.model;
 
 import org.hl7.fhir.exceptions.FHIRException;
+import org.hl7.fhir.utilities.Utilities;
 
 public class Enumerations {
 
@@ -13173,1196 +13174,928 @@ public class Enumerations {
     }
   }
 
-  public enum FHIRVersion {
-    /**
-     * Oldest archived version of FHIR.
-     */
-    _0_01,
-    /**
-     * 1st Draft for Comment (Sept 2012 Ballot).
-     */
-    _0_05,
-    /**
-     * 2nd Draft for Comment (January 2013 Ballot).
-     */
-    _0_06,
-    /**
-     * DSTU 1 Ballot version.
-     */
-    _0_11,
-    /**
-     * DSTU 1 version.
-     */
-    _0_0,
-    /**
-     * DSTU 1 Official version.
-     */
-    _0_0_80,
-    /**
-     * DSTU 1 Official version Technical Errata #1.
-     */
-    _0_0_81,
-    /**
-     * DSTU 1 Official version Technical Errata #2.
-     */
-    _0_0_82,
-    /**
-     * January 2015 Ballot.
-     */
-    _0_4,
-    /**
-     * Draft For Comment (January 2015 Ballot).
-     */
-    _0_4_0,
-    /**
-     * May 2015 Ballot.
-     */
-    _0_5,
-    /**
-     * DSTU 2 Ballot version (May 2015 Ballot).
-     */
-    _0_5_0,
-    /**
-     * DSTU 2 version.
-     */
-    _1_0,
-    /**
-     * DSTU 2 QA Preview + CQIF Ballot (Sep 2015).
-     */
-    _1_0_0,
-    /**
-     * DSTU 2 (Official version).
-     */
-    _1_0_1,
-    /**
-     * DSTU 2 (Official version) with 1 technical errata.
-     */
-    _1_0_2,
-    /**
-     * GAO Ballot version.
-     */
-    _1_1,
-    /**
-     * GAO Ballot + draft changes to main FHIR standard.
-     */
-    _1_1_0,
-    /**
-     * Connectathon 12 (Montreal) version.
-     */
-    _1_4,
-    /**
-     * CQF on FHIR Ballot + Connectathon 12 (Montreal).
-     */
-    _1_4_0,
-    /**
-     * Connectathon 13 (Baltimore) version.
-     */
-    _1_6,
-    /**
-     * FHIR STU3 Ballot + Connectathon 13 (Baltimore).
-     */
-    _1_6_0,
-    /**
-     * Connectathon 14 (San Antonio) version.
-     */
-    _1_8,
-    /**
-     * FHIR STU3 Candidate + Connectathon 14 (San Antonio).
-     */
-    _1_8_0,
-    /**
-     * STU3 version.
-     */
-    _3_0,
-    /**
-     * FHIR Release 3 (STU).
-     */
-    _3_0_0,
-    /**
-     * FHIR Release 3 (STU) with 1 technical errata.
-     */
-    _3_0_1,
-    /**
-     * FHIR Release 3 (STU) with 2 technical errata.
-     */
-    _3_0_2,
-    /**
-     * R4 Ballot #1 version.
-     */
-    _3_3,
-    /**
-     * R4 Ballot #1 + Connectaton 18 (Cologne).
-     */
-    _3_3_0,
-    /**
-     * R4 Ballot #2 version.
-     */
-    _3_5,
-    /**
-     * R4 Ballot #2 + Connectathon 19 (Baltimore).
-     */
-    _3_5_0,
-    /**
-     * R4 version.
-     */
-    _4_0,
-    /**
-     * FHIR Release 4 (Normative + STU).
-     */
-    _4_0_0,
-    /**
-     * FHIR Release 4 (Normative + STU) with 1 technical errata.
-     */
-    _4_0_1,
-    /**
-     * R4B Ballot #1 version.
-     */
-    _4_1,
-    /**
-     * R4B Ballot #1 + Connectathon 27 (Virtual).
-     */
-    _4_1_0, _4_3_0_SNAPSHOT1, _4_3_0_CIBUILD,
-    /**
-     * R5 Preview #1 version.
-     */
-    _4_2,
-    /**
-     * R5 Preview #1 + Connectathon 23 (Sydney).
-     */
-    _4_2_0,
-    /**
-     * R4B version.
-     */
-    _4_3,
-    /**
-     * FHIR Release 4B (Normative + STU).
-     */
-    _4_3_0,
-    /**
-     * R5 Preview #2 version.
-     */
-    _4_4,
-    /**
-     * R5 Preview #2 + Connectathon 24 (Virtual).
-     */
-    _4_4_0,
-    /**
-     * R5 Preview #3 version.
-     */
-    _4_5,
-    /**
-     * R5 Preview #3 + Connectathon 25 (Virtual).
-     */
-    _4_5_0,
-    /**
-     * R5 Draft Ballot version.
-     */
-    _4_6,
-    /**
-     * R5 Draft Ballot + Connectathon 27 (Virtual).
-     */
-    _4_6_0,
-    /**
-     * R5 Versions.
-     */
-    _5_0,
-    /**
-     * R5 Final Version.
-     */
-    _5_0_0,
-    /**
-     * R5 Rolling ci-build.
-     */
-    _5_0_0CIBUILD,
-    /**
-     * R5 Preview #2.
-     */
-    _5_0_0SNAPSHOT1,
-    /**
-     * R5 Interim tooling stage.
-     */
-    _5_0_0SNAPSHOT2,
-    /**
-     * R5 Ballot.
-     */
-    _5_0_0BALLOT,
-    /**
-     * R5Connectathon 32 release.
-     */
-    _5_0_0SNAPSHOT3, _5_0_0DRAFTFINAL,
-    /**
-     * added to help the parsers
-     */
-    NULL;
-
-    public static FHIRVersion fromCode(String codeString) throws FHIRException {
-      if (codeString == null || "".equals(codeString))
-        return null;
-      if ("0.01".equals(codeString))
-        return _0_01;
-      if ("0.05".equals(codeString))
-        return _0_05;
-      if ("0.06".equals(codeString))
-        return _0_06;
-      if ("0.11".equals(codeString))
-        return _0_11;
-      if ("0.0".equals(codeString))
-        return _0_0;
-      if ("0.0.80".equals(codeString))
-        return _0_0_80;
-      if ("0.0.81".equals(codeString))
-        return _0_0_81;
-      if ("0.0.82".equals(codeString))
-        return _0_0_82;
-      if ("0.4".equals(codeString))
-        return _0_4;
-      if ("0.4.0".equals(codeString))
-        return _0_4_0;
-      if ("0.5".equals(codeString))
-        return _0_5;
-      if ("0.5.0".equals(codeString))
-        return _0_5_0;
-      if ("1.0".equals(codeString))
-        return _1_0;
-      if ("1.0.0".equals(codeString))
-        return _1_0_0;
-      if ("1.0.1".equals(codeString))
-        return _1_0_1;
-      if ("1.0.2".equals(codeString))
-        return _1_0_2;
-      if ("1.1".equals(codeString))
-        return _1_1;
-      if ("1.1.0".equals(codeString))
-        return _1_1_0;
-      if ("1.4".equals(codeString))
-        return _1_4;
-      if ("1.4.0".equals(codeString))
-        return _1_4_0;
-      if ("1.6".equals(codeString))
-        return _1_6;
-      if ("1.6.0".equals(codeString))
-        return _1_6_0;
-      if ("1.8".equals(codeString))
-        return _1_8;
-      if ("1.8.0".equals(codeString))
-        return _1_8_0;
-      if ("3.0".equals(codeString))
-        return _3_0;
-      if ("3.0.0".equals(codeString))
-        return _3_0_0;
-      if ("3.0.1".equals(codeString))
-        return _3_0_1;
-      if ("3.0.2".equals(codeString))
-        return _3_0_2;
-      if ("3.3".equals(codeString))
-        return _3_3;
-      if ("3.3.0".equals(codeString))
-        return _3_3_0;
-      if ("3.5".equals(codeString))
-        return _3_5;
-      if ("3.5.0".equals(codeString))
-        return _3_5_0;
-      if ("4.0".equals(codeString))
-        return _4_0;
-      if ("4.0.0".equals(codeString))
-        return _4_0_0;
-      if ("4.0.1".equals(codeString))
-        return _4_0_1;
-      if ("4.1".equals(codeString))
-        return _4_1;
-      if ("4.1.0".equals(codeString))
-        return _4_1_0;
-      if ("4.3.0-snapshot1".equals(codeString))
-        return _4_3_0_SNAPSHOT1;
-      if ("4.3.0-cibuild".equals(codeString))
-        return _4_3_0_CIBUILD;
-      if ("4.2".equals(codeString))
-        return _4_2;
-      if ("4.2.0".equals(codeString))
-        return _4_2_0;
-      if ("4.3".equals(codeString))
-        return _4_3;
-      if ("4.3.0".equals(codeString))
-        return _4_3_0;
-      if ("4.4".equals(codeString))
-        return _4_4;
-      if ("4.4.0".equals(codeString))
-        return _4_4_0;
-      if ("4.5".equals(codeString))
-        return _4_5;
-      if ("4.5.0".equals(codeString))
-        return _4_5_0;
-      if ("4.6".equals(codeString))
-        return _4_6;
-      if ("4.6.0".equals(codeString))
-        return _4_6_0;
-      if ("5.0".equals(codeString))
-        return _5_0;
-      if ("5.0.0".equals(codeString))
-        return _5_0_0;
-      if ("5.0.0-cibuild".equals(codeString))
-        return _5_0_0CIBUILD;
-      if ("5.0.0-snapshot1".equals(codeString))
-        return _5_0_0SNAPSHOT1;
-      if ("5.0.0-snapshot2".equals(codeString))
-        return _5_0_0SNAPSHOT2;
-      if ("5.0.0-ballot".equals(codeString))
-        return _5_0_0BALLOT;
-      if ("5.0.0-snapshot3".equals(codeString))
-        return _5_0_0SNAPSHOT3;
-      if ("5.0.0-draft-final".equals(codeString))
-        return _5_0_0DRAFTFINAL;
-      throw new FHIRException("Unknown FHIRVersion code '" + codeString + "'");
+    public enum FHIRVersion {
+        /**
+         * Oldest archived version of FHIR.
+         */
+        _0_01, 
+        /**
+         * 1st Draft for Comment (Sept 2012 Ballot).
+         */
+        _0_05, 
+        /**
+         * 2nd Draft for Comment (January 2013 Ballot).
+         */
+        _0_06, 
+        /**
+         * DSTU 1 Ballot version.
+         */
+        _0_11, 
+        /**
+         * DSTU 1 version.
+         */
+        _0_0, 
+        /**
+         * DSTU 1 Official version.
+         */
+        _0_0_80, 
+        /**
+         * DSTU 1 Official version Technical Errata #1.
+         */
+        _0_0_81, 
+        /**
+         * DSTU 1 Official version Technical Errata #2.
+         */
+        _0_0_82, 
+        /**
+         * January 2015 Ballot.
+         */
+        _0_4, 
+        /**
+         * Draft For Comment (January 2015 Ballot).
+         */
+        _0_4_0, 
+        /**
+         * May 2015 Ballot.
+         */
+        _0_5, 
+        /**
+         * DSTU 2 Ballot version (May 2015 Ballot).
+         */
+        _0_5_0, 
+        /**
+         * DSTU 2 version.
+         */
+        _1_0, 
+        /**
+         * DSTU 2 QA Preview + CQIF Ballot (Sep 2015).
+         */
+        _1_0_0, 
+        /**
+         * DSTU 2 (Official version).
+         */
+        _1_0_1, 
+        /**
+         * DSTU 2 (Official version) with 1 technical errata.
+         */
+        _1_0_2, 
+        /**
+         * GAO Ballot version.
+         */
+        _1_1, 
+        /**
+         * GAO Ballot + draft changes to main FHIR standard.
+         */
+        _1_1_0, 
+        /**
+         * Connectathon 12 (Montreal) version.
+         */
+        _1_4, 
+        /**
+         * CQF on FHIR Ballot + Connectathon 12 (Montreal).
+         */
+        _1_4_0, 
+        /**
+         * Connectathon 13 (Baltimore) version.
+         */
+        _1_6, 
+        /**
+         * FHIR STU3 Ballot + Connectathon 13 (Baltimore).
+         */
+        _1_6_0, 
+        /**
+         * Connectathon 14 (San Antonio) version.
+         */
+        _1_8, 
+        /**
+         * FHIR STU3 Candidate + Connectathon 14 (San Antonio).
+         */
+        _1_8_0, 
+        /**
+         * STU3 version.
+         */
+        _3_0, 
+        /**
+         * FHIR Release 3 (STU).
+         */
+        _3_0_0, 
+        /**
+         * FHIR Release 3 (STU) with 1 technical errata.
+         */
+        _3_0_1, 
+        /**
+         * FHIR Release 3 (STU) with 2 technical errata.
+         */
+        _3_0_2, 
+        /**
+         * R4 Ballot #1 version.
+         */
+        _3_3, 
+        /**
+         * R4 Ballot #1 + Connectaton 18 (Cologne).
+         */
+        _3_3_0, 
+        /**
+         * R4 Ballot #2 version.
+         */
+        _3_5, 
+        /**
+         * R4 Ballot #2 + Connectathon 19 (Baltimore).
+         */
+        _3_5_0, 
+        /**
+         * R4 version.
+         */
+        _4_0, 
+        /**
+         * FHIR Release 4 (Normative + STU).
+         */
+        _4_0_0, 
+        /**
+         * FHIR Release 4 (Normative + STU) with 1 technical errata.
+         */
+        _4_0_1, 
+        /**
+         * R4B Ballot #1 version.
+         */
+        _4_1, 
+        /**
+         * R4B Ballot #1 + Connectathon 27 (Virtual).
+         */
+        _4_1_0, 
+        /**
+         * R5 Preview #1 version.
+         */
+        _4_2, 
+        /**
+         * R5 Preview #1 + Connectathon 23 (Sydney).
+         */
+        _4_2_0, 
+        /**
+         * R4B version.
+         */
+        _4_3, 
+        /**
+         * FHIR Release 4B (Normative + STU).
+         */
+        _4_3_0, 
+        /**
+         * FHIR Release 4B CI-Builld.
+         */
+        _4_3_0CIBUILD, 
+        /**
+         * FHIR Release 4B Snapshot #1.
+         */
+        _4_3_0SNAPSHOT1, 
+        /**
+         * R5 Preview #2 version.
+         */
+        _4_4, 
+        /**
+         * R5 Preview #2 + Connectathon 24 (Virtual).
+         */
+        _4_4_0, 
+        /**
+         * R5 Preview #3 version.
+         */
+        _4_5, 
+        /**
+         * R5 Preview #3 + Connectathon 25 (Virtual).
+         */
+        _4_5_0, 
+        /**
+         * R5 Draft Ballot version.
+         */
+        _4_6, 
+        /**
+         * R5 Draft Ballot + Connectathon 27 (Virtual).
+         */
+        _4_6_0, 
+        /**
+         * R5 Versions.
+         */
+        _5_0, 
+        /**
+         * R5 Final Version.
+         */
+        _5_0_0, 
+        /**
+         * R5 Rolling ci-build.
+         */
+        _5_0_0CIBUILD, 
+        /**
+         * R5 Preview #2.
+         */
+        _5_0_0SNAPSHOT1, 
+        /**
+         * R5 Interim tooling stage.
+         */
+        _5_0_0SNAPSHOT2, 
+        /**
+         * R5 Ballot.
+         */
+        _5_0_0BALLOT, 
+        /**
+         * R5 January 2023 Staging Release + Connectathon 32.
+         */
+        _5_0_0SNAPSHOT3, 
+        /**
+         * R5 Final QA.
+         */
+        _5_0_0DRAFTFINAL, 
+        /**
+         * R6 Rolling ci-build.
+         */
+        _6_0_0CIBUILD, 
+        /**
+         * R6 Formal version (does not exist yet)
+         */
+        _6_0_0, 
+        _6_0_0_BALLOT1, 
+        _6_0_0_BALLOT2, 
+        /**
+         * added to help the parsers
+         */
+        NULL;
+        public static FHIRVersion fromCode(String codeString) throws FHIRException {
+            if (codeString == null || "".equals(codeString))
+                return null;
+        if ("0.01".equals(codeString))
+          return _0_01;
+        if ("0.05".equals(codeString))
+          return _0_05;
+        if ("0.06".equals(codeString))
+          return _0_06;
+        if ("0.11".equals(codeString))
+          return _0_11;
+        if ("0.0".equals(codeString))
+          return _0_0;
+        if ("0.0.80".equals(codeString))
+          return _0_0_80;
+        if ("0.0.81".equals(codeString))
+          return _0_0_81;
+        if ("0.0.82".equals(codeString))
+          return _0_0_82;
+        if ("0.4".equals(codeString))
+          return _0_4;
+        if ("0.4.0".equals(codeString))
+          return _0_4_0;
+        if ("0.5".equals(codeString))
+          return _0_5;
+        if ("0.5.0".equals(codeString))
+          return _0_5_0;
+        if ("1.0".equals(codeString))
+          return _1_0;
+        if ("1.0.0".equals(codeString))
+          return _1_0_0;
+        if ("1.0.1".equals(codeString))
+          return _1_0_1;
+        if ("1.0.2".equals(codeString))
+          return _1_0_2;
+        if ("1.1".equals(codeString))
+          return _1_1;
+        if ("1.1.0".equals(codeString))
+          return _1_1_0;
+        if ("1.4".equals(codeString))
+          return _1_4;
+        if ("1.4.0".equals(codeString))
+          return _1_4_0;
+        if ("1.6".equals(codeString))
+          return _1_6;
+        if ("1.6.0".equals(codeString))
+          return _1_6_0;
+        if ("1.8".equals(codeString))
+          return _1_8;
+        if ("1.8.0".equals(codeString))
+          return _1_8_0;
+        if ("3.0".equals(codeString))
+          return _3_0;
+        if ("3.0.0".equals(codeString))
+          return _3_0_0;
+        if ("3.0.1".equals(codeString))
+          return _3_0_1;
+        if ("3.0.2".equals(codeString))
+          return _3_0_2;
+        if ("3.3".equals(codeString))
+          return _3_3;
+        if ("3.3.0".equals(codeString))
+          return _3_3_0;
+        if ("3.5".equals(codeString))
+          return _3_5;
+        if ("3.5.0".equals(codeString))
+          return _3_5_0;
+        if ("4.0".equals(codeString))
+          return _4_0;
+        if ("4.0.0".equals(codeString))
+          return _4_0_0;
+        if ("4.0.1".equals(codeString))
+          return _4_0_1;
+        if ("4.1".equals(codeString))
+          return _4_1;
+        if ("4.1.0".equals(codeString))
+          return _4_1_0;
+        if ("4.2".equals(codeString))
+          return _4_2;
+        if ("4.2.0".equals(codeString))
+          return _4_2_0;
+        if ("4.3".equals(codeString))
+          return _4_3;
+        if ("4.3.0".equals(codeString))
+          return _4_3_0;
+        if ("4.3.0-cibuild".equals(codeString))
+          return _4_3_0CIBUILD;
+        if ("4.3.0-snapshot1".equals(codeString))
+          return _4_3_0SNAPSHOT1;
+        if ("4.4".equals(codeString))
+          return _4_4;
+        if ("4.4.0".equals(codeString))
+          return _4_4_0;
+        if ("4.5".equals(codeString))
+          return _4_5;
+        if ("4.5.0".equals(codeString))
+          return _4_5_0;
+        if ("4.6".equals(codeString))
+          return _4_6;
+        if ("4.6.0".equals(codeString))
+          return _4_6_0;
+        if ("5.0".equals(codeString))
+          return _5_0;
+        if ("5.0.0".equals(codeString))
+          return _5_0_0;
+        if ("5.0.0-cibuild".equals(codeString))
+          return _5_0_0CIBUILD;
+        if ("5.0.0-snapshot1".equals(codeString))
+          return _5_0_0SNAPSHOT1;
+        if ("5.0.0-snapshot2".equals(codeString))
+          return _5_0_0SNAPSHOT2;
+        if ("5.0.0-ballot".equals(codeString))
+          return _5_0_0BALLOT;
+        if ("5.0.0-snapshot3".equals(codeString))
+          return _5_0_0SNAPSHOT3;
+        if ("5.0.0-draft-final".equals(codeString))
+          return _5_0_0DRAFTFINAL;
+        if ("6.0.0-cibuild".equals(codeString))
+          return _6_0_0CIBUILD;
+        if ("6.0.0".equals(codeString))
+          return _6_0_0;
+        if ("6.0.0-ballot1".equals(codeString))
+          return _6_0_0_BALLOT1;
+        if ("6.0.0-ballot2".equals(codeString))
+          return _6_0_0_BALLOT2;
+        throw new FHIRException("Unknown FHIRVersion code '"+codeString+"'");
+        }
+        public static boolean isValidCode(String codeString) {
+            if (codeString == null || "".equals(codeString))
+                return false;
+          return Utilities.existsInList(codeString, "0.01", "0.05", "0.06", "0.11", "0.0", "0.0.80", "0.0.81", "0.0.82", "0.4", "0.4.0", "0.5", "0.5.0", "1.0", "1.0.0", "1.0.1", "1.0.2", "1.1", "1.1.0", "1.4", "1.4.0", "1.6", "1.6.0", "1.8", "1.8.0", "3.0", "3.0.0", "3.0.1", "3.0.2", "3.3", "3.3.0", "3.5", "3.5.0", "4.0", "4.0.0", "4.0.1", "4.1", "4.1.0", "4.2", "4.2.0", "4.3", "4.3.0", "4.3.0-cibuild", "4.3.0-snapshot1", "4.4", "4.4.0", "4.5", "4.5.0", "4.6", "4.6.0", "5.0", "5.0.0", "5.0.0-cibuild", "5.0.0-snapshot1", "5.0.0-snapshot2", "5.0.0-ballot", "5.0.0-snapshot3", "5.0.0-draft-final");
+        }
+        public String toCode() {
+          switch (this) {
+            case _0_01: return "0.01";
+            case _0_05: return "0.05";
+            case _0_06: return "0.06";
+            case _0_11: return "0.11";
+            case _0_0: return "0.0";
+            case _0_0_80: return "0.0.80";
+            case _0_0_81: return "0.0.81";
+            case _0_0_82: return "0.0.82";
+            case _0_4: return "0.4";
+            case _0_4_0: return "0.4.0";
+            case _0_5: return "0.5";
+            case _0_5_0: return "0.5.0";
+            case _1_0: return "1.0";
+            case _1_0_0: return "1.0.0";
+            case _1_0_1: return "1.0.1";
+            case _1_0_2: return "1.0.2";
+            case _1_1: return "1.1";
+            case _1_1_0: return "1.1.0";
+            case _1_4: return "1.4";
+            case _1_4_0: return "1.4.0";
+            case _1_6: return "1.6";
+            case _1_6_0: return "1.6.0";
+            case _1_8: return "1.8";
+            case _1_8_0: return "1.8.0";
+            case _3_0: return "3.0";
+            case _3_0_0: return "3.0.0";
+            case _3_0_1: return "3.0.1";
+            case _3_0_2: return "3.0.2";
+            case _3_3: return "3.3";
+            case _3_3_0: return "3.3.0";
+            case _3_5: return "3.5";
+            case _3_5_0: return "3.5.0";
+            case _4_0: return "4.0";
+            case _4_0_0: return "4.0.0";
+            case _4_0_1: return "4.0.1";
+            case _4_1: return "4.1";
+            case _4_1_0: return "4.1.0";
+            case _4_2: return "4.2";
+            case _4_2_0: return "4.2.0";
+            case _4_3: return "4.3";
+            case _4_3_0: return "4.3.0";
+            case _4_3_0CIBUILD: return "4.3.0-cibuild";
+            case _4_3_0SNAPSHOT1: return "4.3.0-snapshot1";
+            case _4_4: return "4.4";
+            case _4_4_0: return "4.4.0";
+            case _4_5: return "4.5";
+            case _4_5_0: return "4.5.0";
+            case _4_6: return "4.6";
+            case _4_6_0: return "4.6.0";
+            case _5_0: return "5.0";
+            case _5_0_0: return "5.0.0";
+            case _5_0_0CIBUILD: return "5.0.0-cibuild";
+            case _5_0_0SNAPSHOT1: return "5.0.0-snapshot1";
+            case _5_0_0SNAPSHOT2: return "5.0.0-snapshot2";
+            case _5_0_0BALLOT: return "5.0.0-ballot";
+            case _5_0_0SNAPSHOT3: return "5.0.0-snapshot3";
+            case _5_0_0DRAFTFINAL: return "5.0.0-draft-final";
+            case _6_0_0CIBUILD: return "6.0.0-cibuild";
+            case _6_0_0: return "6.0.0";
+            case _6_0_0_BALLOT1: return "6.0.0-ballot1";
+            case _6_0_0_BALLOT2: return "6.0.0-ballot2";
+            case NULL: return null;
+            default: return "?";
+          }
+        }
+        public String getSystem() {
+          switch (this) {
+            case _0_01: return "http://hl7.org/fhir/FHIR-version";
+            case _0_05: return "http://hl7.org/fhir/FHIR-version";
+            case _0_06: return "http://hl7.org/fhir/FHIR-version";
+            case _0_11: return "http://hl7.org/fhir/FHIR-version";
+            case _0_0: return "http://hl7.org/fhir/FHIR-version";
+            case _0_0_80: return "http://hl7.org/fhir/FHIR-version";
+            case _0_0_81: return "http://hl7.org/fhir/FHIR-version";
+            case _0_0_82: return "http://hl7.org/fhir/FHIR-version";
+            case _0_4: return "http://hl7.org/fhir/FHIR-version";
+            case _0_4_0: return "http://hl7.org/fhir/FHIR-version";
+            case _0_5: return "http://hl7.org/fhir/FHIR-version";
+            case _0_5_0: return "http://hl7.org/fhir/FHIR-version";
+            case _1_0: return "http://hl7.org/fhir/FHIR-version";
+            case _1_0_0: return "http://hl7.org/fhir/FHIR-version";
+            case _1_0_1: return "http://hl7.org/fhir/FHIR-version";
+            case _1_0_2: return "http://hl7.org/fhir/FHIR-version";
+            case _1_1: return "http://hl7.org/fhir/FHIR-version";
+            case _1_1_0: return "http://hl7.org/fhir/FHIR-version";
+            case _1_4: return "http://hl7.org/fhir/FHIR-version";
+            case _1_4_0: return "http://hl7.org/fhir/FHIR-version";
+            case _1_6: return "http://hl7.org/fhir/FHIR-version";
+            case _1_6_0: return "http://hl7.org/fhir/FHIR-version";
+            case _1_8: return "http://hl7.org/fhir/FHIR-version";
+            case _1_8_0: return "http://hl7.org/fhir/FHIR-version";
+            case _3_0: return "http://hl7.org/fhir/FHIR-version";
+            case _3_0_0: return "http://hl7.org/fhir/FHIR-version";
+            case _3_0_1: return "http://hl7.org/fhir/FHIR-version";
+            case _3_0_2: return "http://hl7.org/fhir/FHIR-version";
+            case _3_3: return "http://hl7.org/fhir/FHIR-version";
+            case _3_3_0: return "http://hl7.org/fhir/FHIR-version";
+            case _3_5: return "http://hl7.org/fhir/FHIR-version";
+            case _3_5_0: return "http://hl7.org/fhir/FHIR-version";
+            case _4_0: return "http://hl7.org/fhir/FHIR-version";
+            case _4_0_0: return "http://hl7.org/fhir/FHIR-version";
+            case _4_0_1: return "http://hl7.org/fhir/FHIR-version";
+            case _4_1: return "http://hl7.org/fhir/FHIR-version";
+            case _4_1_0: return "http://hl7.org/fhir/FHIR-version";
+            case _4_2: return "http://hl7.org/fhir/FHIR-version";
+            case _4_2_0: return "http://hl7.org/fhir/FHIR-version";
+            case _4_3: return "http://hl7.org/fhir/FHIR-version";
+            case _4_3_0: return "http://hl7.org/fhir/FHIR-version";
+            case _4_3_0CIBUILD: return "http://hl7.org/fhir/FHIR-version";
+            case _4_3_0SNAPSHOT1: return "http://hl7.org/fhir/FHIR-version";
+            case _4_4: return "http://hl7.org/fhir/FHIR-version";
+            case _4_4_0: return "http://hl7.org/fhir/FHIR-version";
+            case _4_5: return "http://hl7.org/fhir/FHIR-version";
+            case _4_5_0: return "http://hl7.org/fhir/FHIR-version";
+            case _4_6: return "http://hl7.org/fhir/FHIR-version";
+            case _4_6_0: return "http://hl7.org/fhir/FHIR-version";
+            case _5_0: return "http://hl7.org/fhir/FHIR-version";
+            case _5_0_0: return "http://hl7.org/fhir/FHIR-version";
+            case _5_0_0CIBUILD: return "http://hl7.org/fhir/FHIR-version";
+            case _5_0_0SNAPSHOT1: return "http://hl7.org/fhir/FHIR-version";
+            case _5_0_0SNAPSHOT2: return "http://hl7.org/fhir/FHIR-version";
+            case _5_0_0BALLOT: return "http://hl7.org/fhir/FHIR-version";
+            case _5_0_0SNAPSHOT3: return "http://hl7.org/fhir/FHIR-version";
+            case _5_0_0DRAFTFINAL: return "http://hl7.org/fhir/FHIR-version";
+            case _6_0_0CIBUILD: return "http://hl7.org/fhir/FHIR-version";
+            case _6_0_0: return "http://hl7.org/fhir/FHIR-version";
+            case _6_0_0_BALLOT1: return "http://hl7.org/fhir/FHIR-version";
+            case NULL: return null;
+            default: return "?";
+          }
+        }
+        public String getDefinition() {
+          switch (this) {
+            case _0_01: return "Oldest archived version of FHIR.";
+            case _0_05: return "1st Draft for Comment (Sept 2012 Ballot).";
+            case _0_06: return "2nd Draft for Comment (January 2013 Ballot).";
+            case _0_11: return "DSTU 1 Ballot version.";
+            case _0_0: return "DSTU 1 version.";
+            case _0_0_80: return "DSTU 1 Official version.";
+            case _0_0_81: return "DSTU 1 Official version Technical Errata #1.";
+            case _0_0_82: return "DSTU 1 Official version Technical Errata #2.";
+            case _0_4: return "January 2015 Ballot.";
+            case _0_4_0: return "Draft For Comment (January 2015 Ballot).";
+            case _0_5: return "May 2015 Ballot.";
+            case _0_5_0: return "DSTU 2 Ballot version (May 2015 Ballot).";
+            case _1_0: return "DSTU 2 version.";
+            case _1_0_0: return "DSTU 2 QA Preview + CQIF Ballot (Sep 2015).";
+            case _1_0_1: return "DSTU 2 (Official version).";
+            case _1_0_2: return "DSTU 2 (Official version) with 1 technical errata.";
+            case _1_1: return "GAO Ballot version.";
+            case _1_1_0: return "GAO Ballot + draft changes to main FHIR standard.";
+            case _1_4: return "Connectathon 12 (Montreal) version.";
+            case _1_4_0: return "CQF on FHIR Ballot + Connectathon 12 (Montreal).";
+            case _1_6: return "Connectathon 13 (Baltimore) version.";
+            case _1_6_0: return "FHIR STU3 Ballot + Connectathon 13 (Baltimore).";
+            case _1_8: return "Connectathon 14 (San Antonio) version.";
+            case _1_8_0: return "FHIR STU3 Candidate + Connectathon 14 (San Antonio).";
+            case _3_0: return "STU3 version.";
+            case _3_0_0: return "FHIR Release 3 (STU).";
+            case _3_0_1: return "FHIR Release 3 (STU) with 1 technical errata.";
+            case _3_0_2: return "FHIR Release 3 (STU) with 2 technical errata.";
+            case _3_3: return "R4 Ballot #1 version.";
+            case _3_3_0: return "R4 Ballot #1 + Connectaton 18 (Cologne).";
+            case _3_5: return "R4 Ballot #2 version.";
+            case _3_5_0: return "R4 Ballot #2 + Connectathon 19 (Baltimore).";
+            case _4_0: return "R4 version.";
+            case _4_0_0: return "FHIR Release 4 (Normative + STU).";
+            case _4_0_1: return "FHIR Release 4 (Normative + STU) with 1 technical errata.";
+            case _4_1: return "R4B Ballot #1 version.";
+            case _4_1_0: return "R4B Ballot #1 + Connectathon 27 (Virtual).";
+            case _4_2: return "R5 Preview #1 version.";
+            case _4_2_0: return "R5 Preview #1 + Connectathon 23 (Sydney).";
+            case _4_3: return "R4B version.";
+            case _4_3_0: return "FHIR Release 4B (Normative + STU).";
+            case _4_3_0CIBUILD: return "FHIR Release 4B CI-Builld.";
+            case _4_3_0SNAPSHOT1: return "FHIR Release 4B Snapshot #1.";
+            case _4_4: return "R5 Preview #2 version.";
+            case _4_4_0: return "R5 Preview #2 + Connectathon 24 (Virtual).";
+            case _4_5: return "R5 Preview #3 version.";
+            case _4_5_0: return "R5 Preview #3 + Connectathon 25 (Virtual).";
+            case _4_6: return "R5 Draft Ballot version.";
+            case _4_6_0: return "R5 Draft Ballot + Connectathon 27 (Virtual).";
+            case _5_0: return "R5 Versions.";
+            case _5_0_0: return "R5 Final Version.";
+            case _5_0_0CIBUILD: return "R5 Rolling ci-build.";
+            case _5_0_0SNAPSHOT1: return "R5 Preview #2.";
+            case _5_0_0SNAPSHOT2: return "R5 Interim tooling stage.";
+            case _5_0_0BALLOT: return "R5 Ballot.";
+            case _5_0_0SNAPSHOT3: return "R5 January 2023 Staging Release + Connectathon 32.";
+            case _5_0_0DRAFTFINAL: return "R5 Final QA.";
+            case _6_0_0CIBUILD: return "R6 Rolling ci-build.";
+            case _6_0_0: return "R6 Final Version.";
+            case _6_0_0_BALLOT1: return "R6 Ballot #1.";
+            case NULL: return null;
+            default: return "?";
+          }
+        }
+        public String getDisplay() {
+          switch (this) {
+            case _0_01: return "0.01";
+            case _0_05: return "0.05";
+            case _0_06: return "0.06";
+            case _0_11: return "0.11";
+            case _0_0: return "0.0";
+            case _0_0_80: return "0.0.80";
+            case _0_0_81: return "0.0.81";
+            case _0_0_82: return "0.0.82";
+            case _0_4: return "0.4";
+            case _0_4_0: return "0.4.0";
+            case _0_5: return "0.5";
+            case _0_5_0: return "0.5.0";
+            case _1_0: return "1.0";
+            case _1_0_0: return "1.0.0";
+            case _1_0_1: return "1.0.1";
+            case _1_0_2: return "1.0.2";
+            case _1_1: return "1.1";
+            case _1_1_0: return "1.1.0";
+            case _1_4: return "1.4";
+            case _1_4_0: return "1.4.0";
+            case _1_6: return "1.6";
+            case _1_6_0: return "1.6.0";
+            case _1_8: return "1.8";
+            case _1_8_0: return "1.8.0";
+            case _3_0: return "3.0";
+            case _3_0_0: return "3.0.0";
+            case _3_0_1: return "3.0.1";
+            case _3_0_2: return "3.0.2";
+            case _3_3: return "3.3";
+            case _3_3_0: return "3.3.0";
+            case _3_5: return "3.5";
+            case _3_5_0: return "3.5.0";
+            case _4_0: return "4.0";
+            case _4_0_0: return "4.0.0";
+            case _4_0_1: return "4.0.1";
+            case _4_1: return "4.1";
+            case _4_1_0: return "4.1.0";
+            case _4_2: return "4.2";
+            case _4_2_0: return "4.2.0";
+            case _4_3: return "4.3";
+            case _4_3_0: return "4.3.0";
+            case _4_3_0CIBUILD: return "4.3.0-cibuild";
+            case _4_3_0SNAPSHOT1: return "4.3.0-snapshot1";
+            case _4_4: return "4.4";
+            case _4_4_0: return "4.4.0";
+            case _4_5: return "4.5";
+            case _4_5_0: return "4.5.0";
+            case _4_6: return "4.6";
+            case _4_6_0: return "4.6.0";
+            case _5_0: return "5.0";
+            case _5_0_0: return "5.0.0";
+            case _5_0_0CIBUILD: return "5.0.0-cibuild";
+            case _5_0_0SNAPSHOT1: return "5.0.0-snapshot1";
+            case _5_0_0SNAPSHOT2: return "5.0.0-snapshot2";
+            case _5_0_0BALLOT: return "5.0.0-ballot";
+            case _5_0_0SNAPSHOT3: return "5.0.0-snapshot3";
+            case _5_0_0DRAFTFINAL: return "5.0.0-draft-final";
+            case _6_0_0CIBUILD: return "6.0.0-cibuild";
+            case _6_0_0: return "6.0.0";
+            case _6_0_0_BALLOT1: return "6.0.0-ballot1";
+            case _6_0_0_BALLOT2: return "6.0.0-ballot2";
+            case NULL: return null;
+            default: return "?";
+          }
+        }
+// manual code from configuration.txt:
+//public String toCode(int len) {
+//          return toCode().substring(0, len);
+//        }
+//
+//     
+//        @Override
+//        public String toString() {
+//          return toCode();
+//        }
+//        
+//        
+//        public boolean isR4B() {
+//          return toCode().startsWith("4.1");
+//        }
+//        
+// end addition
     }
 
-    public static boolean isValidCode(String codeString) {
-      if (codeString == null || "".equals(codeString))
-        return false;
-      if ("0.01".equals(codeString))
-        return true;
-      if ("0.05".equals(codeString))
-        return true;
-      if ("0.06".equals(codeString))
-        return true;
-      if ("0.11".equals(codeString))
-        return true;
-      if ("0.0".equals(codeString))
-        return true;
-      if ("0.0.80".equals(codeString))
-        return true;
-      if ("0.0.81".equals(codeString))
-        return true;
-      if ("0.0.82".equals(codeString))
-        return true;
-      if ("0.4".equals(codeString))
-        return true;
-      if ("0.4.0".equals(codeString))
-        return true;
-      if ("0.5".equals(codeString))
-        return true;
-      if ("0.5.0".equals(codeString))
-        return true;
-      if ("1.0".equals(codeString))
-        return true;
-      if ("1.0.0".equals(codeString))
-        return true;
-      if ("1.0.1".equals(codeString))
-        return true;
-      if ("1.0.2".equals(codeString))
-        return true;
-      if ("1.1".equals(codeString))
-        return true;
-      if ("1.1.0".equals(codeString))
-        return true;
-      if ("1.4".equals(codeString))
-        return true;
-      if ("1.4.0".equals(codeString))
-        return true;
-      if ("1.6".equals(codeString))
-        return true;
-      if ("1.6.0".equals(codeString))
-        return true;
-      if ("1.8".equals(codeString))
-        return true;
-      if ("1.8.0".equals(codeString))
-        return true;
-      if ("3.0".equals(codeString))
-        return true;
-      if ("3.0.0".equals(codeString))
-        return true;
-      if ("3.0.1".equals(codeString))
-        return true;
-      if ("3.0.2".equals(codeString))
-        return true;
-      if ("3.3".equals(codeString))
-        return true;
-      if ("3.3.0".equals(codeString))
-        return true;
-      if ("3.5".equals(codeString))
-        return true;
-      if ("3.5.0".equals(codeString))
-        return true;
-      if ("4.0".equals(codeString))
-        return true;
-      if ("4.0.0".equals(codeString))
-        return true;
-      if ("4.0.1".equals(codeString))
-        return true;
-      if ("4.1".equals(codeString))
-        return true;
-      if ("4.1.0".equals(codeString))
-        return true;
-      if ("4.2".equals(codeString))
-        return true;
-      if ("4.2.0".equals(codeString))
-        return true;
-      if ("4.3".equals(codeString))
-        return true;
-      if ("4.3.0".equals(codeString))
-        return true;
-      if ("4.4".equals(codeString))
-        return true;
-      if ("4.4.0".equals(codeString))
-        return true;
-      if ("4.5".equals(codeString))
-        return true;
-      if ("4.5.0".equals(codeString))
-        return true;
-      if ("4.6".equals(codeString))
-        return true;
-      if ("4.6.0".equals(codeString))
-        return true;
-      if ("5.0".equals(codeString))
-        return true;
-      if ("5.0.0".equals(codeString))
-        return true;
-      if ("5.0.0-cibuild".equals(codeString))
-        return true;
-      if ("5.0.0-snapshot1".equals(codeString))
-        return true;
-      if ("5.0.0-snapshot2".equals(codeString))
-        return true;
-      if ("5.0.0-ballot".equals(codeString))
-        return true;
-      return false;
-    }
-
-    public String toCode() {
-      switch (this) {
-      case _0_01:
-        return "0.01";
-      case _0_05:
-        return "0.05";
-      case _0_06:
-        return "0.06";
-      case _0_11:
-        return "0.11";
-      case _0_0:
-        return "0.0";
-      case _0_0_80:
-        return "0.0.80";
-      case _0_0_81:
-        return "0.0.81";
-      case _0_0_82:
-        return "0.0.82";
-      case _0_4:
-        return "0.4";
-      case _0_4_0:
-        return "0.4.0";
-      case _0_5:
-        return "0.5";
-      case _0_5_0:
-        return "0.5.0";
-      case _1_0:
-        return "1.0";
-      case _1_0_0:
-        return "1.0.0";
-      case _1_0_1:
-        return "1.0.1";
-      case _1_0_2:
-        return "1.0.2";
-      case _1_1:
-        return "1.1";
-      case _1_1_0:
-        return "1.1.0";
-      case _1_4:
-        return "1.4";
-      case _1_4_0:
-        return "1.4.0";
-      case _1_6:
-        return "1.6";
-      case _1_6_0:
-        return "1.6.0";
-      case _1_8:
-        return "1.8";
-      case _1_8_0:
-        return "1.8.0";
-      case _3_0:
-        return "3.0";
-      case _3_0_0:
-        return "3.0.0";
-      case _3_0_1:
-        return "3.0.1";
-      case _3_0_2:
-        return "3.0.2";
-      case _3_3:
-        return "3.3";
-      case _3_3_0:
-        return "3.3.0";
-      case _3_5:
-        return "3.5";
-      case _3_5_0:
-        return "3.5.0";
-      case _4_0:
-        return "4.0";
-      case _4_0_0:
-        return "4.0.0";
-      case _4_0_1:
-        return "4.0.1";
-      case _4_1:
-        return "4.1";
-      case _4_1_0:
-        return "4.1.0";
-      case _4_2:
-        return "4.2";
-      case _4_2_0:
-        return "4.2.0";
-      case _4_3:
-        return "4.3";
-      case _4_3_0:
-        return "4.3.0";
-      case _4_3_0_SNAPSHOT1:
-        return "4.3.0-snapshot1";
-      case _4_3_0_CIBUILD:
-        return "4.3.0-cibuild";
-      case _4_4:
-        return "4.4";
-      case _4_4_0:
-        return "4.4.0";
-      case _4_5:
-        return "4.5";
-      case _4_5_0:
-        return "4.5.0";
-      case _4_6:
-        return "4.6";
-      case _4_6_0:
-        return "4.6.0";
-      case _5_0:
-        return "5.0";
-      case _5_0_0:
-        return "5.0.0";
-      case _5_0_0CIBUILD:
-        return "5.0.0-cibuild";
-      case _5_0_0SNAPSHOT1:
-        return "5.0.0-snapshot1";
-      case _5_0_0SNAPSHOT2:
-        return "5.0.0-snapshot2";
-      case _5_0_0BALLOT:
-        return "5.0.0-ballot";
-      case _5_0_0SNAPSHOT3:
-        return "5.0.0-snapshot3";
-      case _5_0_0DRAFTFINAL:
-        return "5.0.0-draft-final";
-      case NULL:
-        return null;
-      default:
-        return "?";
-      }
-    }
-
-    public String getSystem() {
-      switch (this) {
-      case _0_01:
-        return "http://hl7.org/fhir/FHIR-version";
-      case _0_05:
-        return "http://hl7.org/fhir/FHIR-version";
-      case _0_06:
-        return "http://hl7.org/fhir/FHIR-version";
-      case _0_11:
-        return "http://hl7.org/fhir/FHIR-version";
-      case _0_0:
-        return "http://hl7.org/fhir/FHIR-version";
-      case _0_0_80:
-        return "http://hl7.org/fhir/FHIR-version";
-      case _0_0_81:
-        return "http://hl7.org/fhir/FHIR-version";
-      case _0_0_82:
-        return "http://hl7.org/fhir/FHIR-version";
-      case _0_4:
-        return "http://hl7.org/fhir/FHIR-version";
-      case _0_4_0:
-        return "http://hl7.org/fhir/FHIR-version";
-      case _0_5:
-        return "http://hl7.org/fhir/FHIR-version";
-      case _0_5_0:
-        return "http://hl7.org/fhir/FHIR-version";
-      case _1_0:
-        return "http://hl7.org/fhir/FHIR-version";
-      case _1_0_0:
-        return "http://hl7.org/fhir/FHIR-version";
-      case _1_0_1:
-        return "http://hl7.org/fhir/FHIR-version";
-      case _1_0_2:
-        return "http://hl7.org/fhir/FHIR-version";
-      case _1_1:
-        return "http://hl7.org/fhir/FHIR-version";
-      case _1_1_0:
-        return "http://hl7.org/fhir/FHIR-version";
-      case _1_4:
-        return "http://hl7.org/fhir/FHIR-version";
-      case _1_4_0:
-        return "http://hl7.org/fhir/FHIR-version";
-      case _1_6:
-        return "http://hl7.org/fhir/FHIR-version";
-      case _1_6_0:
-        return "http://hl7.org/fhir/FHIR-version";
-      case _1_8:
-        return "http://hl7.org/fhir/FHIR-version";
-      case _1_8_0:
-        return "http://hl7.org/fhir/FHIR-version";
-      case _3_0:
-        return "http://hl7.org/fhir/FHIR-version";
-      case _3_0_0:
-        return "http://hl7.org/fhir/FHIR-version";
-      case _3_0_1:
-        return "http://hl7.org/fhir/FHIR-version";
-      case _3_0_2:
-        return "http://hl7.org/fhir/FHIR-version";
-      case _3_3:
-        return "http://hl7.org/fhir/FHIR-version";
-      case _3_3_0:
-        return "http://hl7.org/fhir/FHIR-version";
-      case _3_5:
-        return "http://hl7.org/fhir/FHIR-version";
-      case _3_5_0:
-        return "http://hl7.org/fhir/FHIR-version";
-      case _4_0:
-        return "http://hl7.org/fhir/FHIR-version";
-      case _4_0_0:
-        return "http://hl7.org/fhir/FHIR-version";
-      case _4_0_1:
-        return "http://hl7.org/fhir/FHIR-version";
-      case _4_1:
-        return "http://hl7.org/fhir/FHIR-version";
-      case _4_1_0:
-        return "http://hl7.org/fhir/FHIR-version";
-      case _4_2:
-        return "http://hl7.org/fhir/FHIR-version";
-      case _4_2_0:
-        return "http://hl7.org/fhir/FHIR-version";
-      case _4_3:
-        return "http://hl7.org/fhir/FHIR-version";
-      case _4_3_0:
-        return "http://hl7.org/fhir/FHIR-version";
-      case _4_3_0_SNAPSHOT1:
-        return "http://hl7.org/fhir/FHIR-version";
-      case _4_3_0_CIBUILD:
-        return "http://hl7.org/fhir/FHIR-version";
-      case _4_4:
-        return "http://hl7.org/fhir/FHIR-version";
-      case _4_4_0:
-        return "http://hl7.org/fhir/FHIR-version";
-      case _4_5:
-        return "http://hl7.org/fhir/FHIR-version";
-      case _4_5_0:
-        return "http://hl7.org/fhir/FHIR-version";
-      case _4_6:
-        return "http://hl7.org/fhir/FHIR-version";
-      case _4_6_0:
-        return "http://hl7.org/fhir/FHIR-version";
-      case _5_0:
-        return "http://hl7.org/fhir/FHIR-version";
-      case _5_0_0:
-        return "http://hl7.org/fhir/FHIR-version";
-      case _5_0_0CIBUILD:
-        return "http://hl7.org/fhir/FHIR-version";
-      case _5_0_0SNAPSHOT1:
-        return "http://hl7.org/fhir/FHIR-version";
-      case _5_0_0SNAPSHOT2:
-        return "http://hl7.org/fhir/FHIR-version";
-      case _5_0_0BALLOT:
-        return "http://hl7.org/fhir/FHIR-version";
-      case _5_0_0SNAPSHOT3:
-        return "http://hl7.org/fhir/FHIR-version";
-      case _5_0_0DRAFTFINAL:
-        return "http://hl7.org/fhir/FHIR-version";
-      case NULL:
-        return null;
-      default:
-        return "?";
-      }
-    }
-
-    public String getDefinition() {
-      switch (this) {
-      case _0_01:
-        return "Oldest archived version of FHIR.";
-      case _0_05:
-        return "1st Draft for Comment (Sept 2012 Ballot).";
-      case _0_06:
-        return "2nd Draft for Comment (January 2013 Ballot).";
-      case _0_11:
-        return "DSTU 1 Ballot version.";
-      case _0_0:
-        return "DSTU 1 version.";
-      case _0_0_80:
-        return "DSTU 1 Official version.";
-      case _0_0_81:
-        return "DSTU 1 Official version Technical Errata #1.";
-      case _0_0_82:
-        return "DSTU 1 Official version Technical Errata #2.";
-      case _0_4:
-        return "January 2015 Ballot.";
-      case _0_4_0:
-        return "Draft For Comment (January 2015 Ballot).";
-      case _0_5:
-        return "May 2015 Ballot.";
-      case _0_5_0:
-        return "DSTU 2 Ballot version (May 2015 Ballot).";
-      case _1_0:
-        return "DSTU 2 version.";
-      case _1_0_0:
-        return "DSTU 2 QA Preview + CQIF Ballot (Sep 2015).";
-      case _1_0_1:
-        return "DSTU 2 (Official version).";
-      case _1_0_2:
-        return "DSTU 2 (Official version) with 1 technical errata.";
-      case _1_1:
-        return "GAO Ballot version.";
-      case _1_1_0:
-        return "GAO Ballot + draft changes to main FHIR standard.";
-      case _1_4:
-        return "Connectathon 12 (Montreal) version.";
-      case _1_4_0:
-        return "CQF on FHIR Ballot + Connectathon 12 (Montreal).";
-      case _1_6:
-        return "Connectathon 13 (Baltimore) version.";
-      case _1_6_0:
-        return "FHIR STU3 Ballot + Connectathon 13 (Baltimore).";
-      case _1_8:
-        return "Connectathon 14 (San Antonio) version.";
-      case _1_8_0:
-        return "FHIR STU3 Candidate + Connectathon 14 (San Antonio).";
-      case _3_0:
-        return "STU3 version.";
-      case _3_0_0:
-        return "FHIR Release 3 (STU).";
-      case _3_0_1:
-        return "FHIR Release 3 (STU) with 1 technical errata.";
-      case _3_0_2:
-        return "FHIR Release 3 (STU) with 2 technical errata.";
-      case _3_3:
-        return "R4 Ballot #1 version.";
-      case _3_3_0:
-        return "R4 Ballot #1 + Connectaton 18 (Cologne).";
-      case _3_5:
-        return "R4 Ballot #2 version.";
-      case _3_5_0:
-        return "R4 Ballot #2 + Connectathon 19 (Baltimore).";
-      case _4_0:
-        return "R4 version.";
-      case _4_0_0:
-        return "FHIR Release 4 (Normative + STU).";
-      case _4_0_1:
-        return "FHIR Release 4 (Normative + STU) with 1 technical errata.";
-      case _4_1:
-        return "R4B Ballot #1 version.";
-      case _4_1_0:
-        return "R4B Ballot #1 + Connectathon 27 (Virtual).";
-      case _4_2:
-        return "R5 Preview #1 version.";
-      case _4_2_0:
-        return "R5 Preview #1 + Connectathon 23 (Sydney).";
-      case _4_3_0_SNAPSHOT1:
-        return "FHIR Release 4B Snapshot #1";
-      case _4_3_0_CIBUILD:
-        return "FHIR Release 4B CI-Builld";
-      case _4_3:
-        return "R4B version.";
-      case _4_3_0:
-        return "FHIR Release 4B (Normative + STU).";
-      case _4_4:
-        return "R5 Preview #2 version.";
-      case _4_4_0:
-        return "R5 Preview #2 + Connectathon 24 (Virtual).";
-      case _4_5:
-        return "R5 Preview #3 version.";
-      case _4_5_0:
-        return "R5 Preview #3 + Connectathon 25 (Virtual).";
-      case _4_6:
-        return "R5 Draft Ballot version.";
-      case _4_6_0:
-        return "R5 Draft Ballot + Connectathon 27 (Virtual).";
-      case _5_0:
-        return "R5 Versions.";
-      case _5_0_0:
-        return "R5 Final Version.";
-      case _5_0_0CIBUILD:
-        return "R5 Rolling ci-build.";
-      case _5_0_0SNAPSHOT1:
-        return "R5 Preview #2.";
-      case _5_0_0SNAPSHOT2:
-        return "R5 Interim tooling stage.";
-      case _5_0_0BALLOT:
-        return "R5 Ballot.";
-      case _5_0_0SNAPSHOT3:
-        return "R5 Connectathon 32 release.";
-      case _5_0_0DRAFTFINAL:
-        return "R5 Final QA.";
-      case NULL:
-        return null;
-      default:
-        return "?";
-      }
-    }
-
-    public String getDisplay() {
-      switch (this) {
-      case _0_01:
-        return "0.01";
-      case _0_05:
-        return "0.05";
-      case _0_06:
-        return "0.06";
-      case _0_11:
-        return "0.11";
-      case _0_0:
-        return "0.0";
-      case _0_0_80:
-        return "0.0.80";
-      case _0_0_81:
-        return "0.0.81";
-      case _0_0_82:
-        return "0.0.82";
-      case _0_4:
-        return "0.4";
-      case _0_4_0:
-        return "0.4.0";
-      case _0_5:
-        return "0.5";
-      case _0_5_0:
-        return "0.5.0";
-      case _1_0:
-        return "1.0";
-      case _1_0_0:
-        return "1.0.0";
-      case _1_0_1:
-        return "1.0.1";
-      case _1_0_2:
-        return "1.0.2";
-      case _1_1:
-        return "1.1";
-      case _1_1_0:
-        return "1.1.0";
-      case _1_4:
-        return "1.4";
-      case _1_4_0:
-        return "1.4.0";
-      case _1_6:
-        return "1.6";
-      case _1_6_0:
-        return "1.6.0";
-      case _1_8:
-        return "1.8";
-      case _1_8_0:
-        return "1.8.0";
-      case _3_0:
-        return "3.0";
-      case _3_0_0:
-        return "3.0.0";
-      case _3_0_1:
-        return "3.0.1";
-      case _3_0_2:
-        return "3.0.2";
-      case _3_3:
-        return "3.3";
-      case _3_3_0:
-        return "3.3.0";
-      case _3_5:
-        return "3.5";
-      case _3_5_0:
-        return "3.5.0";
-      case _4_0:
-        return "4.0";
-      case _4_0_0:
-        return "4.0.0";
-      case _4_0_1:
-        return "4.0.1";
-      case _4_1:
-        return "4.1";
-      case _4_1_0:
-        return "4.1.0";
-      case _4_2:
-        return "4.2";
-      case _4_2_0:
-        return "4.2.0";
-      case _4_3:
-        return "4.3";
-      case _4_3_0:
-        return "4.3.0";
-      case _4_3_0_SNAPSHOT1:
-        return "4.3.0-snapshot";
-      case _4_3_0_CIBUILD:
-        return "4.3.0-cibuild";
-      case _4_4:
-        return "4.4";
-      case _4_4_0:
-        return "4.4.0";
-      case _4_5:
-        return "4.5";
-      case _4_5_0:
-        return "4.5.0";
-      case _4_6:
-        return "4.6";
-      case _4_6_0:
-        return "4.6.0";
-      case _5_0:
-        return "5.0";
-      case _5_0_0:
-        return "5.0.0";
-      case _5_0_0CIBUILD:
-        return "5.0.0-cibuild";
-      case _5_0_0SNAPSHOT1:
-        return "5.0.0-snapshot1";
-      case _5_0_0SNAPSHOT2:
-        return "5.0.0-snapshot2";
-      case _5_0_0BALLOT:
-        return "5.0.0-ballot";
-      case _5_0_0SNAPSHOT3:
-        return "5.0.0-snapshot3";
-      case _5_0_0DRAFTFINAL:
-        return "5.0.0-draft-final";
-      case NULL:
-        return null;
-      default:
-        return "?";
-      }
-    }
-  }
-
   public static class FHIRVersionEnumFactory implements EnumFactory<FHIRVersion> {
     public FHIRVersion fromCode(String codeString) throws IllegalArgumentException {
       if (codeString == null || "".equals(codeString))
-        if (codeString == null || "".equals(codeString))
-          return null;
-      if ("0.01".equals(codeString))
-        return FHIRVersion._0_01;
-      if ("0.05".equals(codeString))
-        return FHIRVersion._0_05;
-      if ("0.06".equals(codeString))
-        return FHIRVersion._0_06;
-      if ("0.11".equals(codeString))
-        return FHIRVersion._0_11;
-      if ("0.0.80".equals(codeString))
-        return FHIRVersion._0_0_80;
-      if ("0.0.81".equals(codeString))
-        return FHIRVersion._0_0_81;
-      if ("0.0.82".equals(codeString))
-        return FHIRVersion._0_0_82;
-      if ("0.4.0".equals(codeString))
-        return FHIRVersion._0_4_0;
-      if ("0.5".equals(codeString))
-        return FHIRVersion._0_5;
-      if ("0.5.0".equals(codeString))
-        return FHIRVersion._0_5_0;
-      if ("1.0".equals(codeString))
-        return FHIRVersion._1_0;
-      if ("1.0.0".equals(codeString))
-        return FHIRVersion._1_0_0;
-      if ("1.0.1".equals(codeString))
-        return FHIRVersion._1_0_1;
-      if ("1.0.2".equals(codeString))
-        return FHIRVersion._1_0_2;
-      if ("1.1".equals(codeString))
-        return FHIRVersion._1_1;
-      if ("1.1.0".equals(codeString))
-        return FHIRVersion._1_1_0;
-      if ("1.4".equals(codeString))
-        return FHIRVersion._1_4;
-      if ("1.4.0".equals(codeString))
-        return FHIRVersion._1_4_0;
-      if ("1.6".equals(codeString))
-        return FHIRVersion._1_6;
-      if ("1.6.0".equals(codeString))
-        return FHIRVersion._1_6_0;
-      if ("1.8".equals(codeString))
-        return FHIRVersion._1_8;
-      if ("1.8.0".equals(codeString))
-        return FHIRVersion._1_8_0;
-      if ("3.0".equals(codeString))
-        return FHIRVersion._3_0;
-      if ("3.0.0".equals(codeString))
-        return FHIRVersion._3_0_0;
-      if ("3.0.1".equals(codeString))
-        return FHIRVersion._3_0_1;
-      if ("3.0.2".equals(codeString))
-        return FHIRVersion._3_0_2;
-      if ("3.3".equals(codeString))
-        return FHIRVersion._3_3;
-      if ("3.3.0".equals(codeString))
-        return FHIRVersion._3_3_0;
-      if ("3.5".equals(codeString))
-        return FHIRVersion._3_5;
-      if ("3.5.0".equals(codeString))
-        return FHIRVersion._3_5_0;
-      if ("4.0".equals(codeString))
-        return FHIRVersion._4_0;
-      if ("4.0.0".equals(codeString))
-        return FHIRVersion._4_0_0;
-      if ("4.0.1".equals(codeString))
-        return FHIRVersion._4_0_1;
-      if ("4.1".equals(codeString))
-        return FHIRVersion._4_1;
-      if ("4.1.0".equals(codeString))
-        return FHIRVersion._4_1_0;
-      if ("4.2".equals(codeString))
-        return FHIRVersion._4_2;
-      if ("4.2.0".equals(codeString))
-        return FHIRVersion._4_2_0;
-      if ("4.3".equals(codeString))
-        return FHIRVersion._4_3;
-      if ("4.3.0".equals(codeString))
-        return FHIRVersion._4_3_0;
-      if ("4.3.0-snapshot1".equalsIgnoreCase(codeString))
-        return FHIRVersion._4_3_0_SNAPSHOT1;
-      if ("4.3.0-cibuild".equalsIgnoreCase(codeString))
-        return FHIRVersion._4_3_0_CIBUILD;
-      if ("4.4".equals(codeString))
-        return FHIRVersion._4_4;
-      if ("4.4.0".equals(codeString))
-        return FHIRVersion._4_4_0;
-      if ("4.5".equals(codeString))
-        return FHIRVersion._4_5;
-      if ("4.5.0".equals(codeString))
-        return FHIRVersion._4_5_0;
-      if ("4.6".equals(codeString))
-        return FHIRVersion._4_6;
-      if ("4.6.0".equals(codeString))
-        return FHIRVersion._4_6_0;
-      if ("5.0".equals(codeString))
-        return FHIRVersion._5_0;
-      if ("5.0.0".equals(codeString))
-        return FHIRVersion._5_0_0;
-      if ("5.0.0-cibuild".equals(codeString))
-        return FHIRVersion._5_0_0CIBUILD;
-      if ("5.0.0-snapshot1".equals(codeString))
-        return FHIRVersion._5_0_0SNAPSHOT1;
-      if ("5.0.0-snapshot2".equals(codeString))
-        return FHIRVersion._5_0_0SNAPSHOT2;
-      if ("5.0.0-ballot".equals(codeString))
-        return FHIRVersion._5_0_0BALLOT;
-      if ("5.0.0-snapshot3".equals(codeString))
-        return FHIRVersion._5_0_0SNAPSHOT3;
-      if ("5.0.0-draft-final".equals(codeString))
-        return FHIRVersion._5_0_0DRAFTFINAL;
-      throw new IllegalArgumentException("Unknown FHIRVersion code '" + codeString + "'");
-    }
-
-    public Enumeration<FHIRVersion> fromType(PrimitiveType<?> code) throws FHIRException {
-      if (code == null)
-        return null;
-      if (code.isEmpty())
-        return new Enumeration<FHIRVersion>(this, FHIRVersion.NULL, code);
-      String codeString = code.asStringValue();
-      if (codeString == null || "".equals(codeString))
-        return new Enumeration<FHIRVersion>(this, FHIRVersion.NULL, code);
-      if ("0.01".equals(codeString))
-        return new Enumeration<FHIRVersion>(this, FHIRVersion._0_01, code);
-      if ("0.05".equals(codeString))
-        return new Enumeration<FHIRVersion>(this, FHIRVersion._0_05, code);
-      if ("0.06".equals(codeString))
-        return new Enumeration<FHIRVersion>(this, FHIRVersion._0_06, code);
-      if ("0.11".equals(codeString))
-        return new Enumeration<FHIRVersion>(this, FHIRVersion._0_11, code);
-      if ("0.0".equals(codeString))
-        return new Enumeration<FHIRVersion>(this, FHIRVersion._0_0, code);
-      if ("0.0.80".equals(codeString))
-        return new Enumeration<FHIRVersion>(this, FHIRVersion._0_0_80, code);
-      if ("0.0.81".equals(codeString))
-        return new Enumeration<FHIRVersion>(this, FHIRVersion._0_0_81, code);
-      if ("0.0.82".equals(codeString))
-        return new Enumeration<FHIRVersion>(this, FHIRVersion._0_0_82, code);
-      if ("0.4".equals(codeString))
-        return new Enumeration<FHIRVersion>(this, FHIRVersion._0_4, code);
-      if ("0.4.0".equals(codeString))
-        return new Enumeration<FHIRVersion>(this, FHIRVersion._0_4_0, code);
-      if ("0.5".equals(codeString))
-        return new Enumeration<FHIRVersion>(this, FHIRVersion._0_5, code);
-      if ("0.5.0".equals(codeString))
-        return new Enumeration<FHIRVersion>(this, FHIRVersion._0_5_0, code);
-      if ("1.0".equals(codeString))
-        return new Enumeration<FHIRVersion>(this, FHIRVersion._1_0, code);
-      if ("1.0.0".equals(codeString))
-        return new Enumeration<FHIRVersion>(this, FHIRVersion._1_0_0, code);
-      if ("1.0.1".equals(codeString))
-        return new Enumeration<FHIRVersion>(this, FHIRVersion._1_0_1, code);
-      if ("1.0.2".equals(codeString))
-        return new Enumeration<FHIRVersion>(this, FHIRVersion._1_0_2, code);
-      if ("1.1".equals(codeString))
-        return new Enumeration<FHIRVersion>(this, FHIRVersion._1_1, code);
-      if ("1.1.0".equals(codeString))
-        return new Enumeration<FHIRVersion>(this, FHIRVersion._1_1_0, code);
-      if ("1.4".equals(codeString))
-        return new Enumeration<FHIRVersion>(this, FHIRVersion._1_4, code);
-      if ("1.4.0".equals(codeString))
-        return new Enumeration<FHIRVersion>(this, FHIRVersion._1_4_0, code);
-      if ("1.6".equals(codeString))
-        return new Enumeration<FHIRVersion>(this, FHIRVersion._1_6, code);
-      if ("1.6.0".equals(codeString))
-        return new Enumeration<FHIRVersion>(this, FHIRVersion._1_6_0, code);
-      if ("1.8".equals(codeString))
-        return new Enumeration<FHIRVersion>(this, FHIRVersion._1_8, code);
-      if ("1.8.0".equals(codeString))
-        return new Enumeration<FHIRVersion>(this, FHIRVersion._1_8_0, code);
-      if ("3.0".equals(codeString))
-        return new Enumeration<FHIRVersion>(this, FHIRVersion._3_0, code);
-      if ("3.0.0".equals(codeString))
-        return new Enumeration<FHIRVersion>(this, FHIRVersion._3_0_0, code);
-      if ("3.0.1".equals(codeString))
-        return new Enumeration<FHIRVersion>(this, FHIRVersion._3_0_1, code);
-      if ("3.0.2".equals(codeString))
-        return new Enumeration<FHIRVersion>(this, FHIRVersion._3_0_2, code);
-      if ("3.3".equals(codeString))
-        return new Enumeration<FHIRVersion>(this, FHIRVersion._3_3, code);
-      if ("3.3.0".equals(codeString))
-        return new Enumeration<FHIRVersion>(this, FHIRVersion._3_3_0, code);
-      if ("3.5".equals(codeString))
-        return new Enumeration<FHIRVersion>(this, FHIRVersion._3_5, code);
-      if ("3.5.0".equals(codeString))
-        return new Enumeration<FHIRVersion>(this, FHIRVersion._3_5_0, code);
-      if ("4.0".equals(codeString))
-        return new Enumeration<FHIRVersion>(this, FHIRVersion._4_0, code);
-      if ("4.0.0".equals(codeString))
-        return new Enumeration<FHIRVersion>(this, FHIRVersion._4_0_0, code);
-      if ("4.0.1".equals(codeString))
-        return new Enumeration<FHIRVersion>(this, FHIRVersion._4_0_1, code);
-      if ("4.1".equals(codeString))
-        return new Enumeration<FHIRVersion>(this, FHIRVersion._4_1, code);
-      if ("4.1.0".equals(codeString))
-        return new Enumeration<FHIRVersion>(this, FHIRVersion._4_1_0, code);
-      if ("4.2".equals(codeString))
-        return new Enumeration<FHIRVersion>(this, FHIRVersion._4_2, code);
-      if ("4.2.0".equals(codeString))
-        return new Enumeration<FHIRVersion>(this, FHIRVersion._4_2_0, code);
-      if ("4.3".equals(codeString))
-        return new Enumeration<FHIRVersion>(this, FHIRVersion._4_3, code);
-      if ("4.3.0".equals(codeString))
-        return new Enumeration<FHIRVersion>(this, FHIRVersion._4_3_0, code);
-      if ("4.3.0-snapshot1".equals(codeString))
-        return new Enumeration<FHIRVersion>(this, FHIRVersion._4_3_0_SNAPSHOT1, code);
-      if ("4.3.0-cibuild".equals(codeString))
-        return new Enumeration<FHIRVersion>(this, FHIRVersion._4_3_0_CIBUILD, code);
-      if ("4.4".equals(codeString))
-        return new Enumeration<FHIRVersion>(this, FHIRVersion._4_4, code);
-      if ("4.4.0".equals(codeString))
-        return new Enumeration<FHIRVersion>(this, FHIRVersion._4_4_0, code);
-      if ("4.5".equals(codeString))
-        return new Enumeration<FHIRVersion>(this, FHIRVersion._4_5, code);
-      if ("4.5.0".equals(codeString))
-        return new Enumeration<FHIRVersion>(this, FHIRVersion._4_5_0, code);
-      if ("4.6".equals(codeString))
-        return new Enumeration<FHIRVersion>(this, FHIRVersion._4_6, code);
-      if ("4.6.0".equals(codeString))
-        return new Enumeration<FHIRVersion>(this, FHIRVersion._4_6_0, code);
-      if ("5.0".equals(codeString))
-        return new Enumeration<FHIRVersion>(this, FHIRVersion._5_0, code);
-      if ("5.0.0".equals(codeString))
-        return new Enumeration<FHIRVersion>(this, FHIRVersion._5_0_0, code);
-      if ("5.0.0-cibuild".equals(codeString))
-        return new Enumeration<FHIRVersion>(this, FHIRVersion._5_0_0CIBUILD, code);
-      if ("5.0.0-snapshot1".equals(codeString))
-        return new Enumeration<FHIRVersion>(this, FHIRVersion._5_0_0SNAPSHOT1, code);
-      if ("5.0.0-snapshot2".equals(codeString))
-        return new Enumeration<FHIRVersion>(this, FHIRVersion._5_0_0SNAPSHOT2, code);
-      if ("5.0.0-ballot".equals(codeString))
-        return new Enumeration<FHIRVersion>(this, FHIRVersion._5_0_0BALLOT, code);
-      if ("5.0.0-snapshot3".equals(codeString))
-        return new Enumeration<FHIRVersion>(this, FHIRVersion._5_0_0SNAPSHOT3, code);
-      if ("5.0.0-draft-final".equals(codeString))
-        return new Enumeration<FHIRVersion>(this, FHIRVersion._5_0_0DRAFTFINAL, code);
-      throw new FHIRException("Unknown FHIRVersion code '" + codeString + "'");
-    }
+            if (codeString == null || "".equals(codeString))
+                return null;
+        if ("0.01".equals(codeString))
+          return FHIRVersion._0_01;
+        if ("0.05".equals(codeString))
+          return FHIRVersion._0_05;
+        if ("0.06".equals(codeString))
+          return FHIRVersion._0_06;
+        if ("0.11".equals(codeString))
+          return FHIRVersion._0_11;
+        if ("0.0".equals(codeString))
+          return FHIRVersion._0_0;
+        if ("0.0.80".equals(codeString))
+          return FHIRVersion._0_0_80;
+        if ("0.0.81".equals(codeString))
+          return FHIRVersion._0_0_81;
+        if ("0.0.82".equals(codeString))
+          return FHIRVersion._0_0_82;
+        if ("0.4".equals(codeString))
+          return FHIRVersion._0_4;
+        if ("0.4.0".equals(codeString))
+          return FHIRVersion._0_4_0;
+        if ("0.5".equals(codeString))
+          return FHIRVersion._0_5;
+        if ("0.5.0".equals(codeString))
+          return FHIRVersion._0_5_0;
+        if ("1.0".equals(codeString))
+          return FHIRVersion._1_0;
+        if ("1.0.0".equals(codeString))
+          return FHIRVersion._1_0_0;
+        if ("1.0.1".equals(codeString))
+          return FHIRVersion._1_0_1;
+        if ("1.0.2".equals(codeString))
+          return FHIRVersion._1_0_2;
+        if ("1.1".equals(codeString))
+          return FHIRVersion._1_1;
+        if ("1.1.0".equals(codeString))
+          return FHIRVersion._1_1_0;
+        if ("1.4".equals(codeString))
+          return FHIRVersion._1_4;
+        if ("1.4.0".equals(codeString))
+          return FHIRVersion._1_4_0;
+        if ("1.6".equals(codeString))
+          return FHIRVersion._1_6;
+        if ("1.6.0".equals(codeString))
+          return FHIRVersion._1_6_0;
+        if ("1.8".equals(codeString))
+          return FHIRVersion._1_8;
+        if ("1.8.0".equals(codeString))
+          return FHIRVersion._1_8_0;
+        if ("3.0".equals(codeString))
+          return FHIRVersion._3_0;
+        if ("3.0.0".equals(codeString))
+          return FHIRVersion._3_0_0;
+        if ("3.0.1".equals(codeString))
+          return FHIRVersion._3_0_1;
+        if ("3.0.2".equals(codeString))
+          return FHIRVersion._3_0_2;
+        if ("3.3".equals(codeString))
+          return FHIRVersion._3_3;
+        if ("3.3.0".equals(codeString))
+          return FHIRVersion._3_3_0;
+        if ("3.5".equals(codeString))
+          return FHIRVersion._3_5;
+        if ("3.5.0".equals(codeString))
+          return FHIRVersion._3_5_0;
+        if ("4.0".equals(codeString))
+          return FHIRVersion._4_0;
+        if ("4.0.0".equals(codeString))
+          return FHIRVersion._4_0_0;
+        if ("4.0.1".equals(codeString))
+          return FHIRVersion._4_0_1;
+        if ("4.1".equals(codeString))
+          return FHIRVersion._4_1;
+        if ("4.1.0".equals(codeString))
+          return FHIRVersion._4_1_0;
+        if ("4.2".equals(codeString))
+          return FHIRVersion._4_2;
+        if ("4.2.0".equals(codeString))
+          return FHIRVersion._4_2_0;
+        if ("4.3".equals(codeString))
+          return FHIRVersion._4_3;
+        if ("4.3.0".equals(codeString))
+          return FHIRVersion._4_3_0;
+        if ("4.3.0-cibuild".equals(codeString))
+          return FHIRVersion._4_3_0CIBUILD;
+        if ("4.3.0-snapshot1".equals(codeString))
+          return FHIRVersion._4_3_0SNAPSHOT1;
+        if ("4.4".equals(codeString))
+          return FHIRVersion._4_4;
+        if ("4.4.0".equals(codeString))
+          return FHIRVersion._4_4_0;
+        if ("4.5".equals(codeString))
+          return FHIRVersion._4_5;
+        if ("4.5.0".equals(codeString))
+          return FHIRVersion._4_5_0;
+        if ("4.6".equals(codeString))
+          return FHIRVersion._4_6;
+        if ("4.6.0".equals(codeString))
+          return FHIRVersion._4_6_0;
+        if ("5.0".equals(codeString))
+          return FHIRVersion._5_0;
+        if ("5.0.0".equals(codeString))
+          return FHIRVersion._5_0_0;
+        if ("5.0.0-cibuild".equals(codeString))
+          return FHIRVersion._5_0_0CIBUILD;
+        if ("5.0.0-snapshot1".equals(codeString))
+          return FHIRVersion._5_0_0SNAPSHOT1;
+        if ("5.0.0-snapshot2".equals(codeString))
+          return FHIRVersion._5_0_0SNAPSHOT2;
+        if ("5.0.0-ballot".equals(codeString))
+          return FHIRVersion._5_0_0BALLOT;
+        if ("5.0.0-snapshot3".equals(codeString))
+          return FHIRVersion._5_0_0SNAPSHOT3;
+        if ("5.0.0-draft-final".equals(codeString))
+          return FHIRVersion._5_0_0DRAFTFINAL;
+        if ("6.0.0-cibuild".equals(codeString))
+          return FHIRVersion._6_0_0CIBUILD;
+        if ("6.0.0".equals(codeString))
+          return FHIRVersion._6_0_0;
+        if ("6.0.0-ballot1".equals(codeString))
+          return FHIRVersion._6_0_0_BALLOT1;
+        if ("6.0.0-ballot2".equals(codeString))
+          return FHIRVersion._6_0_0_BALLOT2;
+        throw new IllegalArgumentException("Unknown FHIRVersion code '"+codeString+"'");
+        }
 
+        public Enumeration<FHIRVersion> fromType(PrimitiveType<?> code) throws FHIRException {
+          if (code == null)
+            return null;
+          if (code.isEmpty())
+            return new Enumeration<FHIRVersion>(this, FHIRVersion.NULL, code);
+          String codeString = ((PrimitiveType) code).asStringValue();
+          if (codeString == null || "".equals(codeString))
+            return new Enumeration<FHIRVersion>(this, FHIRVersion.NULL, code);
+        if ("0.01".equals(codeString))
+          return new Enumeration<FHIRVersion>(this, FHIRVersion._0_01, code);
+        if ("0.05".equals(codeString))
+          return new Enumeration<FHIRVersion>(this, FHIRVersion._0_05, code);
+        if ("0.06".equals(codeString))
+          return new Enumeration<FHIRVersion>(this, FHIRVersion._0_06, code);
+        if ("0.11".equals(codeString))
+          return new Enumeration<FHIRVersion>(this, FHIRVersion._0_11, code);
+        if ("0.0".equals(codeString))
+          return new Enumeration<FHIRVersion>(this, FHIRVersion._0_0, code);
+        if ("0.0.80".equals(codeString))
+          return new Enumeration<FHIRVersion>(this, FHIRVersion._0_0_80, code);
+        if ("0.0.81".equals(codeString))
+          return new Enumeration<FHIRVersion>(this, FHIRVersion._0_0_81, code);
+        if ("0.0.82".equals(codeString))
+          return new Enumeration<FHIRVersion>(this, FHIRVersion._0_0_82, code);
+        if ("0.4".equals(codeString))
+          return new Enumeration<FHIRVersion>(this, FHIRVersion._0_4, code);
+        if ("0.4.0".equals(codeString))
+          return new Enumeration<FHIRVersion>(this, FHIRVersion._0_4_0, code);
+        if ("0.5".equals(codeString))
+          return new Enumeration<FHIRVersion>(this, FHIRVersion._0_5, code);
+        if ("0.5.0".equals(codeString))
+          return new Enumeration<FHIRVersion>(this, FHIRVersion._0_5_0, code);
+        if ("1.0".equals(codeString))
+          return new Enumeration<FHIRVersion>(this, FHIRVersion._1_0, code);
+        if ("1.0.0".equals(codeString))
+          return new Enumeration<FHIRVersion>(this, FHIRVersion._1_0_0, code);
+        if ("1.0.1".equals(codeString))
+          return new Enumeration<FHIRVersion>(this, FHIRVersion._1_0_1, code);
+        if ("1.0.2".equals(codeString))
+          return new Enumeration<FHIRVersion>(this, FHIRVersion._1_0_2, code);
+        if ("1.1".equals(codeString))
+          return new Enumeration<FHIRVersion>(this, FHIRVersion._1_1, code);
+        if ("1.1.0".equals(codeString))
+          return new Enumeration<FHIRVersion>(this, FHIRVersion._1_1_0, code);
+        if ("1.4".equals(codeString))
+          return new Enumeration<FHIRVersion>(this, FHIRVersion._1_4, code);
+        if ("1.4.0".equals(codeString))
+          return new Enumeration<FHIRVersion>(this, FHIRVersion._1_4_0, code);
+        if ("1.6".equals(codeString))
+          return new Enumeration<FHIRVersion>(this, FHIRVersion._1_6, code);
+        if ("1.6.0".equals(codeString))
+          return new Enumeration<FHIRVersion>(this, FHIRVersion._1_6_0, code);
+        if ("1.8".equals(codeString))
+          return new Enumeration<FHIRVersion>(this, FHIRVersion._1_8, code);
+        if ("1.8.0".equals(codeString))
+          return new Enumeration<FHIRVersion>(this, FHIRVersion._1_8_0, code);
+        if ("3.0".equals(codeString))
+          return new Enumeration<FHIRVersion>(this, FHIRVersion._3_0, code);
+        if ("3.0.0".equals(codeString))
+          return new Enumeration<FHIRVersion>(this, FHIRVersion._3_0_0, code);
+        if ("3.0.1".equals(codeString))
+          return new Enumeration<FHIRVersion>(this, FHIRVersion._3_0_1, code);
+        if ("3.0.2".equals(codeString))
+          return new Enumeration<FHIRVersion>(this, FHIRVersion._3_0_2, code);
+        if ("3.3".equals(codeString))
+          return new Enumeration<FHIRVersion>(this, FHIRVersion._3_3, code);
+        if ("3.3.0".equals(codeString))
+          return new Enumeration<FHIRVersion>(this, FHIRVersion._3_3_0, code);
+        if ("3.5".equals(codeString))
+          return new Enumeration<FHIRVersion>(this, FHIRVersion._3_5, code);
+        if ("3.5.0".equals(codeString))
+          return new Enumeration<FHIRVersion>(this, FHIRVersion._3_5_0, code);
+        if ("4.0".equals(codeString))
+          return new Enumeration<FHIRVersion>(this, FHIRVersion._4_0, code);
+        if ("4.0.0".equals(codeString))
+          return new Enumeration<FHIRVersion>(this, FHIRVersion._4_0_0, code);
+        if ("4.0.1".equals(codeString))
+          return new Enumeration<FHIRVersion>(this, FHIRVersion._4_0_1, code);
+        if ("4.1".equals(codeString))
+          return new Enumeration<FHIRVersion>(this, FHIRVersion._4_1, code);
+        if ("4.1.0".equals(codeString))
+          return new Enumeration<FHIRVersion>(this, FHIRVersion._4_1_0, code);
+        if ("4.2".equals(codeString))
+          return new Enumeration<FHIRVersion>(this, FHIRVersion._4_2, code);
+        if ("4.2.0".equals(codeString))
+          return new Enumeration<FHIRVersion>(this, FHIRVersion._4_2_0, code);
+        if ("4.3".equals(codeString))
+          return new Enumeration<FHIRVersion>(this, FHIRVersion._4_3, code);
+        if ("4.3.0".equals(codeString))
+          return new Enumeration<FHIRVersion>(this, FHIRVersion._4_3_0, code);
+        if ("4.3.0-cibuild".equals(codeString))
+          return new Enumeration<FHIRVersion>(this, FHIRVersion._4_3_0CIBUILD, code);
+        if ("4.3.0-snapshot1".equals(codeString))
+          return new Enumeration<FHIRVersion>(this, FHIRVersion._4_3_0SNAPSHOT1, code);
+        if ("4.4".equals(codeString))
+          return new Enumeration<FHIRVersion>(this, FHIRVersion._4_4, code);
+        if ("4.4.0".equals(codeString))
+          return new Enumeration<FHIRVersion>(this, FHIRVersion._4_4_0, code);
+        if ("4.5".equals(codeString))
+          return new Enumeration<FHIRVersion>(this, FHIRVersion._4_5, code);
+        if ("4.5.0".equals(codeString))
+          return new Enumeration<FHIRVersion>(this, FHIRVersion._4_5_0, code);
+        if ("4.6".equals(codeString))
+          return new Enumeration<FHIRVersion>(this, FHIRVersion._4_6, code);
+        if ("4.6.0".equals(codeString))
+          return new Enumeration<FHIRVersion>(this, FHIRVersion._4_6_0, code);
+        if ("5.0".equals(codeString))
+          return new Enumeration<FHIRVersion>(this, FHIRVersion._5_0, code);
+        if ("5.0.0".equals(codeString))
+          return new Enumeration<FHIRVersion>(this, FHIRVersion._5_0_0, code);
+        if ("5.0.0-cibuild".equals(codeString))
+          return new Enumeration<FHIRVersion>(this, FHIRVersion._5_0_0CIBUILD, code);
+        if ("5.0.0-snapshot1".equals(codeString))
+          return new Enumeration<FHIRVersion>(this, FHIRVersion._5_0_0SNAPSHOT1, code);
+        if ("5.0.0-snapshot2".equals(codeString))
+          return new Enumeration<FHIRVersion>(this, FHIRVersion._5_0_0SNAPSHOT2, code);
+        if ("5.0.0-ballot".equals(codeString))
+          return new Enumeration<FHIRVersion>(this, FHIRVersion._5_0_0BALLOT, code);
+        if ("5.0.0-snapshot3".equals(codeString))
+          return new Enumeration<FHIRVersion>(this, FHIRVersion._5_0_0SNAPSHOT3, code);
+        if ("5.0.0-draft-final".equals(codeString))
+          return new Enumeration<FHIRVersion>(this, FHIRVersion._5_0_0DRAFTFINAL, code);
+        if ("6.0.0-cibuild".equals(codeString))
+          return new Enumeration<FHIRVersion>(this, FHIRVersion._6_0_0CIBUILD, code);
+        if ("6.0.0".equals(codeString))
+          return new Enumeration<FHIRVersion>(this, FHIRVersion._6_0_0, code);
+        if ("6.0.0-ballot1".equals(codeString))
+          return new Enumeration<FHIRVersion>(this, FHIRVersion._6_0_0_BALLOT1, code);
+        if ("6.0.0-ballot2".equals(codeString))
+          return new Enumeration<FHIRVersion>(this, FHIRVersion._6_0_0_BALLOT2, code);
+        throw new FHIRException("Unknown FHIRVersion code '"+codeString+"'");        
+        }
     public String toCode(FHIRVersion code) {
        if (code == FHIRVersion.NULL)
            return null;
@@ -14448,10 +14181,10 @@ public class Enumerations {
         return "4.3";
       if (code == FHIRVersion._4_3_0)
         return "4.3.0";
-      if (code == FHIRVersion._4_3_0_SNAPSHOT1)
-        return "4.3.0-snapshot1";
-      if (code == FHIRVersion._4_3_0_CIBUILD)
+      if (code == FHIRVersion._4_3_0CIBUILD)
         return "4.3.0-cibuild";
+      if (code == FHIRVersion._4_3_0SNAPSHOT1)
+        return "4.3.0-snapshot1";
       if (code == FHIRVersion._4_4)
         return "4.4";
       if (code == FHIRVersion._4_4_0)
@@ -14480,6 +14213,16 @@ public class Enumerations {
         return "5.0.0-snapshot3";
       if (code == FHIRVersion._5_0_0DRAFTFINAL)
         return "5.0.0-draft-final";
+      if (code == FHIRVersion._6_0_0CIBUILD)
+        return "6.0.0-cibuild";
+      if (code == FHIRVersion._6_0_0)
+        return "6.0.0";
+      if (code == FHIRVersion._6_0_0_BALLOT1) {
+        return "6.0.0-ballot1";
+      }
+      if (code == FHIRVersion._6_0_0_BALLOT2) {
+        return "6.0.0-ballot2";
+      }
       return "?";
    }
 
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/formats/XmlLocationAnnotator.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/formats/XmlLocationAnnotator.java
index 87ee99795..e4c989f54 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/formats/XmlLocationAnnotator.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/formats/XmlLocationAnnotator.java
@@ -80,6 +80,15 @@ public class XmlLocationAnnotator extends XMLFilterImpl  {
     }
   }
 
+  @Override
+  public Object getProperty(String name) throws SAXNotRecognizedException, SAXNotSupportedException {
+    if (!name.equals("http://javax.xml.xmlconstants/property/accessExternalDTD")) {
+      return null;
+    } else {
+      return super.getProperty(name);
+    }
+  }
+
   @Override
   public void setDocumentLocator(Locator locator) {
       super.setDocumentLocator(locator);