improve build() signature in generated profile code

org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/profilemodel/gen/PECodeGenerator.java

@@ -196,11 +196,16 @@ public class PECodeGenerator {
       w(b);
 
       if (isResource) {
-        jdoc(b, "Build an instance of the object based on this source object ", 2, true);
+        jdoc(b, "Build a instance of the underlying object based on this wrapping object ", 2, true);
         w(b, "  public "+base+" build(IWorkerContext context) {");
         w(b, "    workerContext = context;");
+        w(b, "    return build();");
+        w(b, "  }");
+        w(b);
+        jdoc(b, "Build a instance of the underlying object based on this wrapping object ", 2, true);
+        w(b, "  public "+base+" build() {");
         w(b, "    "+base+" theThing = new "+base+"();");
-        w(b, "    PEBuilder builder = new PEBuilder(context, PEElementPropertiesPolicy.EXTENSION, true);");
+        w(b, "    PEBuilder builder = new PEBuilder(workerContext, PEElementPropertiesPolicy.EXTENSION, true);");
         w(b, "    PEInstance tgt = builder.buildPEInstance(CANONICAL_URL, theThing);");      
         w(b, "    save(tgt, false);");
         w(b, "    return theThing;");

org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/profiles/codegen/AdministrableProductDefinitionUvEpi.java

@@ -22,7 +22,7 @@ import org.hl7.fhir.r5.profilemodel.gen.MustSupport;
 import org.hl7.fhir.r5.profilemodel.gen.Definition;
 
 
-// Generated by the HAPI Java Profile Generator, 2/11/24, 12:28 pm
+// Generated by the HAPI Java Profile Generator, 2/11/24, 10:50 pm
 
 /**
  * A medicinal product in the final form which is suitable for administering to a 
@@ -277,13 +277,21 @@ public class AdministrableProductDefinitionUvEpi extends PEGeneratedBase {
   }
 
   /**
-   * Build an instance of the object based on this source object 
+   * Build a instance of the underlying object based on this wrapping object 
    *
    */
   public AdministrableProductDefinition build(IWorkerContext context) {
     workerContext = context;
+    return build();
+  }
+
+  /**
+   * Build a instance of the underlying object based on this wrapping object 
+   *
+   */
+  public AdministrableProductDefinition build() {
     AdministrableProductDefinition theThing = new AdministrableProductDefinition();
-    PEBuilder builder = new PEBuilder(context, PEElementPropertiesPolicy.EXTENSION, true);
+    PEBuilder builder = new PEBuilder(workerContext, PEElementPropertiesPolicy.EXTENSION, true);
     PEInstance tgt = builder.buildPEInstance(CANONICAL_URL, theThing);
     save(tgt, false);
     return theThing;

org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/profiles/codegen/AuthorizationIdentifier.java

@@ -22,7 +22,7 @@ import org.hl7.fhir.r5.profilemodel.gen.MustSupport;
 import org.hl7.fhir.r5.profilemodel.gen.Definition;
 
 
-// Generated by the HAPI Java Profile Generator, 2/11/24, 12:28 pm
+// Generated by the HAPI Java Profile Generator, 2/11/24, 10:50 pm
 
 /**
  * An identifier - identifies some entity uniquely and unambiguously. Typically 

org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/profiles/codegen/BundleUvEpi.java

@@ -22,7 +22,7 @@ import org.hl7.fhir.r5.profilemodel.gen.MustSupport;
 import org.hl7.fhir.r5.profilemodel.gen.Definition;
 
 
-// Generated by the HAPI Java Profile Generator, 2/11/24, 12:28 pm
+// Generated by the HAPI Java Profile Generator, 2/11/24, 10:50 pm
 
 /**
  * Electronic Product Information Bundle Document. A container for the collection 
@@ -207,13 +207,21 @@ public class BundleUvEpi extends PEGeneratedBase {
   }
 
   /**
-   * Build an instance of the object based on this source object 
+   * Build a instance of the underlying object based on this wrapping object 
    *
    */
   public Bundle build(IWorkerContext context) {
     workerContext = context;
+    return build();
+  }
+
+  /**
+   * Build a instance of the underlying object based on this wrapping object 
+   *
+   */
+  public Bundle build() {
     Bundle theThing = new Bundle();
-    PEBuilder builder = new PEBuilder(context, PEElementPropertiesPolicy.EXTENSION, true);
+    PEBuilder builder = new PEBuilder(workerContext, PEElementPropertiesPolicy.EXTENSION, true);
     PEInstance tgt = builder.buildPEInstance(CANONICAL_URL, theThing);
     save(tgt, false);
     return theThing;

org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/profiles/codegen/CVRIdentifier.java

@@ -22,7 +22,7 @@ import org.hl7.fhir.r5.profilemodel.gen.MustSupport;
 import org.hl7.fhir.r5.profilemodel.gen.Definition;
 
 
-// Generated by the HAPI Java Profile Generator, 2/11/24, 12:28 pm
+// Generated by the HAPI Java Profile Generator, 2/11/24, 10:50 pm
 
 /**
  * An identifier - identifies some entity uniquely and unambiguously. Typically 

org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/profiles/codegen/ClinicalUseDefinitionContraindicationUvEpi.java

@@ -22,7 +22,7 @@ import org.hl7.fhir.r5.profilemodel.gen.MustSupport;
 import org.hl7.fhir.r5.profilemodel.gen.Definition;
 
 
-// Generated by the HAPI Java Profile Generator, 2/11/24, 12:28 pm
+// Generated by the HAPI Java Profile Generator, 2/11/24, 10:50 pm
 
 /**
  * A single issue - either an indication, contraindication, interaction or an 
@@ -130,13 +130,21 @@ public class ClinicalUseDefinitionContraindicationUvEpi extends PEGeneratedBase
   }
 
   /**
-   * Build an instance of the object based on this source object 
+   * Build a instance of the underlying object based on this wrapping object 
    *
    */
   public ClinicalUseDefinition build(IWorkerContext context) {
     workerContext = context;
+    return build();
+  }
+
+  /**
+   * Build a instance of the underlying object based on this wrapping object 
+   *
+   */
+  public ClinicalUseDefinition build() {
     ClinicalUseDefinition theThing = new ClinicalUseDefinition();
-    PEBuilder builder = new PEBuilder(context, PEElementPropertiesPolicy.EXTENSION, true);
+    PEBuilder builder = new PEBuilder(workerContext, PEElementPropertiesPolicy.EXTENSION, true);
     PEInstance tgt = builder.buildPEInstance(CANONICAL_URL, theThing);
     save(tgt, false);
     return theThing;

org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/profiles/codegen/ClinicalUseDefinitionIndicationUvEpi.java

@@ -22,7 +22,7 @@ import org.hl7.fhir.r5.profilemodel.gen.MustSupport;
 import org.hl7.fhir.r5.profilemodel.gen.Definition;
 
 
-// Generated by the HAPI Java Profile Generator, 2/11/24, 12:28 pm
+// Generated by the HAPI Java Profile Generator, 2/11/24, 10:50 pm
 
 /**
  * A single issue - either an indication, contraindication, interaction or an 
@@ -130,13 +130,21 @@ public class ClinicalUseDefinitionIndicationUvEpi extends PEGeneratedBase {
   }
 
   /**
-   * Build an instance of the object based on this source object 
+   * Build a instance of the underlying object based on this wrapping object 
    *
    */
   public ClinicalUseDefinition build(IWorkerContext context) {
     workerContext = context;
+    return build();
+  }
+
+  /**
+   * Build a instance of the underlying object based on this wrapping object 
+   *
+   */
+  public ClinicalUseDefinition build() {
     ClinicalUseDefinition theThing = new ClinicalUseDefinition();
-    PEBuilder builder = new PEBuilder(context, PEElementPropertiesPolicy.EXTENSION, true);
+    PEBuilder builder = new PEBuilder(workerContext, PEElementPropertiesPolicy.EXTENSION, true);
     PEInstance tgt = builder.buildPEInstance(CANONICAL_URL, theThing);
     save(tgt, false);
     return theThing;

org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/profiles/codegen/ClinicalUseDefinitionInteractionUvEpi.java

@@ -22,7 +22,7 @@ import org.hl7.fhir.r5.profilemodel.gen.MustSupport;
 import org.hl7.fhir.r5.profilemodel.gen.Definition;
 
 
-// Generated by the HAPI Java Profile Generator, 2/11/24, 12:28 pm
+// Generated by the HAPI Java Profile Generator, 2/11/24, 10:50 pm
 
 /**
  * A single issue - either an indication, contraindication, interaction or an 
@@ -130,13 +130,21 @@ public class ClinicalUseDefinitionInteractionUvEpi extends PEGeneratedBase {
   }
 
   /**
-   * Build an instance of the object based on this source object 
+   * Build a instance of the underlying object based on this wrapping object 
    *
    */
   public ClinicalUseDefinition build(IWorkerContext context) {
     workerContext = context;
+    return build();
+  }
+
+  /**
+   * Build a instance of the underlying object based on this wrapping object 
+   *
+   */
+  public ClinicalUseDefinition build() {
     ClinicalUseDefinition theThing = new ClinicalUseDefinition();
-    PEBuilder builder = new PEBuilder(context, PEElementPropertiesPolicy.EXTENSION, true);
+    PEBuilder builder = new PEBuilder(workerContext, PEElementPropertiesPolicy.EXTENSION, true);
     PEInstance tgt = builder.buildPEInstance(CANONICAL_URL, theThing);
     save(tgt, false);
     return theThing;

org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/profiles/codegen/ClinicalUseDefinitionUndesirableEffectUvEpi.java

@@ -22,7 +22,7 @@ import org.hl7.fhir.r5.profilemodel.gen.MustSupport;
 import org.hl7.fhir.r5.profilemodel.gen.Definition;
 
 
-// Generated by the HAPI Java Profile Generator, 2/11/24, 12:28 pm
+// Generated by the HAPI Java Profile Generator, 2/11/24, 10:50 pm
 
 /**
  * A single issue - either an indication, contraindication, interaction or an 
@@ -130,13 +130,21 @@ public class ClinicalUseDefinitionUndesirableEffectUvEpi extends PEGeneratedBase
   }
 
   /**
-   * Build an instance of the object based on this source object 
+   * Build a instance of the underlying object based on this wrapping object 
    *
    */
   public ClinicalUseDefinition build(IWorkerContext context) {
     workerContext = context;
+    return build();
+  }
+
+  /**
+   * Build a instance of the underlying object based on this wrapping object 
+   *
+   */
+  public ClinicalUseDefinition build() {
     ClinicalUseDefinition theThing = new ClinicalUseDefinition();
-    PEBuilder builder = new PEBuilder(context, PEElementPropertiesPolicy.EXTENSION, true);
+    PEBuilder builder = new PEBuilder(workerContext, PEElementPropertiesPolicy.EXTENSION, true);
     PEInstance tgt = builder.buildPEInstance(CANONICAL_URL, theThing);
     save(tgt, false);
     return theThing;

org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/profiles/codegen/ClinicalUseDefinitionWarningUvEpi.java

@@ -22,7 +22,7 @@ import org.hl7.fhir.r5.profilemodel.gen.MustSupport;
 import org.hl7.fhir.r5.profilemodel.gen.Definition;
 
 
-// Generated by the HAPI Java Profile Generator, 2/11/24, 12:28 pm
+// Generated by the HAPI Java Profile Generator, 2/11/24, 10:50 pm
 
 /**
  * A single issue - either an indication, contraindication, interaction or an 
@@ -130,13 +130,21 @@ public class ClinicalUseDefinitionWarningUvEpi extends PEGeneratedBase {
   }
 
   /**
-   * Build an instance of the object based on this source object 
+   * Build a instance of the underlying object based on this wrapping object 
    *
    */
   public ClinicalUseDefinition build(IWorkerContext context) {
     workerContext = context;
+    return build();
+  }
+
+  /**
+   * Build a instance of the underlying object based on this wrapping object 
+   *
+   */
+  public ClinicalUseDefinition build() {
     ClinicalUseDefinition theThing = new ClinicalUseDefinition();
-    PEBuilder builder = new PEBuilder(context, PEElementPropertiesPolicy.EXTENSION, true);
+    PEBuilder builder = new PEBuilder(workerContext, PEElementPropertiesPolicy.EXTENSION, true);
     PEInstance tgt = builder.buildPEInstance(CANONICAL_URL, theThing);
     save(tgt, false);
     return theThing;

org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/profiles/codegen/CompositionUvEpi.java

@@ -22,7 +22,7 @@ import org.hl7.fhir.r5.profilemodel.gen.MustSupport;
 import org.hl7.fhir.r5.profilemodel.gen.Definition;
 
 
-// Generated by the HAPI Java Profile Generator, 2/11/24, 12:28 pm
+// Generated by the HAPI Java Profile Generator, 2/11/24, 10:50 pm
 
 /**
  * A set of healthcare-related information that is assembled together into a single 
@@ -340,13 +340,21 @@ public class CompositionUvEpi extends PEGeneratedBase {
   }
 
   /**
-   * Build an instance of the object based on this source object 
+   * Build a instance of the underlying object based on this wrapping object 
    *
    */
   public Composition build(IWorkerContext context) {
     workerContext = context;
+    return build();
+  }
+
+  /**
+   * Build a instance of the underlying object based on this wrapping object 
+   *
+   */
+  public Composition build() {
     Composition theThing = new Composition();
-    PEBuilder builder = new PEBuilder(context, PEElementPropertiesPolicy.EXTENSION, true);
+    PEBuilder builder = new PEBuilder(workerContext, PEElementPropertiesPolicy.EXTENSION, true);
     PEInstance tgt = builder.buildPEInstance(CANONICAL_URL, theThing);
     save(tgt, false);
     return theThing;

org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/profiles/codegen/ConditionLastAssertedDate.java

@@ -22,7 +22,7 @@ import org.hl7.fhir.r5.profilemodel.gen.MustSupport;
 import org.hl7.fhir.r5.profilemodel.gen.Definition;
 
 
-// Generated by the HAPI Java Profile Generator, 2/11/24, 12:28 pm
+// Generated by the HAPI Java Profile Generator, 2/11/24, 10:50 pm
 
 /**
  * Extension for the last date a Condition-instance was confirmed valid in its 

org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/profiles/codegen/DkCoreBasicObservation.java

@@ -22,7 +22,7 @@ import org.hl7.fhir.r5.profilemodel.gen.MustSupport;
 import org.hl7.fhir.r5.profilemodel.gen.Definition;
 
 
-// Generated by the HAPI Java Profile Generator, 2/11/24, 12:28 pm
+// Generated by the HAPI Java Profile Generator, 2/11/24, 10:50 pm
 
 /**
  * Measurements and simple assertions made about a patient, device or other 
@@ -237,13 +237,21 @@ public class DkCoreBasicObservation extends PEGeneratedBase {
   }
 
   /**
-   * Build an instance of the object based on this source object 
+   * Build a instance of the underlying object based on this wrapping object 
    *
    */
   public Observation build(IWorkerContext context) {
     workerContext = context;
+    return build();
+  }
+
+  /**
+   * Build a instance of the underlying object based on this wrapping object 
+   *
+   */
+  public Observation build() {
     Observation theThing = new Observation();
-    PEBuilder builder = new PEBuilder(context, PEElementPropertiesPolicy.EXTENSION, true);
+    PEBuilder builder = new PEBuilder(workerContext, PEElementPropertiesPolicy.EXTENSION, true);
     PEInstance tgt = builder.buildPEInstance(CANONICAL_URL, theThing);
     save(tgt, false);
     return theThing;

org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/profiles/codegen/DkCoreCondition.java

@@ -22,7 +22,7 @@ import org.hl7.fhir.r5.profilemodel.gen.MustSupport;
 import org.hl7.fhir.r5.profilemodel.gen.Definition;
 
 
-// Generated by the HAPI Java Profile Generator, 2/11/24, 12:28 pm
+// Generated by the HAPI Java Profile Generator, 2/11/24, 10:50 pm
 
 /**
  * A clinical condition, problem, diagnosis, or other event, situation, issue, or 
@@ -186,13 +186,21 @@ public class DkCoreCondition extends PEGeneratedBase {
   }
 
   /**
-   * Build an instance of the object based on this source object 
+   * Build a instance of the underlying object based on this wrapping object 
    *
    */
   public Condition build(IWorkerContext context) {
     workerContext = context;
+    return build();
+  }
+
+  /**
+   * Build a instance of the underlying object based on this wrapping object 
+   *
+   */
+  public Condition build() {
     Condition theThing = new Condition();
-    PEBuilder builder = new PEBuilder(context, PEElementPropertiesPolicy.EXTENSION, true);
+    PEBuilder builder = new PEBuilder(workerContext, PEElementPropertiesPolicy.EXTENSION, true);
     PEInstance tgt = builder.buildPEInstance(CANONICAL_URL, theThing);
     save(tgt, false);
     return theThing;

org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/profiles/codegen/DkCoreCprIdentifier.java

@@ -22,7 +22,7 @@ import org.hl7.fhir.r5.profilemodel.gen.MustSupport;
 import org.hl7.fhir.r5.profilemodel.gen.Definition;
 
 
-// Generated by the HAPI Java Profile Generator, 2/11/24, 12:28 pm
+// Generated by the HAPI Java Profile Generator, 2/11/24, 10:50 pm
 
 /**
  * An identifier - identifies some entity uniquely and unambiguously. Typically 

org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/profiles/codegen/DkCoreDeCprIdentifier.java

@@ -22,7 +22,7 @@ import org.hl7.fhir.r5.profilemodel.gen.MustSupport;
 import org.hl7.fhir.r5.profilemodel.gen.Definition;
 
 
-// Generated by the HAPI Java Profile Generator, 2/11/24, 12:28 pm
+// Generated by the HAPI Java Profile Generator, 2/11/24, 10:50 pm
 
 /**
  * An identifier - identifies some entity uniquely and unambiguously. Typically 

org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/profiles/codegen/DkCoreObservation.java

@@ -22,7 +22,7 @@ import org.hl7.fhir.r5.profilemodel.gen.MustSupport;
 import org.hl7.fhir.r5.profilemodel.gen.Definition;
 
 
-// Generated by the HAPI Java Profile Generator, 2/11/24, 12:28 pm
+// Generated by the HAPI Java Profile Generator, 2/11/24, 10:50 pm
 
 /**
  * Measurements and simple assertions made about a patient, device or other 
@@ -229,13 +229,21 @@ public class DkCoreObservation extends PEGeneratedBase {
   }
 
   /**
-   * Build an instance of the object based on this source object 
+   * Build a instance of the underlying object based on this wrapping object 
    *
    */
   public Observation build(IWorkerContext context) {
     workerContext = context;
+    return build();
+  }
+
+  /**
+   * Build a instance of the underlying object based on this wrapping object 
+   *
+   */
+  public Observation build() {
     Observation theThing = new Observation();
-    PEBuilder builder = new PEBuilder(context, PEElementPropertiesPolicy.EXTENSION, true);
+    PEBuilder builder = new PEBuilder(workerContext, PEElementPropertiesPolicy.EXTENSION, true);
     PEInstance tgt = builder.buildPEInstance(CANONICAL_URL, theThing);
     save(tgt, false);
     return theThing;

org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/profiles/codegen/DkCoreOrganization.java

@@ -22,7 +22,7 @@ import org.hl7.fhir.r5.profilemodel.gen.MustSupport;
 import org.hl7.fhir.r5.profilemodel.gen.Definition;
 
 
-// Generated by the HAPI Java Profile Generator, 2/11/24, 12:28 pm
+// Generated by the HAPI Java Profile Generator, 2/11/24, 10:50 pm
 
 /**
  * A formally or informally recognized grouping of people or organizations formed 
@@ -199,13 +199,21 @@ public class DkCoreOrganization extends PEGeneratedBase {
   }
 
   /**
-   * Build an instance of the object based on this source object 
+   * Build a instance of the underlying object based on this wrapping object 
    *
    */
   public Organization build(IWorkerContext context) {
     workerContext = context;
+    return build();
+  }
+
+  /**
+   * Build a instance of the underlying object based on this wrapping object 
+   *
+   */
+  public Organization build() {
     Organization theThing = new Organization();
-    PEBuilder builder = new PEBuilder(context, PEElementPropertiesPolicy.EXTENSION, true);
+    PEBuilder builder = new PEBuilder(workerContext, PEElementPropertiesPolicy.EXTENSION, true);
     PEInstance tgt = builder.buildPEInstance(CANONICAL_URL, theThing);
     save(tgt, false);
     return theThing;

org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/profiles/codegen/DkCorePatient.java

@@ -22,7 +22,7 @@ import org.hl7.fhir.r5.profilemodel.gen.MustSupport;
 import org.hl7.fhir.r5.profilemodel.gen.Definition;
 
 
-// Generated by the HAPI Java Profile Generator, 2/11/24, 12:28 pm
+// Generated by the HAPI Java Profile Generator, 2/11/24, 10:50 pm
 
 /**
  * Demographics and other administrative information about an individual or animal 
@@ -190,13 +190,21 @@ public class DkCorePatient extends PEGeneratedBase {
   }
 
   /**
-   * Build an instance of the object based on this source object 
+   * Build a instance of the underlying object based on this wrapping object 
    *
    */
   public Patient build(IWorkerContext context) {
     workerContext = context;
+    return build();
+  }
+
+  /**
+   * Build a instance of the underlying object based on this wrapping object 
+   *
+   */
+  public Patient build() {
     Patient theThing = new Patient();
-    PEBuilder builder = new PEBuilder(context, PEElementPropertiesPolicy.EXTENSION, true);
+    PEBuilder builder = new PEBuilder(workerContext, PEElementPropertiesPolicy.EXTENSION, true);
     PEInstance tgt = builder.buildPEInstance(CANONICAL_URL, theThing);
     save(tgt, false);
     return theThing;

org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/profiles/codegen/DkCorePractitioner.java

@@ -22,7 +22,7 @@ import org.hl7.fhir.r5.profilemodel.gen.MustSupport;
 import org.hl7.fhir.r5.profilemodel.gen.Definition;
 
 
-// Generated by the HAPI Java Profile Generator, 2/11/24, 12:28 pm
+// Generated by the HAPI Java Profile Generator, 2/11/24, 10:50 pm
 
 /**
  * A person who is directly or indirectly involved in the provisioning of 
@@ -127,13 +127,21 @@ public class DkCorePractitioner extends PEGeneratedBase {
   }
 
   /**
-   * Build an instance of the object based on this source object 
+   * Build a instance of the underlying object based on this wrapping object 
    *
    */
   public Practitioner build(IWorkerContext context) {
     workerContext = context;
+    return build();
+  }
+
+  /**
+   * Build a instance of the underlying object based on this wrapping object 
+   *
+   */
+  public Practitioner build() {
     Practitioner theThing = new Practitioner();
-    PEBuilder builder = new PEBuilder(context, PEElementPropertiesPolicy.EXTENSION, true);
+    PEBuilder builder = new PEBuilder(workerContext, PEElementPropertiesPolicy.EXTENSION, true);
     PEInstance tgt = builder.buildPEInstance(CANONICAL_URL, theThing);
     save(tgt, false);
     return theThing;

org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/profiles/codegen/DkCoreRelatedPerson.java

@@ -22,7 +22,7 @@ import org.hl7.fhir.r5.profilemodel.gen.MustSupport;
 import org.hl7.fhir.r5.profilemodel.gen.Definition;
 
 
-// Generated by the HAPI Java Profile Generator, 2/11/24, 12:28 pm
+// Generated by the HAPI Java Profile Generator, 2/11/24, 10:50 pm
 
 /**
  * Information about a person that is involved in the care for a patient, but who 
@@ -163,13 +163,21 @@ public class DkCoreRelatedPerson extends PEGeneratedBase {
   }
 
   /**
-   * Build an instance of the object based on this source object 
+   * Build a instance of the underlying object based on this wrapping object 
    *
    */
   public RelatedPerson build(IWorkerContext context) {
     workerContext = context;
+    return build();
+  }
+
+  /**
+   * Build a instance of the underlying object based on this wrapping object 
+   *
+   */
+  public RelatedPerson build() {
     RelatedPerson theThing = new RelatedPerson();
-    PEBuilder builder = new PEBuilder(context, PEElementPropertiesPolicy.EXTENSION, true);
+    PEBuilder builder = new PEBuilder(workerContext, PEElementPropertiesPolicy.EXTENSION, true);
     PEInstance tgt = builder.buildPEInstance(CANONICAL_URL, theThing);
     save(tgt, false);
     return theThing;

org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/profiles/codegen/DkCoreXeCprIdentifier.java

@@ -22,7 +22,7 @@ import org.hl7.fhir.r5.profilemodel.gen.MustSupport;
 import org.hl7.fhir.r5.profilemodel.gen.Definition;
 
 
-// Generated by the HAPI Java Profile Generator, 2/11/24, 12:28 pm
+// Generated by the HAPI Java Profile Generator, 2/11/24, 10:50 pm
 
 /**
  * An identifier - identifies some entity uniquely and unambiguously. Typically 

org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/profiles/codegen/GLNIdentifier.java

@@ -22,7 +22,7 @@ import org.hl7.fhir.r5.profilemodel.gen.MustSupport;
 import org.hl7.fhir.r5.profilemodel.gen.Definition;
 
 
-// Generated by the HAPI Java Profile Generator, 2/11/24, 12:28 pm
+// Generated by the HAPI Java Profile Generator, 2/11/24, 10:50 pm
 
 /**
  * An identifier - identifies some entity uniquely and unambiguously. Typically 

org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/profiles/codegen/IngredientUvEpi.java

@@ -22,7 +22,7 @@ import org.hl7.fhir.r5.profilemodel.gen.MustSupport;
 import org.hl7.fhir.r5.profilemodel.gen.Definition;
 
 
-// Generated by the HAPI Java Profile Generator, 2/11/24, 12:28 pm
+// Generated by the HAPI Java Profile Generator, 2/11/24, 10:50 pm
 
 /**
  * An ingredient of a manufactured item or pharmaceutical product.
@@ -220,13 +220,21 @@ public class IngredientUvEpi extends PEGeneratedBase {
   }
 
   /**
-   * Build an instance of the object based on this source object 
+   * Build a instance of the underlying object based on this wrapping object 
    *
    */
   public Ingredient build(IWorkerContext context) {
     workerContext = context;
+    return build();
+  }
+
+  /**
+   * Build a instance of the underlying object based on this wrapping object 
+   *
+   */
+  public Ingredient build() {
     Ingredient theThing = new Ingredient();
-    PEBuilder builder = new PEBuilder(context, PEElementPropertiesPolicy.EXTENSION, true);
+    PEBuilder builder = new PEBuilder(workerContext, PEElementPropertiesPolicy.EXTENSION, true);
     PEInstance tgt = builder.buildPEInstance(CANONICAL_URL, theThing);
     save(tgt, false);
     return theThing;

org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/profiles/codegen/KombitOrgIdentifier.java

@@ -22,7 +22,7 @@ import org.hl7.fhir.r5.profilemodel.gen.MustSupport;
 import org.hl7.fhir.r5.profilemodel.gen.Definition;
 
 
-// Generated by the HAPI Java Profile Generator, 2/11/24, 12:28 pm
+// Generated by the HAPI Java Profile Generator, 2/11/24, 10:50 pm
 
 /**
  * An identifier - identifies some entity uniquely and unambiguously. Typically 

org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/profiles/codegen/ManufacturedItemDefinitionUvEpi.java

@@ -22,7 +22,7 @@ import org.hl7.fhir.r5.profilemodel.gen.MustSupport;
 import org.hl7.fhir.r5.profilemodel.gen.Definition;
 
 
-// Generated by the HAPI Java Profile Generator, 2/11/24, 12:28 pm
+// Generated by the HAPI Java Profile Generator, 2/11/24, 10:50 pm
 
 /**
  * The definition and characteristics of a medicinal manufactured item, such as a 
@@ -277,13 +277,21 @@ public class ManufacturedItemDefinitionUvEpi extends PEGeneratedBase {
   }
 
   /**
-   * Build an instance of the object based on this source object 
+   * Build a instance of the underlying object based on this wrapping object 
    *
    */
   public ManufacturedItemDefinition build(IWorkerContext context) {
     workerContext = context;
+    return build();
+  }
+
+  /**
+   * Build a instance of the underlying object based on this wrapping object 
+   *
+   */
+  public ManufacturedItemDefinition build() {
     ManufacturedItemDefinition theThing = new ManufacturedItemDefinition();
-    PEBuilder builder = new PEBuilder(context, PEElementPropertiesPolicy.EXTENSION, true);
+    PEBuilder builder = new PEBuilder(workerContext, PEElementPropertiesPolicy.EXTENSION, true);
     PEInstance tgt = builder.buildPEInstance(CANONICAL_URL, theThing);
     save(tgt, false);
     return theThing;

org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/profiles/codegen/MedicinalProductDefinitionUvEpi.java

@@ -22,7 +22,7 @@ import org.hl7.fhir.r5.profilemodel.gen.MustSupport;
 import org.hl7.fhir.r5.profilemodel.gen.Definition;
 
 
-// Generated by the HAPI Java Profile Generator, 2/11/24, 12:28 pm
+// Generated by the HAPI Java Profile Generator, 2/11/24, 10:50 pm
 
 /**
  * A medicinal product, being a substance or combination of substances that is 
@@ -181,13 +181,21 @@ public class MedicinalProductDefinitionUvEpi extends PEGeneratedBase {
   }
 
   /**
-   * Build an instance of the object based on this source object 
+   * Build a instance of the underlying object based on this wrapping object 
    *
    */
   public MedicinalProductDefinition build(IWorkerContext context) {
     workerContext = context;
+    return build();
+  }
+
+  /**
+   * Build a instance of the underlying object based on this wrapping object 
+   *
+   */
+  public MedicinalProductDefinition build() {
     MedicinalProductDefinition theThing = new MedicinalProductDefinition();
-    PEBuilder builder = new PEBuilder(context, PEElementPropertiesPolicy.EXTENSION, true);
+    PEBuilder builder = new PEBuilder(workerContext, PEElementPropertiesPolicy.EXTENSION, true);
     PEInstance tgt = builder.buildPEInstance(CANONICAL_URL, theThing);
     save(tgt, false);
     return theThing;

org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/profiles/codegen/MunicipalityCodes.java

@@ -22,7 +22,7 @@ import org.hl7.fhir.r5.profilemodel.gen.MustSupport;
 import org.hl7.fhir.r5.profilemodel.gen.Definition;
 
 
-// Generated by the HAPI Java Profile Generator, 2/11/24, 12:28 pm
+// Generated by the HAPI Java Profile Generator, 2/11/24, 10:50 pm
 
 /**
  * Identifier holding the official identifier for a danish municipality

org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/profiles/codegen/NotFollowedAnymore.java

@@ -22,7 +22,7 @@ import org.hl7.fhir.r5.profilemodel.gen.MustSupport;
 import org.hl7.fhir.r5.profilemodel.gen.Definition;
 
 
-// Generated by the HAPI Java Profile Generator, 2/11/24, 12:28 pm
+// Generated by the HAPI Java Profile Generator, 2/11/24, 10:50 pm
 
 /**
  * Extension for the date where a condition lost focus in a specific clinical 

org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/profiles/codegen/OrganizationUvEpi.java

@@ -22,7 +22,7 @@ import org.hl7.fhir.r5.profilemodel.gen.MustSupport;
 import org.hl7.fhir.r5.profilemodel.gen.Definition;
 
 
-// Generated by the HAPI Java Profile Generator, 2/11/24, 12:28 pm
+// Generated by the HAPI Java Profile Generator, 2/11/24, 10:50 pm
 
 /**
  * A formally or informally recognized grouping of people or organizations formed 
@@ -136,13 +136,21 @@ public class OrganizationUvEpi extends PEGeneratedBase {
   }
 
   /**
-   * Build an instance of the object based on this source object 
+   * Build a instance of the underlying object based on this wrapping object 
    *
    */
   public Organization build(IWorkerContext context) {
     workerContext = context;
+    return build();
+  }
+
+  /**
+   * Build a instance of the underlying object based on this wrapping object 
+   *
+   */
+  public Organization build() {
     Organization theThing = new Organization();
-    PEBuilder builder = new PEBuilder(context, PEElementPropertiesPolicy.EXTENSION, true);
+    PEBuilder builder = new PEBuilder(workerContext, PEElementPropertiesPolicy.EXTENSION, true);
     PEInstance tgt = builder.buildPEInstance(CANONICAL_URL, theThing);
     save(tgt, false);
     return theThing;

org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/profiles/codegen/PackagedProductDefinitionUvEpi.java

@@ -22,7 +22,7 @@ import org.hl7.fhir.r5.profilemodel.gen.MustSupport;
 import org.hl7.fhir.r5.profilemodel.gen.Definition;
 
 
-// Generated by the HAPI Java Profile Generator, 2/11/24, 12:28 pm
+// Generated by the HAPI Java Profile Generator, 2/11/24, 10:50 pm
 
 /**
  * A medically related item or items, in a container or package.
@@ -154,13 +154,21 @@ public class PackagedProductDefinitionUvEpi extends PEGeneratedBase {
   }
 
   /**
-   * Build an instance of the object based on this source object 
+   * Build a instance of the underlying object based on this wrapping object 
    *
    */
   public PackagedProductDefinition build(IWorkerContext context) {
     workerContext = context;
+    return build();
+  }
+
+  /**
+   * Build a instance of the underlying object based on this wrapping object 
+   *
+   */
+  public PackagedProductDefinition build() {
     PackagedProductDefinition theThing = new PackagedProductDefinition();
-    PEBuilder builder = new PEBuilder(context, PEElementPropertiesPolicy.EXTENSION, true);
+    PEBuilder builder = new PEBuilder(workerContext, PEElementPropertiesPolicy.EXTENSION, true);
     PEInstance tgt = builder.buildPEInstance(CANONICAL_URL, theThing);
     save(tgt, false);
     return theThing;

org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/profiles/codegen/ProducentId.java

@@ -22,7 +22,7 @@ import org.hl7.fhir.r5.profilemodel.gen.MustSupport;
 import org.hl7.fhir.r5.profilemodel.gen.Definition;
 
 
-// Generated by the HAPI Java Profile Generator, 2/11/24, 12:28 pm
+// Generated by the HAPI Java Profile Generator, 2/11/24, 10:50 pm
 
 /**
  * An identifier - identifies some entity uniquely and unambiguously. Typically 

org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/profiles/codegen/RegionalSubDivisionCodes.java

@@ -22,7 +22,7 @@ import org.hl7.fhir.r5.profilemodel.gen.MustSupport;
 import org.hl7.fhir.r5.profilemodel.gen.Definition;
 
 
-// Generated by the HAPI Java Profile Generator, 2/11/24, 12:28 pm
+// Generated by the HAPI Java Profile Generator, 2/11/24, 10:50 pm
 
 /**
  * Identifier holding the official organization identifier for a danish region

org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/profiles/codegen/RegulatedAuthorizationUvEpi.java

@@ -22,7 +22,7 @@ import org.hl7.fhir.r5.profilemodel.gen.MustSupport;
 import org.hl7.fhir.r5.profilemodel.gen.Definition;
 
 
-// Generated by the HAPI Java Profile Generator, 2/11/24, 12:28 pm
+// Generated by the HAPI Java Profile Generator, 2/11/24, 10:50 pm
 
 /**
  * Regulatory approval, clearance or licencing related to a regulated product, 
@@ -150,13 +150,21 @@ public class RegulatedAuthorizationUvEpi extends PEGeneratedBase {
   }
 
   /**
-   * Build an instance of the object based on this source object 
+   * Build a instance of the underlying object based on this wrapping object 
    *
    */
   public RegulatedAuthorization build(IWorkerContext context) {
     workerContext = context;
+    return build();
+  }
+
+  /**
+   * Build a instance of the underlying object based on this wrapping object 
+   *
+   */
+  public RegulatedAuthorization build() {
     RegulatedAuthorization theThing = new RegulatedAuthorization();
-    PEBuilder builder = new PEBuilder(context, PEElementPropertiesPolicy.EXTENSION, true);
+    PEBuilder builder = new PEBuilder(workerContext, PEElementPropertiesPolicy.EXTENSION, true);
     PEInstance tgt = builder.buildPEInstance(CANONICAL_URL, theThing);
     save(tgt, false);
     return theThing;

org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/profiles/codegen/SORIdentifier.java

@@ -22,7 +22,7 @@ import org.hl7.fhir.r5.profilemodel.gen.MustSupport;
 import org.hl7.fhir.r5.profilemodel.gen.Definition;
 
 
-// Generated by the HAPI Java Profile Generator, 2/11/24, 12:28 pm
+// Generated by the HAPI Java Profile Generator, 2/11/24, 10:50 pm
 
 /**
  * An identifier - identifies some entity uniquely and unambiguously. Typically 

org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/profiles/codegen/SubstanceDefinitionUvEpi.java

@@ -22,7 +22,7 @@ import org.hl7.fhir.r5.profilemodel.gen.MustSupport;
 import org.hl7.fhir.r5.profilemodel.gen.Definition;
 
 
-// Generated by the HAPI Java Profile Generator, 2/11/24, 12:28 pm
+// Generated by the HAPI Java Profile Generator, 2/11/24, 10:50 pm
 
 /**
  * The detailed description of a substance, typically at a level beyond what is 
@@ -218,13 +218,21 @@ public class SubstanceDefinitionUvEpi extends PEGeneratedBase {
   }
 
   /**
-   * Build an instance of the object based on this source object 
+   * Build a instance of the underlying object based on this wrapping object 
    *
    */
   public SubstanceDefinition build(IWorkerContext context) {
     workerContext = context;
+    return build();
+  }
+
+  /**
+   * Build a instance of the underlying object based on this wrapping object 
+   *
+   */
+  public SubstanceDefinition build() {
     SubstanceDefinition theThing = new SubstanceDefinition();
-    PEBuilder builder = new PEBuilder(context, PEElementPropertiesPolicy.EXTENSION, true);
+    PEBuilder builder = new PEBuilder(workerContext, PEElementPropertiesPolicy.EXTENSION, true);
     PEInstance tgt = builder.buildPEInstance(CANONICAL_URL, theThing);
     save(tgt, false);
     return theThing;