Update to latest data model version

src/main/java/dev/pcvolkmer/mv64e/mtb/AddendumCode.java

@@ -1,34 +0,0 @@
-package dev.pcvolkmer.mv64e.mtb;
-
-import java.io.IOException;
-import com.fasterxml.jackson.annotation.*;
-
-public enum AddendumCode {
-    IS, IV, R, Z;
-
-    @JsonValue
-    public String toValue() {
-        switch (this) {
-            case IS: return "is";
-            case IV: return "iv";
-            case R: return "R";
-            case Z: return "Z";
-        }
-        return null;
-    }
-
-    @JsonCreator
-    public static AddendumCode forValue(String value) throws IOException {
-        switch (value) {
-            case "is":
-                return IS;
-            case "iv":
-                return IV;
-            case "R":
-                return R;
-            case "Z":
-                return Z;
-        }
-        throw new IOException("Cannot deserialize AddendumCode");
-    }
-}

src/main/java/dev/pcvolkmer/mv64e/mtb/AtcUnregisteredMedicationCoding.java

@@ -2,7 +2,7 @@ package dev.pcvolkmer.mv64e.mtb;
 
 import com.fasterxml.jackson.annotation.*;
 
-public class CodingAtcUnregisteredMedication {
+public class AtcUnregisteredMedicationCoding {
     private String code;
     private String display;
     private RequestedMedicationSystem system;

src/main/java/dev/pcvolkmer/mv64e/mtb/BaseVariantLocalizationCoding.java

@@ -2,16 +2,16 @@ package dev.pcvolkmer.mv64e.mtb;
 
 import com.fasterxml.jackson.annotation.*;
 
-public class CodingMtbCarePlanStatusReason {
-    private CodingMtbCarePlanStatusReasonCode code;
+public class BaseVariantLocalizationCoding {
+    private BaseVariantLocalizationCodingCode code;
     private String display;
     private String system;
     private String version;
 
     @JsonProperty("code")
-    public CodingMtbCarePlanStatusReasonCode getCode() { return code; }
+    public BaseVariantLocalizationCodingCode getCode() { return code; }
     @JsonProperty("code")
-    public void setCode(CodingMtbCarePlanStatusReasonCode value) { this.code = value; }
+    public void setCode(BaseVariantLocalizationCodingCode value) { this.code = value; }
 
     @JsonProperty("display")
     public String getDisplay() { return display; }

src/main/java/dev/pcvolkmer/mv64e/mtb/BaseVariantLocalizationCodingCode.java

@@ -3,7 +3,7 @@ package dev.pcvolkmer.mv64e.mtb;
 import java.io.IOException;
 import com.fasterxml.jackson.annotation.*;
 
-public enum CodingBaseVariantLocalizationCode {
+public enum BaseVariantLocalizationCodingCode {
     CODING_REGION, INTERGENIC, INTRONIC, REGULATORY_REGION, SPLICING_REGION;
 
     @JsonValue
@@ -19,12 +19,12 @@ public enum CodingBaseVariantLocalizationCode {
     }
 
     @JsonCreator
-    public static CodingBaseVariantLocalizationCode forValue(String value) throws IOException {
+    public static BaseVariantLocalizationCodingCode forValue(String value) throws IOException {
         if (value.equals("coding-region")) return CODING_REGION;
         if (value.equals("intergenic")) return INTERGENIC;
         if (value.equals("intronic")) return INTRONIC;
         if (value.equals("regulatory-region")) return REGULATORY_REGION;
         if (value.equals("splicing-region")) return SPLICING_REGION;
-        throw new IOException("Cannot deserialize CodingBaseVariantLocalizationCode");
+        throw new IOException("Cannot deserialize BaseVariantLocalizationCodingCode");
     }
 }

src/main/java/dev/pcvolkmer/mv64e/mtb/Brcaness.java

@@ -2,7 +2,7 @@ package dev.pcvolkmer.mv64e.mtb;
 
 import com.fasterxml.jackson.annotation.*;
 
-public class BRCAness {
+public class Brcaness {
     private ConfidenceRange confidenceRange;
     private String id;
     private Reference patient;

src/main/java/dev/pcvolkmer/mv64e/mtb/CarePlanNoSequencingPerformedReasonCoding.java

@@ -0,0 +1,30 @@
+package dev.pcvolkmer.mv64e.mtb;
+
+import com.fasterxml.jackson.annotation.*;
+
+public class CarePlanNoSequencingPerformedReasonCoding {
+    private NoSequencingPerformedReasonCode code;
+    private String display;
+    private String system;
+    private String version;
+
+    @JsonProperty("code")
+    public NoSequencingPerformedReasonCode getCode() { return code; }
+    @JsonProperty("code")
+    public void setCode(NoSequencingPerformedReasonCode value) { this.code = value; }
+
+    @JsonProperty("display")
+    public String getDisplay() { return display; }
+    @JsonProperty("display")
+    public void setDisplay(String value) { this.display = value; }
+
+    @JsonProperty("system")
+    public String getSystem() { return system; }
+    @JsonProperty("system")
+    public void setSystem(String value) { this.system = value; }
+
+    @JsonProperty("version")
+    public String getVersion() { return version; }
+    @JsonProperty("version")
+    public void setVersion(String value) { this.version = value; }
+}

src/main/java/dev/pcvolkmer/mv64e/mtb/Claim.java

@@ -9,8 +9,8 @@ public class Claim {
     private Date issuedOn;
     private Reference patient;
     private Reference recommendation;
-    private List<CodingAtcUnregisteredMedication> requestedMedication;
-    private CodingClaimStage stage;
+    private List<AtcUnregisteredMedicationCoding> requestedMedication;
+    private ClaimStageCoding stage;
 
     @JsonProperty("id")
     public String getId() { return id; }
@@ -35,12 +35,12 @@ public class Claim {
     public void setRecommendation(Reference value) { this.recommendation = value; }
 
     @JsonProperty("requestedMedication")
-    public List<CodingAtcUnregisteredMedication> getRequestedMedication() { return requestedMedication; }
+    public List<AtcUnregisteredMedicationCoding> getRequestedMedication() { return requestedMedication; }
     @JsonProperty("requestedMedication")
-    public void setRequestedMedication(List<CodingAtcUnregisteredMedication> value) { this.requestedMedication = value; }
+    public void setRequestedMedication(List<AtcUnregisteredMedicationCoding> value) { this.requestedMedication = value; }
 
     @JsonProperty("stage")
-    public CodingClaimStage getStage() { return stage; }
+    public ClaimStageCoding getStage() { return stage; }
     @JsonProperty("stage")
-    public void setStage(CodingClaimStage value) { this.stage = value; }
+    public void setStage(ClaimStageCoding value) { this.stage = value; }
 }

src/main/java/dev/pcvolkmer/mv64e/mtb/ClaimResponse.java

@@ -8,8 +8,8 @@ public class ClaimResponse {
     private String id;
     private Date issuedOn;
     private Reference patient;
-    private CodingClaimResponseStatus status;
-    private CodingClaimResponseStatusReason statusReason;
+    private ClaimResponseStatusCoding status;
+    private ClaimResponseStatusReasonCoding statusReason;
 
     @JsonProperty("claim")
     public Reference getClaim() { return claim; }
@@ -34,12 +34,12 @@ public class ClaimResponse {
     public void setPatient(Reference value) { this.patient = value; }
 
     @JsonProperty("status")
-    public CodingClaimResponseStatus getStatus() { return status; }
+    public ClaimResponseStatusCoding getStatus() { return status; }
     @JsonProperty("status")
-    public void setStatus(CodingClaimResponseStatus value) { this.status = value; }
+    public void setStatus(ClaimResponseStatusCoding value) { this.status = value; }
 
     @JsonProperty("statusReason")
-    public CodingClaimResponseStatusReason getStatusReason() { return statusReason; }
+    public ClaimResponseStatusReasonCoding getStatusReason() { return statusReason; }
     @JsonProperty("statusReason")
-    public void setStatusReason(CodingClaimResponseStatusReason value) { this.statusReason = value; }
+    public void setStatusReason(ClaimResponseStatusReasonCoding value) { this.statusReason = value; }
 }

src/main/java/dev/pcvolkmer/mv64e/mtb/ClaimResponseStatusCoding.java

@@ -0,0 +1,30 @@
+package dev.pcvolkmer.mv64e.mtb;
+
+import com.fasterxml.jackson.annotation.*;
+
+public class ClaimResponseStatusCoding {
+    private ClaimResponseStatusCodingCode code;
+    private String display;
+    private String system;
+    private String version;
+
+    @JsonProperty("code")
+    public ClaimResponseStatusCodingCode getCode() { return code; }
+    @JsonProperty("code")
+    public void setCode(ClaimResponseStatusCodingCode value) { this.code = value; }
+
+    @JsonProperty("display")
+    public String getDisplay() { return display; }
+    @JsonProperty("display")
+    public void setDisplay(String value) { this.display = value; }
+
+    @JsonProperty("system")
+    public String getSystem() { return system; }
+    @JsonProperty("system")
+    public void setSystem(String value) { this.system = value; }
+
+    @JsonProperty("version")
+    public String getVersion() { return version; }
+    @JsonProperty("version")
+    public void setVersion(String value) { this.version = value; }
+}

src/main/java/dev/pcvolkmer/mv64e/mtb/ClaimResponseStatusCodingCode.java

@@ -3,7 +3,7 @@ package dev.pcvolkmer.mv64e.mtb;
 import java.io.IOException;
 import com.fasterxml.jackson.annotation.*;
 
-public enum StickyCode {
+public enum ClaimResponseStatusCodingCode {
     ACCEPTED, REJECTED, UNKNOWN;
 
     @JsonValue
@@ -17,10 +17,10 @@ public enum StickyCode {
     }
 
     @JsonCreator
-    public static StickyCode forValue(String value) throws IOException {
+    public static ClaimResponseStatusCodingCode forValue(String value) throws IOException {
         if (value.equals("accepted")) return ACCEPTED;
         if (value.equals("rejected")) return REJECTED;
         if (value.equals("unknown")) return UNKNOWN;
-        throw new IOException("Cannot deserialize StickyCode");
+        throw new IOException("Cannot deserialize ClaimResponseStatusCodingCode");
     }
 }

src/main/java/dev/pcvolkmer/mv64e/mtb/ClaimResponseStatusReasonCoding.java

@@ -2,16 +2,16 @@ package dev.pcvolkmer.mv64e.mtb;
 
 import com.fasterxml.jackson.annotation.*;
 
-public class CodingClaimResponseStatusReason {
-    private CodingClaimResponseStatusReasonCode code;
+public class ClaimResponseStatusReasonCoding {
+    private ClaimResponseStatusReasonCodingCode code;
     private String display;
     private String system;
     private String version;
 
     @JsonProperty("code")
-    public CodingClaimResponseStatusReasonCode getCode() { return code; }
+    public ClaimResponseStatusReasonCodingCode getCode() { return code; }
     @JsonProperty("code")
-    public void setCode(CodingClaimResponseStatusReasonCode value) { this.code = value; }
+    public void setCode(ClaimResponseStatusReasonCodingCode value) { this.code = value; }
 
     @JsonProperty("display")
     public String getDisplay() { return display; }

src/main/java/dev/pcvolkmer/mv64e/mtb/ClaimResponseStatusReasonCodingCode.java

@@ -3,7 +3,7 @@ package dev.pcvolkmer.mv64e.mtb;
 import java.io.IOException;
 import com.fasterxml.jackson.annotation.*;
 
-public enum CodingClaimResponseStatusReasonCode {
+public enum ClaimResponseStatusReasonCodingCode {
     APPROVAL_REVOCATION, FORMAL_REASONS, INCLUSION_IN_STUDY, INSUFFICIENT_EVIDENCE, OTHER, OTHER_THERAPY_RECOMMENDED, STANDARD_THERAPY_NOT_EXHAUSTED, UNKNOWN;
 
     @JsonValue
@@ -22,7 +22,7 @@ public enum CodingClaimResponseStatusReasonCode {
     }
 
     @JsonCreator
-    public static CodingClaimResponseStatusReasonCode forValue(String value) throws IOException {
+    public static ClaimResponseStatusReasonCodingCode forValue(String value) throws IOException {
         if (value.equals("approval-revocation")) return APPROVAL_REVOCATION;
         if (value.equals("formal-reasons")) return FORMAL_REASONS;
         if (value.equals("inclusion-in-study")) return INCLUSION_IN_STUDY;
@@ -31,6 +31,6 @@ public enum CodingClaimResponseStatusReasonCode {
         if (value.equals("other-therapy-recommended")) return OTHER_THERAPY_RECOMMENDED;
         if (value.equals("standard-therapy-not-exhausted")) return STANDARD_THERAPY_NOT_EXHAUSTED;
         if (value.equals("unknown")) return UNKNOWN;
-        throw new IOException("Cannot deserialize CodingClaimResponseStatusReasonCode");
+        throw new IOException("Cannot deserialize ClaimResponseStatusReasonCodingCode");
     }
 }

src/main/java/dev/pcvolkmer/mv64e/mtb/ClaimStageCoding.java

@@ -2,16 +2,16 @@ package dev.pcvolkmer.mv64e.mtb;
 
 import com.fasterxml.jackson.annotation.*;
 
-public class CodingClaimStage {
-    private StageCode code;
+public class ClaimStageCoding {
+    private ClaimStageCodingCode code;
     private String display;
     private String system;
     private String version;
 
     @JsonProperty("code")
-    public StageCode getCode() { return code; }
+    public ClaimStageCodingCode getCode() { return code; }
     @JsonProperty("code")
-    public void setCode(StageCode value) { this.code = value; }
+    public void setCode(ClaimStageCodingCode value) { this.code = value; }
 
     @JsonProperty("display")
     public String getDisplay() { return display; }

src/main/java/dev/pcvolkmer/mv64e/mtb/ClaimStageCodingCode.java

@@ -3,7 +3,7 @@ package dev.pcvolkmer.mv64e.mtb;
 import java.io.IOException;
 import com.fasterxml.jackson.annotation.*;
 
-public enum StageCode {
+public enum ClaimStageCodingCode {
     FOLLOW_UP_CLAIM, INITIAL_CLAIM, REVOCATION, UNKNOWN;
 
     @JsonValue
@@ -18,11 +18,11 @@ public enum StageCode {
     }
 
     @JsonCreator
-    public static StageCode forValue(String value) throws IOException {
+    public static ClaimStageCodingCode forValue(String value) throws IOException {
         if (value.equals("follow-up-claim")) return FOLLOW_UP_CLAIM;
         if (value.equals("initial-claim")) return INITIAL_CLAIM;
         if (value.equals("revocation")) return REVOCATION;
         if (value.equals("unknown")) return UNKNOWN;
-        throw new IOException("Cannot deserialize StageCode");
+        throw new IOException("Cannot deserialize ClaimStageCodingCode");
     }
 }

src/main/java/dev/pcvolkmer/mv64e/mtb/ClinVarCoding.java

@@ -2,16 +2,16 @@ package dev.pcvolkmer.mv64e.mtb;
 
 import com.fasterxml.jackson.annotation.*;
 
-public class CodingClinVar {
-    private CodingClinVarCode code;
+public class ClinVarCoding {
+    private ClinVarCodingCode code;
     private String display;
     private String system;
     private String version;
 
     @JsonProperty("code")
-    public CodingClinVarCode getCode() { return code; }
+    public ClinVarCodingCode getCode() { return code; }
     @JsonProperty("code")
-    public void setCode(CodingClinVarCode value) { this.code = value; }
+    public void setCode(ClinVarCodingCode value) { this.code = value; }
 
     @JsonProperty("display")
     public String getDisplay() { return display; }

src/main/java/dev/pcvolkmer/mv64e/mtb/ClinVarCodingCode.java

@@ -0,0 +1,30 @@
+package dev.pcvolkmer.mv64e.mtb;
+
+import java.io.IOException;
+import com.fasterxml.jackson.annotation.*;
+
+public enum ClinVarCodingCode {
+    CODE_1, CODE_2, CODE_3, CODE_4, CODE_5;
+
+    @JsonValue
+    public String toValue() {
+        switch (this) {
+            case CODE_1: return "1";
+            case CODE_2: return "2";
+            case CODE_3: return "3";
+            case CODE_4: return "4";
+            case CODE_5: return "5";
+        }
+        return null;
+    }
+
+    @JsonCreator
+    public static ClinVarCodingCode forValue(String value) throws IOException {
+        if (value.equals("1")) return CODE_1;
+        if (value.equals("2")) return CODE_2;
+        if (value.equals("3")) return CODE_3;
+        if (value.equals("4")) return CODE_4;
+        if (value.equals("5")) return CODE_5;
+        throw new IOException("Cannot deserialize ClinVarCodingCode");
+    }
+}

src/main/java/dev/pcvolkmer/mv64e/mtb/Cnv.java

@@ -11,14 +11,14 @@ public class Cnv {
     private EndRange endRange;
     private List<VariantExternalId> externalIds;
     private String id;
-    private List<CodingBaseVariantLocalization> localization;
+    private List<BaseVariantLocalizationCoding> localization;
     private Reference patient;
     private Double relativeCopyNumber;
     private List<Coding> reportedAffectedGenes;
     private String reportedFocality;
     private StartRange startRange;
     private Long totalCopyNumber;
-    private CodingCnv type;
+    private CnvCoding type;
 
     @JsonProperty("chromosome")
     public Chromosome getChromosome() { return chromosome; }
@@ -56,9 +56,9 @@ public class Cnv {
     public void setId(String value) { this.id = value; }
 
     @JsonProperty("localization")
-    public List<CodingBaseVariantLocalization> getLocalization() { return localization; }
+    public List<BaseVariantLocalizationCoding> getLocalization() { return localization; }
     @JsonProperty("localization")
-    public void setLocalization(List<CodingBaseVariantLocalization> value) { this.localization = value; }
+    public void setLocalization(List<BaseVariantLocalizationCoding> value) { this.localization = value; }
 
     @JsonProperty("patient")
     public Reference getPatient() { return patient; }
@@ -91,7 +91,7 @@ public class Cnv {
     public void setTotalCopyNumber(Long value) { this.totalCopyNumber = value; }
 
     @JsonProperty("type")
-    public CodingCnv getType() { return type; }
+    public CnvCoding getType() { return type; }
     @JsonProperty("type")
-    public void setType(CodingCnv value) { this.type = value; }
+    public void setType(CnvCoding value) { this.type = value; }
 }

src/main/java/dev/pcvolkmer/mv64e/mtb/CnvCoding.java

@@ -2,16 +2,16 @@ package dev.pcvolkmer.mv64e.mtb;
 
 import com.fasterxml.jackson.annotation.*;
 
-public class CodingCnv {
-    private CodingCnvCode code;
+public class CnvCoding {
+    private CnvCodingCode code;
     private String display;
     private String system;
     private String version;
 
     @JsonProperty("code")
-    public CodingCnvCode getCode() { return code; }
+    public CnvCodingCode getCode() { return code; }
     @JsonProperty("code")
-    public void setCode(CodingCnvCode value) { this.code = value; }
+    public void setCode(CnvCodingCode value) { this.code = value; }
 
     @JsonProperty("display")
     public String getDisplay() { return display; }

src/main/java/dev/pcvolkmer/mv64e/mtb/CnvCodingCode.java

@@ -3,7 +3,7 @@ package dev.pcvolkmer.mv64e.mtb;
 import java.io.IOException;
 import com.fasterxml.jackson.annotation.*;
 
-public enum CodingCnvCode {
+public enum CnvCodingCode {
     HIGH_LEVEL_GAIN, LOSS, LOW_LEVEL_GAIN;
 
     @JsonValue
@@ -17,10 +17,10 @@ public enum CodingCnvCode {
     }
 
     @JsonCreator
-    public static CodingCnvCode forValue(String value) throws IOException {
+    public static CnvCodingCode forValue(String value) throws IOException {
         if (value.equals("high-level-gain")) return HIGH_LEVEL_GAIN;
         if (value.equals("loss")) return LOSS;
         if (value.equals("low-level-gain")) return LOW_LEVEL_GAIN;
-        throw new IOException("Cannot deserialize CodingCnvCode");
+        throw new IOException("Cannot deserialize CnvCodingCode");
     }
 }

src/main/java/dev/pcvolkmer/mv64e/mtb/CodingClinVarCode.java

@@ -1,30 +0,0 @@
-package dev.pcvolkmer.mv64e.mtb;
-
-import java.io.IOException;
-import com.fasterxml.jackson.annotation.*;
-
-public enum CodingClinVarCode {
-    THE_1, THE_2, THE_3, THE_4, THE_5;
-
-    @JsonValue
-    public String toValue() {
-        switch (this) {
-            case THE_1: return "1";
-            case THE_2: return "2";
-            case THE_3: return "3";
-            case THE_4: return "4";
-            case THE_5: return "5";
-        }
-        return null;
-    }
-
-    @JsonCreator
-    public static CodingClinVarCode forValue(String value) throws IOException {
-        if (value.equals("1")) return THE_1;
-        if (value.equals("2")) return THE_2;
-        if (value.equals("3")) return THE_3;
-        if (value.equals("4")) return THE_4;
-        if (value.equals("5")) return THE_5;
-        throw new IOException("Cannot deserialize CodingClinVarCode");
-    }
-}

src/main/java/dev/pcvolkmer/mv64e/mtb/CodingEcogCode.java

@@ -1,32 +0,0 @@
-package dev.pcvolkmer.mv64e.mtb;
-
-import java.io.IOException;
-import com.fasterxml.jackson.annotation.*;
-
-public enum CodingEcogCode {
-    THE_0, THE_1, THE_2, THE_3, THE_4, THE_5;
-
-    @JsonValue
-    public String toValue() {
-        switch (this) {
-            case THE_0: return "0";
-            case THE_1: return "1";
-            case THE_2: return "2";
-            case THE_3: return "3";
-            case THE_4: return "4";
-            case THE_5: return "5";
-        }
-        return null;
-    }
-
-    @JsonCreator
-    public static CodingEcogCode forValue(String value) throws IOException {
-        if (value.equals("0")) return THE_0;
-        if (value.equals("1")) return THE_1;
-        if (value.equals("2")) return THE_2;
-        if (value.equals("3")) return THE_3;
-        if (value.equals("4")) return THE_4;
-        if (value.equals("5")) return THE_5;
-        throw new IOException("Cannot deserialize CodingEcogCode");
-    }
-}

src/main/java/dev/pcvolkmer/mv64e/mtb/CodingFollowUpPatientStatus.java

@@ -1,30 +0,0 @@
-package dev.pcvolkmer.mv64e.mtb;
-
-import com.fasterxml.jackson.annotation.*;
-
-public class CodingFollowUpPatientStatus {
-    private PatientStatusCode code;
-    private String display;
-    private String system;
-    private String version;
-
-    @JsonProperty("code")
-    public PatientStatusCode getCode() { return code; }
-    @JsonProperty("code")
-    public void setCode(PatientStatusCode value) { this.code = value; }
-
-    @JsonProperty("display")
-    public String getDisplay() { return display; }
-    @JsonProperty("display")
-    public void setDisplay(String value) { this.display = value; }
-
-    @JsonProperty("system")
-    public String getSystem() { return system; }
-    @JsonProperty("system")
-    public void setSystem(String value) { this.system = value; }
-
-    @JsonProperty("version")
-    public String getVersion() { return version; }
-    @JsonProperty("version")
-    public void setVersion(String value) { this.version = value; }
-}

src/main/java/dev/pcvolkmer/mv64e/mtb/CodingHrdScoreInterpretation.java

@@ -1,30 +0,0 @@
-package dev.pcvolkmer.mv64e.mtb;
-
-import com.fasterxml.jackson.annotation.*;
-
-public class CodingHrdScoreInterpretation {
-    private InterpretationCode code;
-    private String display;
-    private String system;
-    private String version;
-
-    @JsonProperty("code")
-    public InterpretationCode getCode() { return code; }
-    @JsonProperty("code")
-    public void setCode(InterpretationCode value) { this.code = value; }
-
-    @JsonProperty("display")
-    public String getDisplay() { return display; }
-    @JsonProperty("display")
-    public void setDisplay(String value) { this.display = value; }
-
-    @JsonProperty("system")
-    public String getSystem() { return system; }
-    @JsonProperty("system")
-    public void setSystem(String value) { this.system = value; }
-
-    @JsonProperty("version")
-    public String getVersion() { return version; }
-    @JsonProperty("version")
-    public void setVersion(String value) { this.version = value; }
-}

src/main/java/dev/pcvolkmer/mv64e/mtb/CodingLevelOfEvidenceAddendum.java

@@ -1,30 +0,0 @@
-package dev.pcvolkmer.mv64e.mtb;
-
-import com.fasterxml.jackson.annotation.*;
-
-public class CodingLevelOfEvidenceAddendum {
-    private AddendumCode code;
-    private String display;
-    private String system;
-    private String version;
-
-    @JsonProperty("code")
-    public AddendumCode getCode() { return code; }
-    @JsonProperty("code")
-    public void setCode(AddendumCode value) { this.code = value; }
-
-    @JsonProperty("display")
-    public String getDisplay() { return display; }
-    @JsonProperty("display")
-    public void setDisplay(String value) { this.display = value; }
-
-    @JsonProperty("system")
-    public String getSystem() { return system; }
-    @JsonProperty("system")
-    public void setSystem(String value) { this.system = value; }
-
-    @JsonProperty("version")
-    public String getVersion() { return version; }
-    @JsonProperty("version")
-    public void setVersion(String value) { this.version = value; }
-}

src/main/java/dev/pcvolkmer/mv64e/mtb/CodingLevelOfEvidenceGrading.java

@@ -1,30 +0,0 @@
-package dev.pcvolkmer.mv64e.mtb;
-
-import com.fasterxml.jackson.annotation.*;
-
-public class CodingLevelOfEvidenceGrading {
-    private LevelOfEvidenceCode code;
-    private String display;
-    private String system;
-    private String version;
-
-    @JsonProperty("code")
-    public LevelOfEvidenceCode getCode() { return code; }
-    @JsonProperty("code")
-    public void setCode(LevelOfEvidenceCode value) { this.code = value; }
-
-    @JsonProperty("display")
-    public String getDisplay() { return display; }
-    @JsonProperty("display")
-    public void setDisplay(String value) { this.display = value; }
-
-    @JsonProperty("system")
-    public String getSystem() { return system; }
-    @JsonProperty("system")
-    public void setSystem(String value) { this.system = value; }
-
-    @JsonProperty("version")
-    public String getVersion() { return version; }
-    @JsonProperty("version")
-    public void setVersion(String value) { this.version = value; }
-}

src/main/java/dev/pcvolkmer/mv64e/mtb/CodingMtbDiagnosis.java

@@ -1,30 +0,0 @@
-package dev.pcvolkmer.mv64e.mtb;
-
-import com.fasterxml.jackson.annotation.*;
-
-public class CodingMtbDiagnosis {
-    private CodingMtbDiagnosisCode code;
-    private String display;
-    private String system;
-    private String version;
-
-    @JsonProperty("code")
-    public CodingMtbDiagnosisCode getCode() { return code; }
-    @JsonProperty("code")
-    public void setCode(CodingMtbDiagnosisCode value) { this.code = value; }
-
-    @JsonProperty("display")
-    public String getDisplay() { return display; }
-    @JsonProperty("display")
-    public void setDisplay(String value) { this.display = value; }
-
-    @JsonProperty("system")
-    public String getSystem() { return system; }
-    @JsonProperty("system")
-    public void setSystem(String value) { this.system = value; }
-
-    @JsonProperty("version")
-    public String getVersion() { return version; }
-    @JsonProperty("version")
-    public void setVersion(String value) { this.version = value; }
-}

src/main/java/dev/pcvolkmer/mv64e/mtb/CodingMtbDiagnosisGuidelineTreatmentStatus.java

@@ -1,30 +0,0 @@
-package dev.pcvolkmer.mv64e.mtb;
-
-import com.fasterxml.jackson.annotation.*;
-
-public class CodingMtbDiagnosisGuidelineTreatmentStatus {
-    private GuidelineTreatmentStatusCode code;
-    private String display;
-    private String system;
-    private String version;
-
-    @JsonProperty("code")
-    public GuidelineTreatmentStatusCode getCode() { return code; }
-    @JsonProperty("code")
-    public void setCode(GuidelineTreatmentStatusCode value) { this.code = value; }
-
-    @JsonProperty("display")
-    public String getDisplay() { return display; }
-    @JsonProperty("display")
-    public void setDisplay(String value) { this.display = value; }
-
-    @JsonProperty("system")
-    public String getSystem() { return system; }
-    @JsonProperty("system")
-    public void setSystem(String value) { this.system = value; }
-
-    @JsonProperty("version")
-    public String getVersion() { return version; }
-    @JsonProperty("version")
-    public void setVersion(String value) { this.version = value; }
-}

src/main/java/dev/pcvolkmer/mv64e/mtb/CodingMtbMedicationRecommendationUseType.java

@@ -1,30 +0,0 @@
-package dev.pcvolkmer.mv64e.mtb;
-
-import com.fasterxml.jackson.annotation.*;
-
-public class CodingMtbMedicationRecommendationUseType {
-    private UseTypeCode code;
-    private String display;
-    private String system;
-    private String version;
-
-    @JsonProperty("code")
-    public UseTypeCode getCode() { return code; }
-    @JsonProperty("code")
-    public void setCode(UseTypeCode value) { this.code = value; }
-
-    @JsonProperty("display")
-    public String getDisplay() { return display; }
-    @JsonProperty("display")
-    public void setDisplay(String value) { this.display = value; }
-
-    @JsonProperty("system")
-    public String getSystem() { return system; }
-    @JsonProperty("system")
-    public void setSystem(String value) { this.system = value; }
-
-    @JsonProperty("version")
-    public String getVersion() { return version; }
-    @JsonProperty("version")
-    public void setVersion(String value) { this.version = value; }
-}

src/main/java/dev/pcvolkmer/mv64e/mtb/CodingMtbSystemicTherapyRecommendationFulfillmentStatus.java

@@ -1,30 +0,0 @@
-package dev.pcvolkmer.mv64e.mtb;
-
-import com.fasterxml.jackson.annotation.*;
-
-public class CodingMtbSystemicTherapyRecommendationFulfillmentStatus {
-    private RecommendationFulfillmentStatusCode code;
-    private String display;
-    private String system;
-    private String version;
-
-    @JsonProperty("code")
-    public RecommendationFulfillmentStatusCode getCode() { return code; }
-    @JsonProperty("code")
-    public void setCode(RecommendationFulfillmentStatusCode value) { this.code = value; }
-
-    @JsonProperty("display")
-    public String getDisplay() { return display; }
-    @JsonProperty("display")
-    public void setDisplay(String value) { this.display = value; }
-
-    @JsonProperty("system")
-    public String getSystem() { return system; }
-    @JsonProperty("system")
-    public void setSystem(String value) { this.system = value; }
-
-    @JsonProperty("version")
-    public String getVersion() { return version; }
-    @JsonProperty("version")
-    public void setVersion(String value) { this.version = value; }
-}

src/main/java/dev/pcvolkmer/mv64e/mtb/CodingProteinExpressionIcScore.java

@@ -1,30 +0,0 @@
-package dev.pcvolkmer.mv64e.mtb;
-
-import com.fasterxml.jackson.annotation.*;
-
-public class CodingProteinExpressionIcScore {
-    private ICScoreCode code;
-    private String display;
-    private String system;
-    private String version;
-
-    @JsonProperty("code")
-    public ICScoreCode getCode() { return code; }
-    @JsonProperty("code")
-    public void setCode(ICScoreCode value) { this.code = value; }
-
-    @JsonProperty("display")
-    public String getDisplay() { return display; }
-    @JsonProperty("display")
-    public void setDisplay(String value) { this.display = value; }
-
-    @JsonProperty("system")
-    public String getSystem() { return system; }
-    @JsonProperty("system")
-    public void setSystem(String value) { this.system = value; }
-
-    @JsonProperty("version")
-    public String getVersion() { return version; }
-    @JsonProperty("version")
-    public void setVersion(String value) { this.version = value; }
-}

src/main/java/dev/pcvolkmer/mv64e/mtb/CodingProteinExpressionTcScore.java

@@ -1,30 +0,0 @@
-package dev.pcvolkmer.mv64e.mtb;
-
-import com.fasterxml.jackson.annotation.*;
-
-public class CodingProteinExpressionTcScore {
-    private TcScoreCode code;
-    private String display;
-    private String system;
-    private String version;
-
-    @JsonProperty("code")
-    public TcScoreCode getCode() { return code; }
-    @JsonProperty("code")
-    public void setCode(TcScoreCode value) { this.code = value; }
-
-    @JsonProperty("display")
-    public String getDisplay() { return display; }
-    @JsonProperty("display")
-    public void setDisplay(String value) { this.display = value; }
-
-    @JsonProperty("system")
-    public String getSystem() { return system; }
-    @JsonProperty("system")
-    public void setSystem(String value) { this.system = value; }
-
-    @JsonProperty("version")
-    public String getVersion() { return version; }
-    @JsonProperty("version")
-    public void setVersion(String value) { this.version = value; }
-}

src/main/java/dev/pcvolkmer/mv64e/mtb/CodingRecommendationPriority.java

@@ -1,30 +0,0 @@
-package dev.pcvolkmer.mv64e.mtb;
-
-import com.fasterxml.jackson.annotation.*;
-
-public class CodingRecommendationPriority {
-    private PriorityCode code;
-    private String display;
-    private String system;
-    private String version;
-
-    @JsonProperty("code")
-    public PriorityCode getCode() { return code; }
-    @JsonProperty("code")
-    public void setCode(PriorityCode value) { this.code = value; }
-
-    @JsonProperty("display")
-    public String getDisplay() { return display; }
-    @JsonProperty("display")
-    public void setDisplay(String value) { this.display = value; }
-
-    @JsonProperty("system")
-    public String getSystem() { return system; }
-    @JsonProperty("system")
-    public void setSystem(String value) { this.system = value; }
-
-    @JsonProperty("version")
-    public String getVersion() { return version; }
-    @JsonProperty("version")
-    public void setVersion(String value) { this.version = value; }
-}

src/main/java/dev/pcvolkmer/mv64e/mtb/CodingTmbInterpretation.java

@@ -1,30 +0,0 @@
-package dev.pcvolkmer.mv64e.mtb;
-
-import com.fasterxml.jackson.annotation.*;
-
-public class CodingTmbInterpretation {
-    private InterpretationCode code;
-    private String display;
-    private String system;
-    private String version;
-
-    @JsonProperty("code")
-    public InterpretationCode getCode() { return code; }
-    @JsonProperty("code")
-    public void setCode(InterpretationCode value) { this.code = value; }
-
-    @JsonProperty("display")
-    public String getDisplay() { return display; }
-    @JsonProperty("display")
-    public void setDisplay(String value) { this.display = value; }
-
-    @JsonProperty("system")
-    public String getSystem() { return system; }
-    @JsonProperty("system")
-    public void setSystem(String value) { this.system = value; }
-
-    @JsonProperty("version")
-    public String getVersion() { return version; }
-    @JsonProperty("version")
-    public void setVersion(String value) { this.version = value; }
-}

src/main/java/dev/pcvolkmer/mv64e/mtb/CodingVitalStatus.java

@@ -1,30 +0,0 @@
-package dev.pcvolkmer.mv64e.mtb;
-
-import com.fasterxml.jackson.annotation.*;
-
-public class CodingVitalStatus {
-    private VitalStatusCode code;
-    private String display;
-    private String system;
-    private String version;
-
-    @JsonProperty("code")
-    public VitalStatusCode getCode() { return code; }
-    @JsonProperty("code")
-    public void setCode(VitalStatusCode value) { this.code = value; }
-
-    @JsonProperty("display")
-    public String getDisplay() { return display; }
-    @JsonProperty("display")
-    public void setDisplay(String value) { this.display = value; }
-
-    @JsonProperty("system")
-    public String getSystem() { return system; }
-    @JsonProperty("system")
-    public void setSystem(String value) { this.system = value; }
-
-    @JsonProperty("version")
-    public String getVersion() { return version; }
-    @JsonProperty("version")
-    public void setVersion(String value) { this.version = value; }
-}

src/main/java/dev/pcvolkmer/mv64e/mtb/Collection.java

@@ -5,8 +5,8 @@ import java.util.Date;
 
 public class Collection {
     private Date date;
-    private CodingTumorSpecimenCollectionLocalization localization;
-    private CodingTumorSpecimenCollectionMethod method;
+    private TumorSpecimenCollectionLocalizationCoding localization;
+    private TumorSpecimenCollectionMethodCoding method;
 
     @JsonProperty("date")
     public Date getDate() { return date; }
@@ -14,12 +14,12 @@ public class Collection {
     public void setDate(Date value) { this.date = value; }
 
     @JsonProperty("localization")
-    public CodingTumorSpecimenCollectionLocalization getLocalization() { return localization; }
+    public TumorSpecimenCollectionLocalizationCoding getLocalization() { return localization; }
     @JsonProperty("localization")
-    public void setLocalization(CodingTumorSpecimenCollectionLocalization value) { this.localization = value; }
+    public void setLocalization(TumorSpecimenCollectionLocalizationCoding value) { this.localization = value; }
 
     @JsonProperty("method")
-    public CodingTumorSpecimenCollectionMethod getMethod() { return method; }
+    public TumorSpecimenCollectionMethodCoding getMethod() { return method; }
     @JsonProperty("method")
-    public void setMethod(CodingTumorSpecimenCollectionMethod value) { this.method = value; }
+    public void setMethod(TumorSpecimenCollectionMethodCoding value) { this.method = value; }
 }

src/main/java/dev/pcvolkmer/mv64e/mtb/ConsentProvision.java

@@ -0,0 +1,24 @@
+package dev.pcvolkmer.mv64e.mtb;
+
+import java.io.IOException;
+import com.fasterxml.jackson.annotation.*;
+
+public enum ConsentProvision {
+    DENY, PERMIT;
+
+    @JsonValue
+    public String toValue() {
+        switch (this) {
+            case DENY: return "deny";
+            case PERMIT: return "permit";
+        }
+        return null;
+    }
+
+    @JsonCreator
+    public static ConsentProvision forValue(String value) throws IOException {
+        if (value.equals("deny")) return DENY;
+        if (value.equals("permit")) return PERMIT;
+        throw new IOException("Cannot deserialize ConsentProvision");
+    }
+}

src/main/java/dev/pcvolkmer/mv64e/mtb/DnaFusion.java

@@ -3,12 +3,12 @@ package dev.pcvolkmer.mv64e.mtb;
 import com.fasterxml.jackson.annotation.*;
 import java.util.List;
 
-public class DNAFusion {
+public class DnaFusion {
     private List<VariantExternalId> externalIds;
     private DnaFusionFusionPartner3Prime fusionPartner3Prime;
     private DnaFusionFusionPartner5Prime fusionPartner5Prime;
     private String id;
-    private List<CodingBaseVariantLocalization> localization;
+    private List<BaseVariantLocalizationCoding> localization;
     private Reference patient;
     private long reportedNumReads;
 
@@ -33,9 +33,9 @@ public class DNAFusion {
     public void setId(String value) { this.id = value; }
 
     @JsonProperty("localization")
-    public List<CodingBaseVariantLocalization> getLocalization() { return localization; }
+    public List<BaseVariantLocalizationCoding> getLocalization() { return localization; }
     @JsonProperty("localization")
-    public void setLocalization(List<CodingBaseVariantLocalization> value) { this.localization = value; }
+    public void setLocalization(List<BaseVariantLocalizationCoding> value) { this.localization = value; }
 
     @JsonProperty("patient")
     public Reference getPatient() { return patient; }

src/main/java/dev/pcvolkmer/mv64e/mtb/EcogCoding.java

@@ -2,16 +2,16 @@ package dev.pcvolkmer.mv64e.mtb;
 
 import com.fasterxml.jackson.annotation.*;
 
-public class CodingEcog {
-    private CodingEcogCode code;
+public class EcogCoding {
+    private EcogCodingCode code;
     private String display;
     private String system;
     private String version;
 
     @JsonProperty("code")
-    public CodingEcogCode getCode() { return code; }
+    public EcogCodingCode getCode() { return code; }
     @JsonProperty("code")
-    public void setCode(CodingEcogCode value) { this.code = value; }
+    public void setCode(EcogCodingCode value) { this.code = value; }
 
     @JsonProperty("display")
     public String getDisplay() { return display; }

src/main/java/dev/pcvolkmer/mv64e/mtb/EcogCodingCode.java

@@ -0,0 +1,32 @@
+package dev.pcvolkmer.mv64e.mtb;
+
+import java.io.IOException;
+import com.fasterxml.jackson.annotation.*;
+
+public enum EcogCodingCode {
+    CODE_0, CODE_1, CODE_2, CODE_3, CODE_4, CODE_5;
+
+    @JsonValue
+    public String toValue() {
+        switch (this) {
+            case CODE_0: return "0";
+            case CODE_1: return "1";
+            case CODE_2: return "2";
+            case CODE_3: return "3";
+            case CODE_4: return "4";
+            case CODE_5: return "5";
+        }
+        return null;
+    }
+
+    @JsonCreator
+    public static EcogCodingCode forValue(String value) throws IOException {
+        if (value.equals("0")) return CODE_0;
+        if (value.equals("1")) return CODE_1;
+        if (value.equals("2")) return CODE_2;
+        if (value.equals("3")) return CODE_3;
+        if (value.equals("4")) return CODE_4;
+        if (value.equals("5")) return CODE_5;
+        throw new IOException("Cannot deserialize EcogCodingCode");
+    }
+}

src/main/java/dev/pcvolkmer/mv64e/mtb/ExternalIdSystem.java

@@ -4,25 +4,25 @@ import java.io.IOException;
 import com.fasterxml.jackson.annotation.*;
 
 public enum ExternalIdSystem {
-    HTTPS_CANCER_SANGER_Ac_UK_COSMIC, HTTPS_Www_ENSEMBL_ORG, HTTPS_Www_NCBI_NLM_NIH_GOV_ENTREZ, HTTPS_Www_NCBI_NLM_NIH_GOV_SNP;
+    CANCER_SANGER_AC_UK_COSMIC, ENSEMBL_ORG, NCBI_NLM_NIH_GOV_ENTREZ, NCBI_NLM_NIH_GOV_SNP;
 
     @JsonValue
     public String toValue() {
         switch (this) {
-            case HTTPS_CANCER_SANGER_Ac_UK_COSMIC: return "https://cancer.sanger.ac.uk/cosmic";
-            case HTTPS_Www_ENSEMBL_ORG: return "https://www.ensembl.org";
-            case HTTPS_Www_NCBI_NLM_NIH_GOV_ENTREZ: return "https://www.ncbi.nlm.nih.gov/entrez";
-            case HTTPS_Www_NCBI_NLM_NIH_GOV_SNP: return "https://www.ncbi.nlm.nih.gov/snp";
+            case CANCER_SANGER_AC_UK_COSMIC: return "https://cancer.sanger.ac.uk/cosmic";
+            case ENSEMBL_ORG: return "https://www.ensembl.org";
+            case NCBI_NLM_NIH_GOV_ENTREZ: return "https://www.ncbi.nlm.nih.gov/entrez";
+            case NCBI_NLM_NIH_GOV_SNP: return "https://www.ncbi.nlm.nih.gov/snp";
         }
         return null;
     }
 
     @JsonCreator
     public static ExternalIdSystem forValue(String value) throws IOException {
-        if (value.equals("https://cancer.sanger.ac.uk/cosmic")) return HTTPS_CANCER_SANGER_Ac_UK_COSMIC;
-        if (value.equals("https://www.ensembl.org")) return HTTPS_Www_ENSEMBL_ORG;
-        if (value.equals("https://www.ncbi.nlm.nih.gov/entrez")) return HTTPS_Www_NCBI_NLM_NIH_GOV_ENTREZ;
-        if (value.equals("https://www.ncbi.nlm.nih.gov/snp")) return HTTPS_Www_NCBI_NLM_NIH_GOV_SNP;
+        if (value.equals("https://cancer.sanger.ac.uk/cosmic")) return CANCER_SANGER_AC_UK_COSMIC;
+        if (value.equals("https://www.ensembl.org")) return ENSEMBL_ORG;
+        if (value.equals("https://www.ncbi.nlm.nih.gov/entrez")) return NCBI_NLM_NIH_GOV_ENTREZ;
+        if (value.equals("https://www.ncbi.nlm.nih.gov/snp")) return NCBI_NLM_NIH_GOV_SNP;
         throw new IOException("Cannot deserialize ExternalIdSystem");
     }
 }

src/main/java/dev/pcvolkmer/mv64e/mtb/FollowUp.java

@@ -5,7 +5,9 @@ import java.util.Date;
 
 public class FollowUp {
     private Date date;
-    private CodingFollowUpPatientStatus patientStatus;
+    private Date lastContactDate;
+    private Reference patient;
+    private FollowUpPatientStatusCoding patientStatus;
 
     @JsonProperty("date")
     @JsonFormat(pattern = "yyyy-MM-dd")
@@ -14,8 +16,18 @@ public class FollowUp {
     @JsonFormat(pattern = "yyyy-MM-dd")
     public void setDate(Date value) { this.date = value; }
 
+    @JsonProperty("lastContactDate")
+    public Date getLastContactDate() { return lastContactDate; }
+    @JsonProperty("lastContactDate")
+    public void setLastContactDate(Date value) { this.lastContactDate = value; }
+
+    @JsonProperty("patient")
+    public Reference getPatient() { return patient; }
+    @JsonProperty("patient")
+    public void setPatient(Reference value) { this.patient = value; }
+
     @JsonProperty("patientStatus")
-    public CodingFollowUpPatientStatus getPatientStatus() { return patientStatus; }
+    public FollowUpPatientStatusCoding getPatientStatus() { return patientStatus; }
     @JsonProperty("patientStatus")
-    public void setPatientStatus(CodingFollowUpPatientStatus value) { this.patientStatus = value; }
+    public void setPatientStatus(FollowUpPatientStatusCoding value) { this.patientStatus = value; }
 }

src/main/java/dev/pcvolkmer/mv64e/mtb/FollowUpPatientStatusCoding.java

@@ -0,0 +1,30 @@
+package dev.pcvolkmer.mv64e.mtb;
+
+import com.fasterxml.jackson.annotation.*;
+
+public class FollowUpPatientStatusCoding {
+    private FollowUpPatientStatusCodingCode code;
+    private String display;
+    private String system;
+    private String version;
+
+    @JsonProperty("code")
+    public FollowUpPatientStatusCodingCode getCode() { return code; }
+    @JsonProperty("code")
+    public void setCode(FollowUpPatientStatusCodingCode value) { this.code = value; }
+
+    @JsonProperty("display")
+    public String getDisplay() { return display; }
+    @JsonProperty("display")
+    public void setDisplay(String value) { this.display = value; }
+
+    @JsonProperty("system")
+    public String getSystem() { return system; }
+    @JsonProperty("system")
+    public void setSystem(String value) { this.system = value; }
+
+    @JsonProperty("version")
+    public String getVersion() { return version; }
+    @JsonProperty("version")
+    public void setVersion(String value) { this.version = value; }
+}

src/main/java/dev/pcvolkmer/mv64e/mtb/FollowUpPatientStatusCodingCode.java

@@ -3,7 +3,7 @@ package dev.pcvolkmer.mv64e.mtb;
 import java.io.IOException;
 import com.fasterxml.jackson.annotation.*;
 
-public enum PatientStatusCode {
+public enum FollowUpPatientStatusCodingCode {
     LOST_TO_FU;
 
     @JsonValue
@@ -15,8 +15,8 @@ public enum PatientStatusCode {
     }
 
     @JsonCreator
-    public static PatientStatusCode forValue(String value) throws IOException {
+    public static FollowUpPatientStatusCodingCode forValue(String value) throws IOException {
         if (value.equals("lost-to-fu")) return LOST_TO_FU;
-        throw new IOException("Cannot deserialize PatientStatusCode");
+        throw new IOException("Cannot deserialize FollowUpPatientStatusCodingCode");
     }
 }

src/main/java/dev/pcvolkmer/mv64e/mtb/GenderCoding.java

@@ -2,16 +2,16 @@ package dev.pcvolkmer.mv64e.mtb;
 
 import com.fasterxml.jackson.annotation.*;
 
-public class CodingRecist {
-    private CodingRecistCode code;
+public class GenderCoding {
+    private GenderCodingCode code;
     private String display;
     private String system;
     private String version;
 
     @JsonProperty("code")
-    public CodingRecistCode getCode() { return code; }
+    public GenderCodingCode getCode() { return code; }
     @JsonProperty("code")
-    public void setCode(CodingRecistCode value) { this.code = value; }
+    public void setCode(GenderCodingCode value) { this.code = value; }
 
     @JsonProperty("display")
     public String getDisplay() { return display; }

src/main/java/dev/pcvolkmer/mv64e/mtb/GenderCodingCode.java

@@ -3,7 +3,7 @@ package dev.pcvolkmer.mv64e.mtb;
 import java.io.IOException;
 import com.fasterxml.jackson.annotation.*;
 
-public enum GenderCode {
+public enum GenderCodingCode {
     FEMALE, MALE, OTHER, UNKNOWN;
 
     @JsonValue
@@ -18,11 +18,11 @@ public enum GenderCode {
     }
 
     @JsonCreator
-    public static GenderCode forValue(String value) throws IOException {
+    public static GenderCodingCode forValue(String value) throws IOException {
         if (value.equals("female")) return FEMALE;
         if (value.equals("male")) return MALE;
         if (value.equals("other")) return OTHER;
         if (value.equals("unknown")) return UNKNOWN;
-        throw new IOException("Cannot deserialize GenderCode");
+        throw new IOException("Cannot deserialize GenderCodingCode");
     }
 }

src/main/java/dev/pcvolkmer/mv64e/mtb/GeneticCounselingRecommendation.java

@@ -7,7 +7,7 @@ public class GeneticCounselingRecommendation {
     private String id;
     private Date issuedOn;
     private Reference patient;
-    private CodingGeneticCounselingRecommendationReason reason;
+    private GeneticCounselingRecommendationReasonCoding reason;
 
     @JsonProperty("id")
     public String getId() { return id; }
@@ -27,7 +27,7 @@ public class GeneticCounselingRecommendation {
     public void setPatient(Reference value) { this.patient = value; }
 
     @JsonProperty("reason")
-    public CodingGeneticCounselingRecommendationReason getReason() { return reason; }
+    public GeneticCounselingRecommendationReasonCoding getReason() { return reason; }
     @JsonProperty("reason")
-    public void setReason(CodingGeneticCounselingRecommendationReason value) { this.reason = value; }
+    public void setReason(GeneticCounselingRecommendationReasonCoding value) { this.reason = value; }
 }

src/main/java/dev/pcvolkmer/mv64e/mtb/GeneticCounselingRecommendationReasonCoding.java

@@ -0,0 +1,30 @@
+package dev.pcvolkmer.mv64e.mtb;
+
+import com.fasterxml.jackson.annotation.*;
+
+public class GeneticCounselingRecommendationReasonCoding {
+    private GeneticCounselingRecommendationReasonCodingCode code;
+    private String display;
+    private String system;
+    private String version;
+
+    @JsonProperty("code")
+    public GeneticCounselingRecommendationReasonCodingCode getCode() { return code; }
+    @JsonProperty("code")
+    public void setCode(GeneticCounselingRecommendationReasonCodingCode value) { this.code = value; }
+
+    @JsonProperty("display")
+    public String getDisplay() { return display; }
+    @JsonProperty("display")
+    public void setDisplay(String value) { this.display = value; }
+
+    @JsonProperty("system")
+    public String getSystem() { return system; }
+    @JsonProperty("system")
+    public void setSystem(String value) { this.system = value; }
+
+    @JsonProperty("version")
+    public String getVersion() { return version; }
+    @JsonProperty("version")
+    public void setVersion(String value) { this.version = value; }
+}

src/main/java/dev/pcvolkmer/mv64e/mtb/GeneticCounselingRecommendationReasonCodingCode.java

@@ -3,7 +3,7 @@ package dev.pcvolkmer.mv64e.mtb;
 import java.io.IOException;
 import com.fasterxml.jackson.annotation.*;
 
-public enum ReasonCode {
+public enum GeneticCounselingRecommendationReasonCodingCode {
     FAMILY_ANAMNESIS, OTHER, SECONDARY_TUMOR, SELF_ANAMNESIS, UNKNOWN;
 
     @JsonValue
@@ -19,12 +19,12 @@ public enum ReasonCode {
     }
 
     @JsonCreator
-    public static ReasonCode forValue(String value) throws IOException {
+    public static GeneticCounselingRecommendationReasonCodingCode forValue(String value) throws IOException {
         if (value.equals("family-anamnesis")) return FAMILY_ANAMNESIS;
         if (value.equals("other")) return OTHER;
         if (value.equals("secondary-tumor")) return SECONDARY_TUMOR;
         if (value.equals("self-anamnesis")) return SELF_ANAMNESIS;
         if (value.equals("unknown")) return UNKNOWN;
-        throw new IOException("Cannot deserialize ReasonCode");
+        throw new IOException("Cannot deserialize GeneticCounselingRecommendationReasonCodingCode");
     }
 }

src/main/java/dev/pcvolkmer/mv64e/mtb/HealthInsurance.java

@@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.*;
 
 public class HealthInsurance {
     private Reference reference;
-    private CodingHealthInsurance type;
+    private HealthInsuranceCoding type;
 
     @JsonProperty("reference")
     public Reference getReference() { return reference; }
@@ -12,7 +12,7 @@ public class HealthInsurance {
     public void setReference(Reference value) { this.reference = value; }
 
     @JsonProperty("type")
-    public CodingHealthInsurance getType() { return type; }
+    public HealthInsuranceCoding getType() { return type; }
     @JsonProperty("type")
-    public void setType(CodingHealthInsurance value) { this.type = value; }
+    public void setType(HealthInsuranceCoding value) { this.type = value; }
 }

src/main/java/dev/pcvolkmer/mv64e/mtb/HealthInsuranceCoding.java

@@ -2,16 +2,16 @@ package dev.pcvolkmer.mv64e.mtb;
 
 import com.fasterxml.jackson.annotation.*;
 
-public class CodingHealthInsurance {
-    private CodingHealthInsuranceCode code;
+public class HealthInsuranceCoding {
+    private HealthInsuranceCodingCode code;
     private String display;
     private String system;
     private String version;
 
     @JsonProperty("code")
-    public CodingHealthInsuranceCode getCode() { return code; }
+    public HealthInsuranceCodingCode getCode() { return code; }
     @JsonProperty("code")
-    public void setCode(CodingHealthInsuranceCode value) { this.code = value; }
+    public void setCode(HealthInsuranceCodingCode value) { this.code = value; }
 
     @JsonProperty("display")
     public String getDisplay() { return display; }

src/main/java/dev/pcvolkmer/mv64e/mtb/HealthInsuranceCodingCode.java

@@ -3,8 +3,8 @@ package dev.pcvolkmer.mv64e.mtb;
 import java.io.IOException;
 import com.fasterxml.jackson.annotation.*;
 
-public enum CodingHealthInsuranceCode {
-    BEI, BG, GKV, GPV, PKV, PPV, SEL, SOZ, UNK;
+public enum HealthInsuranceCodingCode {
+    BEI, BG, GKV, GPV, PKV, PPV, SEL, SKT, SOZ, UNK;
 
     @JsonValue
     public String toValue() {
@@ -16,6 +16,7 @@ public enum CodingHealthInsuranceCode {
             case PKV: return "PKV";
             case PPV: return "PPV";
             case SEL: return "SEL";
+            case SKT: return "SKT";
             case SOZ: return "SOZ";
             case UNK: return "UNK";
         }
@@ -23,7 +24,7 @@ public enum CodingHealthInsuranceCode {
     }
 
     @JsonCreator
-    public static CodingHealthInsuranceCode forValue(String value) throws IOException {
+    public static HealthInsuranceCodingCode forValue(String value) throws IOException {
         if (value.equals("BEI")) return BEI;
         if (value.equals("BG")) return BG;
         if (value.equals("GKV")) return GKV;
@@ -31,8 +32,9 @@ public enum CodingHealthInsuranceCode {
         if (value.equals("PKV")) return PKV;
         if (value.equals("PPV")) return PPV;
         if (value.equals("SEL")) return SEL;
+        if (value.equals("SKT")) return SKT;
         if (value.equals("SOZ")) return SOZ;
         if (value.equals("UNK")) return UNK;
-        throw new IOException("Cannot deserialize CodingHealthInsuranceCode");
+        throw new IOException("Cannot deserialize HealthInsuranceCodingCode");
     }
 }

src/main/java/dev/pcvolkmer/mv64e/mtb/History.java

@@ -5,7 +5,7 @@ import java.util.Date;
 
 public class History {
     private Date date;
-    private CodingMtbDiagnosis value;
+    private MtbDiagnosisCoding value;
 
     @JsonProperty("date")
     @JsonFormat(pattern = "yyyy-MM-dd")
@@ -15,7 +15,7 @@ public class History {
     public void setDate(Date value) { this.date = value; }
 
     @JsonProperty("value")
-    public CodingMtbDiagnosis getValue() { return value; }
+    public MtbDiagnosisCoding getValue() { return value; }
     @JsonProperty("value")
-    public void setValue(CodingMtbDiagnosis value) { this.value = value; }
+    public void setValue(MtbDiagnosisCoding value) { this.value = value; }
 }

src/main/java/dev/pcvolkmer/mv64e/mtb/HrdScore.java

@@ -2,10 +2,10 @@ package dev.pcvolkmer.mv64e.mtb;
 
 import com.fasterxml.jackson.annotation.*;
 
-public class HRDScore {
+public class HrdScore {
     private Components components;
     private String id;
-    private CodingHrdScoreInterpretation interpretation;
+    private HrdScoreInterpretationCoding interpretation;
     private Reference patient;
     private Reference specimen;
     private double value;
@@ -21,9 +21,9 @@ public class HRDScore {
     public void setId(String value) { this.id = value; }
 
     @JsonProperty("interpretation")
-    public CodingHrdScoreInterpretation getInterpretation() { return interpretation; }
+    public HrdScoreInterpretationCoding getInterpretation() { return interpretation; }
     @JsonProperty("interpretation")
-    public void setInterpretation(CodingHrdScoreInterpretation value) { this.interpretation = value; }
+    public void setInterpretation(HrdScoreInterpretationCoding value) { this.interpretation = value; }
 
     @JsonProperty("patient")
     public Reference getPatient() { return patient; }

src/main/java/dev/pcvolkmer/mv64e/mtb/HrdScoreInterpretationCoding.java

@@ -0,0 +1,30 @@
+package dev.pcvolkmer.mv64e.mtb;
+
+import com.fasterxml.jackson.annotation.*;
+
+public class HrdScoreInterpretationCoding {
+    private InterpretationCodingCode code;
+    private String display;
+    private String system;
+    private String version;
+
+    @JsonProperty("code")
+    public InterpretationCodingCode getCode() { return code; }
+    @JsonProperty("code")
+    public void setCode(InterpretationCodingCode value) { this.code = value; }
+
+    @JsonProperty("display")
+    public String getDisplay() { return display; }
+    @JsonProperty("display")
+    public void setDisplay(String value) { this.display = value; }
+
+    @JsonProperty("system")
+    public String getSystem() { return system; }
+    @JsonProperty("system")
+    public void setSystem(String value) { this.system = value; }
+
+    @JsonProperty("version")
+    public String getVersion() { return version; }
+    @JsonProperty("version")
+    public void setVersion(String value) { this.version = value; }
+}

src/main/java/dev/pcvolkmer/mv64e/mtb/ICScoreCode.java

@@ -1,28 +0,0 @@
-package dev.pcvolkmer.mv64e.mtb;
-
-import java.io.IOException;
-import com.fasterxml.jackson.annotation.*;
-
-public enum ICScoreCode {
-    THE_0, THE_1, THE_2, THE_3;
-
-    @JsonValue
-    public String toValue() {
-        switch (this) {
-            case THE_0: return "0";
-            case THE_1: return "1";
-            case THE_2: return "2";
-            case THE_3: return "3";
-        }
-        return null;
-    }
-
-    @JsonCreator
-    public static ICScoreCode forValue(String value) throws IOException {
-        if (value.equals("0")) return THE_0;
-        if (value.equals("1")) return THE_1;
-        if (value.equals("2")) return THE_2;
-        if (value.equals("3")) return THE_3;
-        throw new IOException("Cannot deserialize ICScoreCode");
-    }
-}

src/main/java/dev/pcvolkmer/mv64e/mtb/IhcReport.java

@@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.*;
 import java.util.Date;
 import java.util.List;
 
-public class IHCReport {
+public class IhcReport {
     private List<String> blockIds;
     private String id;
     private Date issuedOn;

src/main/java/dev/pcvolkmer/mv64e/mtb/InterpretationCodingCode.java

@@ -3,7 +3,7 @@ package dev.pcvolkmer.mv64e.mtb;
 import java.io.IOException;
 import com.fasterxml.jackson.annotation.*;
 
-public enum InterpretationCode {
+public enum InterpretationCodingCode {
     HIGH, INTERMEDIATE, LOW;
 
     @JsonValue
@@ -17,10 +17,10 @@ public enum InterpretationCode {
     }
 
     @JsonCreator
-    public static InterpretationCode forValue(String value) throws IOException {
+    public static InterpretationCodingCode forValue(String value) throws IOException {
         if (value.equals("high")) return HIGH;
         if (value.equals("intermediate")) return INTERMEDIATE;
         if (value.equals("low")) return LOW;
-        throw new IOException("Cannot deserialize InterpretationCode");
+        throw new IOException("Cannot deserialize InterpretationCodingCode");
     }
 }

src/main/java/dev/pcvolkmer/mv64e/mtb/LevelOfEvidence.java

@@ -4,19 +4,19 @@ import com.fasterxml.jackson.annotation.*;
 import java.util.List;
 
 public class LevelOfEvidence {
-    private List<CodingLevelOfEvidenceAddendum> addendums;
-    private CodingLevelOfEvidenceGrading grading;
+    private List<LevelOfEvidenceAddendumCoding> addendums;
+    private LevelOfEvidenceGradingCoding grading;
     private List<PublicationReference> publications;
 
     @JsonProperty("addendums")
-    public List<CodingLevelOfEvidenceAddendum> getAddendums() { return addendums; }
+    public List<LevelOfEvidenceAddendumCoding> getAddendums() { return addendums; }
     @JsonProperty("addendums")
-    public void setAddendums(List<CodingLevelOfEvidenceAddendum> value) { this.addendums = value; }
+    public void setAddendums(List<LevelOfEvidenceAddendumCoding> value) { this.addendums = value; }
 
     @JsonProperty("grading")
-    public CodingLevelOfEvidenceGrading getGrading() { return grading; }
+    public LevelOfEvidenceGradingCoding getGrading() { return grading; }
     @JsonProperty("grading")
-    public void setGrading(CodingLevelOfEvidenceGrading value) { this.grading = value; }
+    public void setGrading(LevelOfEvidenceGradingCoding value) { this.grading = value; }
 
     @JsonProperty("publications")
     public List<PublicationReference> getPublications() { return publications; }

src/main/java/dev/pcvolkmer/mv64e/mtb/LevelOfEvidenceAddendumCoding.java

@@ -2,16 +2,16 @@ package dev.pcvolkmer.mv64e.mtb;
 
 import com.fasterxml.jackson.annotation.*;
 
-public class CodingProteinExpressionResult {
-    private CodingProteinExpressionResultCode code;
+public class LevelOfEvidenceAddendumCoding {
+    private LevelOfEvidenceAddendumCodingCode code;
     private String display;
     private String system;
     private String version;
 
     @JsonProperty("code")
-    public CodingProteinExpressionResultCode getCode() { return code; }
+    public LevelOfEvidenceAddendumCodingCode getCode() { return code; }
     @JsonProperty("code")
-    public void setCode(CodingProteinExpressionResultCode value) { this.code = value; }
+    public void setCode(LevelOfEvidenceAddendumCodingCode value) { this.code = value; }
 
     @JsonProperty("display")
     public String getDisplay() { return display; }

src/main/java/dev/pcvolkmer/mv64e/mtb/LevelOfEvidenceAddendumCodingCode.java

@@ -0,0 +1,28 @@
+package dev.pcvolkmer.mv64e.mtb;
+
+import java.io.IOException;
+import com.fasterxml.jackson.annotation.*;
+
+public enum LevelOfEvidenceAddendumCodingCode {
+    IS, IV, R, Z;
+
+    @JsonValue
+    public String toValue() {
+        switch (this) {
+            case IS: return "is";
+            case IV: return "iv";
+            case R: return "R";
+            case Z: return "Z";
+        }
+        return null;
+    }
+
+    @JsonCreator
+    public static LevelOfEvidenceAddendumCodingCode forValue(String value) throws IOException {
+        if (value.equals("is")) return IS;
+        if (value.equals("iv")) return IV;
+        if (value.equals("R")) return R;
+        if (value.equals("Z")) return Z;
+        throw new IOException("Cannot deserialize LevelOfEvidenceAddendumCodingCode");
+    }
+}

src/main/java/dev/pcvolkmer/mv64e/mtb/LevelOfEvidenceCode.java

@@ -1,38 +0,0 @@
-package dev.pcvolkmer.mv64e.mtb;
-
-import java.io.IOException;
-import com.fasterxml.jackson.annotation.*;
-
-public enum LevelOfEvidenceCode {
-    M1_A, M1_B, M1_C, M2_A, M2_B, M2_C, M3, M4, UNDEFINED;
-
-    @JsonValue
-    public String toValue() {
-        switch (this) {
-            case M1_A: return "m1A";
-            case M1_B: return "m1B";
-            case M1_C: return "m1C";
-            case M2_A: return "m2A";
-            case M2_B: return "m2B";
-            case M2_C: return "m2C";
-            case M3: return "m3";
-            case M4: return "m4";
-            case UNDEFINED: return "undefined";
-        }
-        return null;
-    }
-
-    @JsonCreator
-    public static LevelOfEvidenceCode forValue(String value) throws IOException {
-        if (value.equals("m1A")) return M1_A;
-        if (value.equals("m1B")) return M1_B;
-        if (value.equals("m1C")) return M1_C;
-        if (value.equals("m2A")) return M2_A;
-        if (value.equals("m2B")) return M2_B;
-        if (value.equals("m2C")) return M2_C;
-        if (value.equals("m3")) return M3;
-        if (value.equals("m4")) return M4;
-        if (value.equals("undefined")) return UNDEFINED;
-        throw new IOException("Cannot deserialize LevelOfEvidenceCode");
-    }
-}

src/main/java/dev/pcvolkmer/mv64e/mtb/LevelOfEvidenceGradingCoding.java

@@ -2,16 +2,16 @@ package dev.pcvolkmer.mv64e.mtb;
 
 import com.fasterxml.jackson.annotation.*;
 
-public class CodingMtbTherapyStatusReason {
-    private CodingMtbTherapyStatusReasonCode code;
+public class LevelOfEvidenceGradingCoding {
+    private LevelOfEvidenceGradingCodingCode code;
     private String display;
     private String system;
     private String version;
 
     @JsonProperty("code")
-    public CodingMtbTherapyStatusReasonCode getCode() { return code; }
+    public LevelOfEvidenceGradingCodingCode getCode() { return code; }
     @JsonProperty("code")
-    public void setCode(CodingMtbTherapyStatusReasonCode value) { this.code = value; }
+    public void setCode(LevelOfEvidenceGradingCodingCode value) { this.code = value; }
 
     @JsonProperty("display")
     public String getDisplay() { return display; }

src/main/java/dev/pcvolkmer/mv64e/mtb/LevelOfEvidenceGradingCodingCode.java

@@ -0,0 +1,38 @@
+package dev.pcvolkmer.mv64e.mtb;
+
+import java.io.IOException;
+import com.fasterxml.jackson.annotation.*;
+
+public enum LevelOfEvidenceGradingCodingCode {
+    M1A, M1B, M1C, M2A, M2B, M2C, M3, M4, UNDEFINED;
+
+    @JsonValue
+    public String toValue() {
+        switch (this) {
+            case M1A: return "m1A";
+            case M1B: return "m1B";
+            case M1C: return "m1C";
+            case M2A: return "m2A";
+            case M2B: return "m2B";
+            case M2C: return "m2C";
+            case M3: return "m3";
+            case M4: return "m4";
+            case UNDEFINED: return "undefined";
+        }
+        return null;
+    }
+
+    @JsonCreator
+    public static LevelOfEvidenceGradingCodingCode forValue(String value) throws IOException {
+        if (value.equals("m1A")) return M1A;
+        if (value.equals("m1B")) return M1B;
+        if (value.equals("m1C")) return M1C;
+        if (value.equals("m2A")) return M2A;
+        if (value.equals("m2B")) return M2B;
+        if (value.equals("m2C")) return M2C;
+        if (value.equals("m3")) return M3;
+        if (value.equals("m4")) return M4;
+        if (value.equals("undefined")) return UNDEFINED;
+        throw new IOException("Cannot deserialize LevelOfEvidenceGradingCodingCode");
+    }
+}

src/main/java/dev/pcvolkmer/mv64e/mtb/MSIMmr.java

@@ -3,18 +3,18 @@ package dev.pcvolkmer.mv64e.mtb;
 import com.fasterxml.jackson.annotation.*;
 
 public class MSIMmr {
-    private CodingProteinExpressionIcScore icScore;
+    private ProteinExpressionIcScoreCoding icScore;
     private String id;
     private Reference patient;
     private Coding protein;
-    private CodingProteinExpressionTcScore tcScore;
+    private ProteinExpressionTcScoreCoding tcScore;
     private Long tpsScore;
-    private CodingProteinExpressionResult value;
+    private ProteinExpressionResultCoding value;
 
     @JsonProperty("icScore")
-    public CodingProteinExpressionIcScore getIcScore() { return icScore; }
+    public ProteinExpressionIcScoreCoding getIcScore() { return icScore; }
     @JsonProperty("icScore")
-    public void setIcScore(CodingProteinExpressionIcScore value) { this.icScore = value; }
+    public void setIcScore(ProteinExpressionIcScoreCoding value) { this.icScore = value; }
 
     @JsonProperty("id")
     public String getId() { return id; }
@@ -32,9 +32,9 @@ public class MSIMmr {
     public void setProtein(Coding value) { this.protein = value; }
 
     @JsonProperty("tcScore")
-    public CodingProteinExpressionTcScore getTcScore() { return tcScore; }
+    public ProteinExpressionTcScoreCoding getTcScore() { return tcScore; }
     @JsonProperty("tcScore")
-    public void setTcScore(CodingProteinExpressionTcScore value) { this.tcScore = value; }
+    public void setTcScore(ProteinExpressionTcScoreCoding value) { this.tcScore = value; }
 
     @JsonProperty("tpsScore")
     public Long getTpsScore() { return tpsScore; }
@@ -42,7 +42,7 @@ public class MSIMmr {
     public void setTpsScore(Long value) { this.tpsScore = value; }
 
     @JsonProperty("value")
-    public CodingProteinExpressionResult getValue() { return value; }
+    public ProteinExpressionResultCoding getValue() { return value; }
     @JsonProperty("value")
-    public void setValue(CodingProteinExpressionResult value) { this.value = value; }
+    public void setValue(ProteinExpressionResultCoding value) { this.value = value; }
 }

src/main/java/dev/pcvolkmer/mv64e/mtb/ModelProjectConsent.java

@@ -0,0 +1,26 @@
+package dev.pcvolkmer.mv64e.mtb;
+
+import com.fasterxml.jackson.annotation.*;
+import java.util.Date;
+import java.util.List;
+
+public class ModelProjectConsent {
+    private Date date;
+    private List<Provision> provisions;
+    private String version;
+
+    @JsonProperty("date")
+    public Date getDate() { return date; }
+    @JsonProperty("date")
+    public void setDate(Date value) { this.date = value; }
+
+    @JsonProperty("provisions")
+    public List<Provision> getProvisions() { return provisions; }
+    @JsonProperty("provisions")
+    public void setProvisions(List<Provision> value) { this.provisions = value; }
+
+    @JsonProperty("version")
+    public String getVersion() { return version; }
+    @JsonProperty("version")
+    public void setVersion(String value) { this.version = value; }
+}

src/main/java/dev/pcvolkmer/mv64e/mtb/ModelProjectConsentPurpose.java

@@ -0,0 +1,26 @@
+package dev.pcvolkmer.mv64e.mtb;
+
+import java.io.IOException;
+import com.fasterxml.jackson.annotation.*;
+
+public enum ModelProjectConsentPurpose {
+    CASE_IDENTIFICATION, REIDENTIFICATION, SEQUENCING;
+
+    @JsonValue
+    public String toValue() {
+        switch (this) {
+            case CASE_IDENTIFICATION: return "case-identification";
+            case REIDENTIFICATION: return "reidentification";
+            case SEQUENCING: return "sequencing";
+        }
+        return null;
+    }
+
+    @JsonCreator
+    public static ModelProjectConsentPurpose forValue(String value) throws IOException {
+        if (value.equals("case-identification")) return CASE_IDENTIFICATION;
+        if (value.equals("reidentification")) return REIDENTIFICATION;
+        if (value.equals("sequencing")) return SEQUENCING;
+        throw new IOException("Cannot deserialize ModelProjectConsentPurpose");
+    }
+}

src/main/java/dev/pcvolkmer/mv64e/mtb/MolecularDiagnosticReportCoding.java

@@ -2,16 +2,16 @@ package dev.pcvolkmer.mv64e.mtb;
 
 import com.fasterxml.jackson.annotation.*;
 
-public class CodingMolecularDiagnosticReport {
-    private CodingMolecularDiagnosticReportCode code;
+public class MolecularDiagnosticReportCoding {
+    private MolecularDiagnosticReportCodingCode code;
     private String display;
     private String system;
     private String version;
 
     @JsonProperty("code")
-    public CodingMolecularDiagnosticReportCode getCode() { return code; }
+    public MolecularDiagnosticReportCodingCode getCode() { return code; }
     @JsonProperty("code")
-    public void setCode(CodingMolecularDiagnosticReportCode value) { this.code = value; }
+    public void setCode(MolecularDiagnosticReportCodingCode value) { this.code = value; }
 
     @JsonProperty("display")
     public String getDisplay() { return display; }

src/main/java/dev/pcvolkmer/mv64e/mtb/MolecularDiagnosticReportCodingCode.java

@@ -3,7 +3,7 @@ package dev.pcvolkmer.mv64e.mtb;
 import java.io.IOException;
 import com.fasterxml.jackson.annotation.*;
 
-public enum CodingMolecularDiagnosticReportCode {
+public enum MolecularDiagnosticReportCodingCode {
     ARRAY, EXOME, FISH, FUSION_PANEL, GENE_PANEL, GENOME_LONG_READ, GENOME_SHORT_READ, KARYOTYPING, OTHER, PANEL, PCR, SINGLE;
 
     @JsonValue
@@ -26,7 +26,7 @@ public enum CodingMolecularDiagnosticReportCode {
     }
 
     @JsonCreator
-    public static CodingMolecularDiagnosticReportCode forValue(String value) throws IOException {
+    public static MolecularDiagnosticReportCodingCode forValue(String value) throws IOException {
         if (value.equals("array")) return ARRAY;
         if (value.equals("exome")) return EXOME;
         if (value.equals("FISH")) return FISH;
@@ -39,6 +39,6 @@ public enum CodingMolecularDiagnosticReportCode {
         if (value.equals("panel")) return PANEL;
         if (value.equals("PCR")) return PCR;
         if (value.equals("single")) return SINGLE;
-        throw new IOException("Cannot deserialize CodingMolecularDiagnosticReportCode");
+        throw new IOException("Cannot deserialize MolecularDiagnosticReportCodingCode");
     }
 }

src/main/java/dev/pcvolkmer/mv64e/mtb/Mtb.java

@@ -4,17 +4,18 @@ import com.fasterxml.jackson.annotation.*;
 import java.util.List;
 
 public class Mtb {
-    private List<MTBCarePlan> carePlans;
+    private List<MtbCarePlan> carePlans;
     private List<ClaimResponse> claimResponses;
     private List<Claim> claims;
-    private List<MTBDiagnosis> diagnoses;
-    private List<MTBEpisodeOfCare> episodesOfCare;
+    private List<MtbDiagnosis> diagnoses;
+    private List<MtbEpisodeOfCare> episodesOfCare;
     private List<FollowUp> followUps;
     private List<OncoProcedure> guidelineProcedures;
-    private List<MTBSystemicTherapy> guidelineTherapies;
+    private List<MtbSystemicTherapy> guidelineTherapies;
     private List<HistologyReport> histologyReports;
-    private List<IHCReport> ihcReports;
-    private List<SomaticNgsReportMetadata> ngsReports;
+    private List<IhcReport> ihcReports;
+    private MvhMetadata metadata;
+    private List<SomaticNgsReport> ngsReports;
     private Patient patient;
     private List<PerformanceStatus> performanceStatus;
     private List<PriorDiagnosticReport> priorDiagnosticReports;
@@ -23,9 +24,9 @@ public class Mtb {
     private List<SystemicTherapy> systemicTherapies;
 
     @JsonProperty("carePlans")
-    public List<MTBCarePlan> getCarePlans() { return carePlans; }
+    public List<MtbCarePlan> getCarePlans() { return carePlans; }
     @JsonProperty("carePlans")
-    public void setCarePlans(List<MTBCarePlan> value) { this.carePlans = value; }
+    public void setCarePlans(List<MtbCarePlan> value) { this.carePlans = value; }
 
     @JsonProperty("claimResponses")
     public List<ClaimResponse> getClaimResponses() { return claimResponses; }
@@ -38,14 +39,14 @@ public class Mtb {
     public void setClaims(List<Claim> value) { this.claims = value; }
 
     @JsonProperty("diagnoses")
-    public List<MTBDiagnosis> getDiagnoses() { return diagnoses; }
+    public List<MtbDiagnosis> getDiagnoses() { return diagnoses; }
     @JsonProperty("diagnoses")
-    public void setDiagnoses(List<MTBDiagnosis> value) { this.diagnoses = value; }
+    public void setDiagnoses(List<MtbDiagnosis> value) { this.diagnoses = value; }
 
     @JsonProperty("episodesOfCare")
-    public List<MTBEpisodeOfCare> getEpisodesOfCare() { return episodesOfCare; }
+    public List<MtbEpisodeOfCare> getEpisodesOfCare() { return episodesOfCare; }
     @JsonProperty("episodesOfCare")
-    public void setEpisodesOfCare(List<MTBEpisodeOfCare> value) { this.episodesOfCare = value; }
+    public void setEpisodesOfCare(List<MtbEpisodeOfCare> value) { this.episodesOfCare = value; }
 
     @JsonProperty("followUps")
     public List<FollowUp> getFollowUps() { return followUps; }
@@ -58,9 +59,9 @@ public class Mtb {
     public void setGuidelineProcedures(List<OncoProcedure> value) { this.guidelineProcedures = value; }
 
     @JsonProperty("guidelineTherapies")
-    public List<MTBSystemicTherapy> getGuidelineTherapies() { return guidelineTherapies; }
+    public List<MtbSystemicTherapy> getGuidelineTherapies() { return guidelineTherapies; }
     @JsonProperty("guidelineTherapies")
-    public void setGuidelineTherapies(List<MTBSystemicTherapy> value) { this.guidelineTherapies = value; }
+    public void setGuidelineTherapies(List<MtbSystemicTherapy> value) { this.guidelineTherapies = value; }
 
     @JsonProperty("histologyReports")
     public List<HistologyReport> getHistologyReports() { return histologyReports; }
@@ -68,14 +69,19 @@ public class Mtb {
     public void setHistologyReports(List<HistologyReport> value) { this.histologyReports = value; }
 
     @JsonProperty("ihcReports")
-    public List<IHCReport> getIhcReports() { return ihcReports; }
+    public List<IhcReport> getIhcReports() { return ihcReports; }
     @JsonProperty("ihcReports")
-    public void setIhcReports(List<IHCReport> value) { this.ihcReports = value; }
+    public void setIhcReports(List<IhcReport> value) { this.ihcReports = value; }
+
+    @JsonProperty("metadata")
+    public MvhMetadata getMetadata() { return metadata; }
+    @JsonProperty("metadata")
+    public void setMetadata(MvhMetadata value) { this.metadata = value; }
 
     @JsonProperty("ngsReports")
-    public List<SomaticNgsReportMetadata> getNgsReports() { return ngsReports; }
+    public List<SomaticNgsReport> getNgsReports() { return ngsReports; }
     @JsonProperty("ngsReports")
-    public void setNgsReports(List<SomaticNgsReportMetadata> value) { this.ngsReports = value; }
+    public void setNgsReports(List<SomaticNgsReport> value) { this.ngsReports = value; }
 
     @JsonProperty("patient")
     public Patient getPatient() { return patient; }

src/main/java/dev/pcvolkmer/mv64e/mtb/MtbCarePlan.java

@@ -4,19 +4,20 @@ import com.fasterxml.jackson.annotation.*;
 import java.util.Date;
 import java.util.List;
 
-public class MTBCarePlan {
+public class MtbCarePlan {
     private GeneticCounselingRecommendation geneticCounselingRecommendation;
     private List<HistologyReevaluationRequest> histologyReevaluationRequests;
     private String id;
     private Date issuedOn;
-    private List<MTBMedicationRecommendation> medicationRecommendations;
+    private List<MtbMedicationRecommendation> medicationRecommendations;
+    private CarePlanNoSequencingPerformedReasonCoding noSequencingPerformedReason;
     private List<String> notes;
     private Reference patient;
     private List<ProcedureRecommendation> procedureRecommendations;
     private Reference reason;
     private List<RebiopsyRequest> rebiopsyRequests;
-    private CodingMtbCarePlanStatusReason statusReason;
-    private List<MTBStudyEnrollmentRecommendation> studyEnrollmentRecommendations;
+    private MtbCarePlanRecommendationsMissingReasonCoding recommendationsMissingReason;
+    private List<MtbStudyEnrollmentRecommendation> studyEnrollmentRecommendations;
 
     @JsonProperty("geneticCounselingRecommendation")
     public GeneticCounselingRecommendation getGeneticCounselingRecommendation() { return geneticCounselingRecommendation; }
@@ -41,9 +42,14 @@ public class MTBCarePlan {
     public void setIssuedOn(Date value) { this.issuedOn = value; }
 
     @JsonProperty("medicationRecommendations")
-    public List<MTBMedicationRecommendation> getMedicationRecommendations() { return medicationRecommendations; }
+    public List<MtbMedicationRecommendation> getMedicationRecommendations() { return medicationRecommendations; }
     @JsonProperty("medicationRecommendations")
-    public void setMedicationRecommendations(List<MTBMedicationRecommendation> value) { this.medicationRecommendations = value; }
+    public void setMedicationRecommendations(List<MtbMedicationRecommendation> value) { this.medicationRecommendations = value; }
+
+    @JsonProperty("noSequencingPerformedReason")
+    public CarePlanNoSequencingPerformedReasonCoding getNoSequencingPerformedReason() { return noSequencingPerformedReason; }
+    @JsonProperty("noSequencingPerformedReason")
+    public void setNoSequencingPerformedReason(CarePlanNoSequencingPerformedReasonCoding value) { this.noSequencingPerformedReason = value; }
 
     @JsonProperty("notes")
     public List<String> getNotes() { return notes; }
@@ -70,13 +76,13 @@ public class MTBCarePlan {
     @JsonProperty("rebiopsyRequests")
     public void setRebiopsyRequests(List<RebiopsyRequest> value) { this.rebiopsyRequests = value; }
 
-    @JsonProperty("statusReason")
-    public CodingMtbCarePlanStatusReason getStatusReason() { return statusReason; }
-    @JsonProperty("statusReason")
-    public void setStatusReason(CodingMtbCarePlanStatusReason value) { this.statusReason = value; }
+    @JsonProperty("recommendationsMissingReason")
+    public MtbCarePlanRecommendationsMissingReasonCoding getRecommendationsMissingReason() { return recommendationsMissingReason; }
+    @JsonProperty("recommendationsMissingReason")
+    public void setRecommendationsMissingReason(MtbCarePlanRecommendationsMissingReasonCoding value) { this.recommendationsMissingReason = value; }
 
     @JsonProperty("studyEnrollmentRecommendations")
-    public List<MTBStudyEnrollmentRecommendation> getStudyEnrollmentRecommendations() { return studyEnrollmentRecommendations; }
+    public List<MtbStudyEnrollmentRecommendation> getStudyEnrollmentRecommendations() { return studyEnrollmentRecommendations; }
     @JsonProperty("studyEnrollmentRecommendations")
-    public void setStudyEnrollmentRecommendations(List<MTBStudyEnrollmentRecommendation> value) { this.studyEnrollmentRecommendations = value; }
+    public void setStudyEnrollmentRecommendations(List<MtbStudyEnrollmentRecommendation> value) { this.studyEnrollmentRecommendations = value; }
 }

src/main/java/dev/pcvolkmer/mv64e/mtb/MtbCarePlanRecommendationsMissingReasonCoding.java

@@ -0,0 +1,30 @@
+package dev.pcvolkmer.mv64e.mtb;
+
+import com.fasterxml.jackson.annotation.*;
+
+public class MtbCarePlanRecommendationsMissingReasonCoding {
+    private MtbCarePlanRecommendationsMissingReasonCodingCode code;
+    private String display;
+    private String system;
+    private String version;
+
+    @JsonProperty("code")
+    public MtbCarePlanRecommendationsMissingReasonCodingCode getCode() { return code; }
+    @JsonProperty("code")
+    public void setCode(MtbCarePlanRecommendationsMissingReasonCodingCode value) { this.code = value; }
+
+    @JsonProperty("display")
+    public String getDisplay() { return display; }
+    @JsonProperty("display")
+    public void setDisplay(String value) { this.display = value; }
+
+    @JsonProperty("system")
+    public String getSystem() { return system; }
+    @JsonProperty("system")
+    public void setSystem(String value) { this.system = value; }
+
+    @JsonProperty("version")
+    public String getVersion() { return version; }
+    @JsonProperty("version")
+    public void setVersion(String value) { this.version = value; }
+}

src/main/java/dev/pcvolkmer/mv64e/mtb/MtbCarePlanRecommendationsMissingReasonCodingCode.java

@@ -0,0 +1,22 @@
+package dev.pcvolkmer.mv64e.mtb;
+
+import java.io.IOException;
+import com.fasterxml.jackson.annotation.*;
+
+public enum MtbCarePlanRecommendationsMissingReasonCodingCode {
+    NO_TARGET;
+
+    @JsonValue
+    public String toValue() {
+        switch (this) {
+            case NO_TARGET: return "no-target";
+        }
+        return null;
+    }
+
+    @JsonCreator
+    public static MtbCarePlanRecommendationsMissingReasonCodingCode forValue(String value) throws IOException {
+        if (value.equals("no-target")) return NO_TARGET;
+        throw new IOException("Cannot deserialize MtbCarePlanRecommendationsMissingReasonCodingCode");
+    }
+}

src/main/java/dev/pcvolkmer/mv64e/mtb/MtbDiagnosis.java

@@ -4,11 +4,11 @@ import com.fasterxml.jackson.annotation.*;
 import java.util.Date;
 import java.util.List;
 
-public class MTBDiagnosis {
+public class MtbDiagnosis {
     private Coding code;
     private List<Coding> germlineCodes;
     private Grading grading;
-    private CodingMtbDiagnosisGuidelineTreatmentStatus guidelineTreatmentStatus;
+    private MtbDiagnosisGuidelineTreatmentStatusCoding guidelineTreatmentStatus;
     private List<Reference> histology;
     private String id;
     private List<String> notes;
@@ -34,9 +34,9 @@ public class MTBDiagnosis {
     public void setGrading(Grading value) { this.grading = value; }
 
     @JsonProperty("guidelineTreatmentStatus")
-    public CodingMtbDiagnosisGuidelineTreatmentStatus getGuidelineTreatmentStatus() { return guidelineTreatmentStatus; }
+    public MtbDiagnosisGuidelineTreatmentStatusCoding getGuidelineTreatmentStatus() { return guidelineTreatmentStatus; }
     @JsonProperty("guidelineTreatmentStatus")
-    public void setGuidelineTreatmentStatus(CodingMtbDiagnosisGuidelineTreatmentStatus value) { this.guidelineTreatmentStatus = value; }
+    public void setGuidelineTreatmentStatus(MtbDiagnosisGuidelineTreatmentStatusCoding value) { this.guidelineTreatmentStatus = value; }
 
     @JsonProperty("histology")
     public List<Reference> getHistology() { return histology; }
@@ -59,8 +59,10 @@ public class MTBDiagnosis {
     public void setPatient(Reference value) { this.patient = value; }
 
     @JsonProperty("recordedOn")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     public Date getRecordedOn() { return recordedOn; }
     @JsonProperty("recordedOn")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     public void setRecordedOn(Date value) { this.recordedOn = value; }
 
     @JsonProperty("staging")

src/main/java/dev/pcvolkmer/mv64e/mtb/MtbDiagnosisCoding.java

@@ -2,16 +2,16 @@ package dev.pcvolkmer.mv64e.mtb;
 
 import com.fasterxml.jackson.annotation.*;
 
-public class CodingGender {
-    private GenderCode code;
+public class MtbDiagnosisCoding {
+    private ValueCode code;
     private String display;
     private String system;
     private String version;
 
     @JsonProperty("code")
-    public GenderCode getCode() { return code; }
+    public ValueCode getCode() { return code; }
     @JsonProperty("code")
-    public void setCode(GenderCode value) { this.code = value; }
+    public void setCode(ValueCode value) { this.code = value; }
 
     @JsonProperty("display")
     public String getDisplay() { return display; }

src/main/java/dev/pcvolkmer/mv64e/mtb/MtbDiagnosisGuidelineTreatmentStatusCoding.java

@@ -2,16 +2,16 @@ package dev.pcvolkmer.mv64e.mtb;
 
 import com.fasterxml.jackson.annotation.*;
 
-public class CodingMtbTherapyIntent {
-    private IntentCode code;
+public class MtbDiagnosisGuidelineTreatmentStatusCoding {
+    private MtbDiagnosisGuidelineTreatmentStatusCodingCode code;
     private String display;
     private String system;
     private String version;
 
     @JsonProperty("code")
-    public IntentCode getCode() { return code; }
+    public MtbDiagnosisGuidelineTreatmentStatusCodingCode getCode() { return code; }
     @JsonProperty("code")
-    public void setCode(IntentCode value) { this.code = value; }
+    public void setCode(MtbDiagnosisGuidelineTreatmentStatusCodingCode value) { this.code = value; }
 
     @JsonProperty("display")
     public String getDisplay() { return display; }

src/main/java/dev/pcvolkmer/mv64e/mtb/MtbDiagnosisGuidelineTreatmentStatusCodingCode.java

@@ -3,7 +3,7 @@ package dev.pcvolkmer.mv64e.mtb;
 import java.io.IOException;
 import com.fasterxml.jackson.annotation.*;
 
-public enum GuidelineTreatmentStatusCode {
+public enum MtbDiagnosisGuidelineTreatmentStatusCodingCode {
     EXHAUSTED, IMPOSSIBLE, NON_EXHAUSTED, NO_GUIDELINES_AVAILABLE, UNKNOWN;
 
     @JsonValue
@@ -19,12 +19,12 @@ public enum GuidelineTreatmentStatusCode {
     }
 
     @JsonCreator
-    public static GuidelineTreatmentStatusCode forValue(String value) throws IOException {
+    public static MtbDiagnosisGuidelineTreatmentStatusCodingCode forValue(String value) throws IOException {
         if (value.equals("exhausted")) return EXHAUSTED;
         if (value.equals("impossible")) return IMPOSSIBLE;
         if (value.equals("non-exhausted")) return NON_EXHAUSTED;
         if (value.equals("no-guidelines-available")) return NO_GUIDELINES_AVAILABLE;
         if (value.equals("unknown")) return UNKNOWN;
-        throw new IOException("Cannot deserialize GuidelineTreatmentStatusCode");
+        throw new IOException("Cannot deserialize MtbDiagnosisGuidelineTreatmentStatusCodingCode");
     }
 }

src/main/java/dev/pcvolkmer/mv64e/mtb/MtbEpisodeOfCare.java

@@ -3,7 +3,7 @@ package dev.pcvolkmer.mv64e.mtb;
 import com.fasterxml.jackson.annotation.*;
 import java.util.List;
 
-public class MTBEpisodeOfCare {
+public class MtbEpisodeOfCare {
     private List<Reference> diagnoses;
     private String id;
     private Reference patient;

src/main/java/dev/pcvolkmer/mv64e/mtb/MtbMedicationRecommendation.java

@@ -4,22 +4,22 @@ import com.fasterxml.jackson.annotation.*;
 import java.util.Date;
 import java.util.List;
 
-public class MTBMedicationRecommendation {
-    private CodingMtbMedicationRecommendationCategory category;
+public class MtbMedicationRecommendation {
+    private MtbMedicationRecommendationCategoryCoding category;
     private String id;
     private Date issuedOn;
     private LevelOfEvidence levelOfEvidence;
-    private List<CodingAtcUnregisteredMedication> medication;
+    private List<AtcUnregisteredMedicationCoding> medication;
     private Reference patient;
-    private CodingRecommendationPriority priority;
+    private RecommendationPriorityCoding priority;
     private Reference reason;
     private List<GeneAlterationReference> supportingVariants;
-    private CodingMtbMedicationRecommendationUseType useType;
+    private MtbMedicationRecommendationUseTypeCoding useType;
 
     @JsonProperty("category")
-    public CodingMtbMedicationRecommendationCategory getCategory() { return category; }
+    public MtbMedicationRecommendationCategoryCoding getCategory() { return category; }
     @JsonProperty("category")
-    public void setCategory(CodingMtbMedicationRecommendationCategory value) { this.category = value; }
+    public void setCategory(MtbMedicationRecommendationCategoryCoding value) { this.category = value; }
 
     @JsonProperty("id")
     public String getId() { return id; }
@@ -39,9 +39,9 @@ public class MTBMedicationRecommendation {
     public void setLevelOfEvidence(LevelOfEvidence value) { this.levelOfEvidence = value; }
 
     @JsonProperty("medication")
-    public List<CodingAtcUnregisteredMedication> getMedication() { return medication; }
+    public List<AtcUnregisteredMedicationCoding> getMedication() { return medication; }
     @JsonProperty("medication")
-    public void setMedication(List<CodingAtcUnregisteredMedication> value) { this.medication = value; }
+    public void setMedication(List<AtcUnregisteredMedicationCoding> value) { this.medication = value; }
 
     @JsonProperty("patient")
     public Reference getPatient() { return patient; }
@@ -49,9 +49,9 @@ public class MTBMedicationRecommendation {
     public void setPatient(Reference value) { this.patient = value; }
 
     @JsonProperty("priority")
-    public CodingRecommendationPriority getPriority() { return priority; }
+    public RecommendationPriorityCoding getPriority() { return priority; }
     @JsonProperty("priority")
-    public void setPriority(CodingRecommendationPriority value) { this.priority = value; }
+    public void setPriority(RecommendationPriorityCoding value) { this.priority = value; }
 
     @JsonProperty("reason")
     public Reference getReason() { return reason; }
@@ -64,7 +64,7 @@ public class MTBMedicationRecommendation {
     public void setSupportingVariants(List<GeneAlterationReference> value) { this.supportingVariants = value; }
 
     @JsonProperty("useType")
-    public CodingMtbMedicationRecommendationUseType getUseType() { return useType; }
+    public MtbMedicationRecommendationUseTypeCoding getUseType() { return useType; }
     @JsonProperty("useType")
-    public void setUseType(CodingMtbMedicationRecommendationUseType value) { this.useType = value; }
+    public void setUseType(MtbMedicationRecommendationUseTypeCoding value) { this.useType = value; }
 }

src/main/java/dev/pcvolkmer/mv64e/mtb/MtbMedicationRecommendationCategoryCoding.java

@@ -2,16 +2,16 @@ package dev.pcvolkmer.mv64e.mtb;
 
 import com.fasterxml.jackson.annotation.*;
 
-public class CodingMtbMedicationRecommendationCategory {
-    private CodingMtbMedicationRecommendationCategoryCode code;
+public class MtbMedicationRecommendationCategoryCoding {
+    private MtbMedicationRecommendationCategoryCodingCode code;
     private String display;
     private String system;
     private String version;
 
     @JsonProperty("code")
-    public CodingMtbMedicationRecommendationCategoryCode getCode() { return code; }
+    public MtbMedicationRecommendationCategoryCodingCode getCode() { return code; }
     @JsonProperty("code")
-    public void setCode(CodingMtbMedicationRecommendationCategoryCode value) { this.code = value; }
+    public void setCode(MtbMedicationRecommendationCategoryCodingCode value) { this.code = value; }
 
     @JsonProperty("display")
     public String getDisplay() { return display; }

src/main/java/dev/pcvolkmer/mv64e/mtb/MtbMedicationRecommendationCategoryCodingCode.java

@@ -3,7 +3,7 @@ package dev.pcvolkmer.mv64e.mtb;
 import java.io.IOException;
 import com.fasterxml.jackson.annotation.*;
 
-public enum CodingMtbMedicationRecommendationCategoryCode {
+public enum MtbMedicationRecommendationCategoryCodingCode {
     CH, HO, IM, SO, SZ, ZS;
 
     @JsonValue
@@ -20,13 +20,13 @@ public enum CodingMtbMedicationRecommendationCategoryCode {
     }
 
     @JsonCreator
-    public static CodingMtbMedicationRecommendationCategoryCode forValue(String value) throws IOException {
+    public static MtbMedicationRecommendationCategoryCodingCode forValue(String value) throws IOException {
         if (value.equals("CH")) return CH;
         if (value.equals("HO")) return HO;
         if (value.equals("IM")) return IM;
         if (value.equals("SO")) return SO;
         if (value.equals("SZ")) return SZ;
         if (value.equals("ZS")) return ZS;
-        throw new IOException("Cannot deserialize CodingMtbMedicationRecommendationCategoryCode");
+        throw new IOException("Cannot deserialize MtbMedicationRecommendationCategoryCodingCode");
     }
 }

src/main/java/dev/pcvolkmer/mv64e/mtb/MtbMedicationRecommendationUseTypeCoding.java

@@ -2,16 +2,16 @@ package dev.pcvolkmer.mv64e.mtb;
 
 import com.fasterxml.jackson.annotation.*;
 
-public class CodingMtbProcedureRecommendationCategory {
-    private CodingMtbProcedureRecommendationCategoryCode code;
+public class MtbMedicationRecommendationUseTypeCoding {
+    private MtbMedicationRecommendationUseTypeCodingCode code;
     private String display;
     private String system;
     private String version;
 
     @JsonProperty("code")
-    public CodingMtbProcedureRecommendationCategoryCode getCode() { return code; }
+    public MtbMedicationRecommendationUseTypeCodingCode getCode() { return code; }
     @JsonProperty("code")
-    public void setCode(CodingMtbProcedureRecommendationCategoryCode value) { this.code = value; }
+    public void setCode(MtbMedicationRecommendationUseTypeCodingCode value) { this.code = value; }
 
     @JsonProperty("display")
     public String getDisplay() { return display; }

src/main/java/dev/pcvolkmer/mv64e/mtb/MtbMedicationRecommendationUseTypeCodingCode.java

@@ -3,7 +3,7 @@ package dev.pcvolkmer.mv64e.mtb;
 import java.io.IOException;
 import com.fasterxml.jackson.annotation.*;
 
-public enum UseTypeCode {
+public enum MtbMedicationRecommendationUseTypeCodingCode {
     COMPASSIONATE, IN_LABEL, OFF_LABEL, SEC_PREVENTIVE, UNKNOWN;
 
     @JsonValue
@@ -19,12 +19,12 @@ public enum UseTypeCode {
     }
 
     @JsonCreator
-    public static UseTypeCode forValue(String value) throws IOException {
+    public static MtbMedicationRecommendationUseTypeCodingCode forValue(String value) throws IOException {
         if (value.equals("compassionate")) return COMPASSIONATE;
         if (value.equals("in-label")) return IN_LABEL;
         if (value.equals("off-label")) return OFF_LABEL;
         if (value.equals("sec-preventive")) return SEC_PREVENTIVE;
         if (value.equals("unknown")) return UNKNOWN;
-        throw new IOException("Cannot deserialize UseTypeCode");
+        throw new IOException("Cannot deserialize MtbMedicationRecommendationUseTypeCodingCode");
     }
 }

src/main/java/dev/pcvolkmer/mv64e/mtb/MtbProcedureRecommendationCategoryCoding.java

@@ -0,0 +1,30 @@
+package dev.pcvolkmer.mv64e.mtb;
+
+import com.fasterxml.jackson.annotation.*;
+
+public class MtbProcedureRecommendationCategoryCoding {
+    private MtbProcedureRecommendationCategoryCodingCode code;
+    private String display;
+    private String system;
+    private String version;
+
+    @JsonProperty("code")
+    public MtbProcedureRecommendationCategoryCodingCode getCode() { return code; }
+    @JsonProperty("code")
+    public void setCode(MtbProcedureRecommendationCategoryCodingCode value) { this.code = value; }
+
+    @JsonProperty("display")
+    public String getDisplay() { return display; }
+    @JsonProperty("display")
+    public void setDisplay(String value) { this.display = value; }
+
+    @JsonProperty("system")
+    public String getSystem() { return system; }
+    @JsonProperty("system")
+    public void setSystem(String value) { this.system = value; }
+
+    @JsonProperty("version")
+    public String getVersion() { return version; }
+    @JsonProperty("version")
+    public void setVersion(String value) { this.version = value; }
+}

src/main/java/dev/pcvolkmer/mv64e/mtb/MtbProcedureRecommendationCategoryCodingCode.java

@@ -3,7 +3,7 @@ package dev.pcvolkmer.mv64e.mtb;
 import java.io.IOException;
 import com.fasterxml.jackson.annotation.*;
 
-public enum CodingMtbProcedureRecommendationCategoryCode {
+public enum MtbProcedureRecommendationCategoryCodingCode {
     AS, OP, SO, ST, WS, WW;
 
     @JsonValue
@@ -20,13 +20,13 @@ public enum CodingMtbProcedureRecommendationCategoryCode {
     }
 
     @JsonCreator
-    public static CodingMtbProcedureRecommendationCategoryCode forValue(String value) throws IOException {
+    public static MtbProcedureRecommendationCategoryCodingCode forValue(String value) throws IOException {
         if (value.equals("AS")) return AS;
         if (value.equals("OP")) return OP;
         if (value.equals("SO")) return SO;
         if (value.equals("ST")) return ST;
         if (value.equals("WS")) return WS;
         if (value.equals("WW")) return WW;
-        throw new IOException("Cannot deserialize CodingMtbProcedureRecommendationCategoryCode");
+        throw new IOException("Cannot deserialize MtbProcedureRecommendationCategoryCodingCode");
     }
 }

src/main/java/dev/pcvolkmer/mv64e/mtb/MtbStudyEnrollmentRecommendation.java

@@ -4,13 +4,13 @@ import com.fasterxml.jackson.annotation.*;
 import java.util.Date;
 import java.util.List;
 
-public class MTBStudyEnrollmentRecommendation {
+public class MtbStudyEnrollmentRecommendation {
     private String id;
     private Date issuedOn;
-    private CodingLevelOfEvidenceGrading levelOfEvidence;
-    private List<CodingAtcUnregisteredMedication> medication;
+    private LevelOfEvidence levelOfEvidence;
+    private List<AtcUnregisteredMedicationCoding> medication;
     private Reference patient;
-    private CodingRecommendationPriority priority;
+    private RecommendationPriorityCoding priority;
     private Reference reason;
     private List<StudyReference> study;
     private List<GeneAlterationReference> supportingVariants;
@@ -28,14 +28,14 @@ public class MTBStudyEnrollmentRecommendation {
     public void setIssuedOn(Date value) { this.issuedOn = value; }
 
     @JsonProperty("levelOfEvidence")
-    public CodingLevelOfEvidenceGrading getLevelOfEvidence() { return levelOfEvidence; }
+    public LevelOfEvidence getLevelOfEvidence() { return levelOfEvidence; }
     @JsonProperty("levelOfEvidence")
-    public void setLevelOfEvidence(CodingLevelOfEvidenceGrading value) { this.levelOfEvidence = value; }
+    public void setLevelOfEvidence(LevelOfEvidence value) { this.levelOfEvidence = value; }
 
     @JsonProperty("medication")
-    public List<CodingAtcUnregisteredMedication> getMedication() { return medication; }
+    public List<AtcUnregisteredMedicationCoding> getMedication() { return medication; }
     @JsonProperty("medication")
-    public void setMedication(List<CodingAtcUnregisteredMedication> value) { this.medication = value; }
+    public void setMedication(List<AtcUnregisteredMedicationCoding> value) { this.medication = value; }
 
     @JsonProperty("patient")
     public Reference getPatient() { return patient; }
@@ -43,9 +43,9 @@ public class MTBStudyEnrollmentRecommendation {
     public void setPatient(Reference value) { this.patient = value; }
 
     @JsonProperty("priority")
-    public CodingRecommendationPriority getPriority() { return priority; }
+    public RecommendationPriorityCoding getPriority() { return priority; }
     @JsonProperty("priority")
-    public void setPriority(CodingRecommendationPriority value) { this.priority = value; }
+    public void setPriority(RecommendationPriorityCoding value) { this.priority = value; }
 
     @JsonProperty("reason")
     public Reference getReason() { return reason; }

src/main/java/dev/pcvolkmer/mv64e/mtb/MtbSystemicTherapy.java

@@ -4,20 +4,21 @@ import com.fasterxml.jackson.annotation.*;
 import java.util.Date;
 import java.util.List;
 
-public class MTBSystemicTherapy {
+public class MtbSystemicTherapy {
     private Reference basedOn;
-    private CodingMtbSystemicTherapyCategory category;
+    private MtbSystemicTherapyCategoryCoding category;
+    private MtbSystemicTherapyDosageDensityCoding dosage;
     private String id;
-    private CodingMtbTherapyIntent intent;
-    private List<CodingAtcUnregisteredMedication> medication;
+    private MtbTherapyIntentCoding intent;
+    private List<AtcUnregisteredMedicationCoding> medication;
     private List<String> notes;
     private Reference patient;
     private PeriodDate period;
     private Reference reason;
-    private CodingMtbSystemicTherapyRecommendationFulfillmentStatus recommendationFulfillmentStatus;
+    private MtbSystemicTherapyRecommendationFulfillmentStatusCoding recommendationFulfillmentStatus;
     private Date recordedOn;
-    private CodingTherapyStatus status;
-    private CodingMtbTherapyStatusReason statusReason;
+    private TherapyStatusCoding status;
+    private MtbTherapyStatusReasonCoding statusReason;
     private Long therapyLine;
 
     @JsonProperty("basedOn")
@@ -26,9 +27,14 @@ public class MTBSystemicTherapy {
     public void setBasedOn(Reference value) { this.basedOn = value; }
 
     @JsonProperty("category")
-    public CodingMtbSystemicTherapyCategory getCategory() { return category; }
+    public MtbSystemicTherapyCategoryCoding getCategory() { return category; }
     @JsonProperty("category")
-    public void setCategory(CodingMtbSystemicTherapyCategory value) { this.category = value; }
+    public void setCategory(MtbSystemicTherapyCategoryCoding value) { this.category = value; }
+
+    @JsonProperty("dosage")
+    public MtbSystemicTherapyDosageDensityCoding getDosage() { return dosage; }
+    @JsonProperty("dosage")
+    public void setDosage(MtbSystemicTherapyDosageDensityCoding value) { this.dosage = value; }
 
     @JsonProperty("id")
     public String getId() { return id; }
@@ -36,14 +42,14 @@ public class MTBSystemicTherapy {
     public void setId(String value) { this.id = value; }
 
     @JsonProperty("intent")
-    public CodingMtbTherapyIntent getIntent() { return intent; }
+    public MtbTherapyIntentCoding getIntent() { return intent; }
     @JsonProperty("intent")
-    public void setIntent(CodingMtbTherapyIntent value) { this.intent = value; }
+    public void setIntent(MtbTherapyIntentCoding value) { this.intent = value; }
 
     @JsonProperty("medication")
-    public List<CodingAtcUnregisteredMedication> getMedication() { return medication; }
+    public List<AtcUnregisteredMedicationCoding> getMedication() { return medication; }
     @JsonProperty("medication")
-    public void setMedication(List<CodingAtcUnregisteredMedication> value) { this.medication = value; }
+    public void setMedication(List<AtcUnregisteredMedicationCoding> value) { this.medication = value; }
 
     @JsonProperty("notes")
     public List<String> getNotes() { return notes; }
@@ -66,9 +72,9 @@ public class MTBSystemicTherapy {
     public void setReason(Reference value) { this.reason = value; }
 
     @JsonProperty("recommendationFulfillmentStatus")
-    public CodingMtbSystemicTherapyRecommendationFulfillmentStatus getRecommendationFulfillmentStatus() { return recommendationFulfillmentStatus; }
+    public MtbSystemicTherapyRecommendationFulfillmentStatusCoding getRecommendationFulfillmentStatus() { return recommendationFulfillmentStatus; }
     @JsonProperty("recommendationFulfillmentStatus")
-    public void setRecommendationFulfillmentStatus(CodingMtbSystemicTherapyRecommendationFulfillmentStatus value) { this.recommendationFulfillmentStatus = value; }
+    public void setRecommendationFulfillmentStatus(MtbSystemicTherapyRecommendationFulfillmentStatusCoding value) { this.recommendationFulfillmentStatus = value; }
 
     @JsonProperty("recordedOn")
     @JsonFormat(pattern = "yyyy-MM-dd")
@@ -78,14 +84,14 @@ public class MTBSystemicTherapy {
     public void setRecordedOn(Date value) { this.recordedOn = value; }
 
     @JsonProperty("status")
-    public CodingTherapyStatus getStatus() { return status; }
+    public TherapyStatusCoding getStatus() { return status; }
     @JsonProperty("status")
-    public void setStatus(CodingTherapyStatus value) { this.status = value; }
+    public void setStatus(TherapyStatusCoding value) { this.status = value; }
 
     @JsonProperty("statusReason")
-    public CodingMtbTherapyStatusReason getStatusReason() { return statusReason; }
+    public MtbTherapyStatusReasonCoding getStatusReason() { return statusReason; }
     @JsonProperty("statusReason")
-    public void setStatusReason(CodingMtbTherapyStatusReason value) { this.statusReason = value; }
+    public void setStatusReason(MtbTherapyStatusReasonCoding value) { this.statusReason = value; }
 
     @JsonProperty("therapyLine")
     public Long getTherapyLine() { return therapyLine; }

src/main/java/dev/pcvolkmer/mv64e/mtb/MtbSystemicTherapyCategoryCoding.java

@@ -2,16 +2,16 @@ package dev.pcvolkmer.mv64e.mtb;
 
 import com.fasterxml.jackson.annotation.*;
 
-public class CodingMtbSystemicTherapyCategory {
-    private CodingMtbSystemicTherapyCategoryCode code;
+public class MtbSystemicTherapyCategoryCoding {
+    private MtbSystemicTherapyCategoryCodingCode code;
     private String display;
     private String system;
     private String version;
 
     @JsonProperty("code")
-    public CodingMtbSystemicTherapyCategoryCode getCode() { return code; }
+    public MtbSystemicTherapyCategoryCodingCode getCode() { return code; }
     @JsonProperty("code")
-    public void setCode(CodingMtbSystemicTherapyCategoryCode value) { this.code = value; }
+    public void setCode(MtbSystemicTherapyCategoryCodingCode value) { this.code = value; }
 
     @JsonProperty("display")
     public String getDisplay() { return display; }

src/main/java/dev/pcvolkmer/mv64e/mtb/MtbSystemicTherapyCategoryCodingCode.java

@@ -3,7 +3,7 @@ package dev.pcvolkmer.mv64e.mtb;
 import java.io.IOException;
 import com.fasterxml.jackson.annotation.*;
 
-public enum CodingMtbSystemicTherapyCategoryCode {
+public enum MtbSystemicTherapyCategoryCodingCode {
     A, I, N, O, S;
 
     @JsonValue
@@ -19,12 +19,12 @@ public enum CodingMtbSystemicTherapyCategoryCode {
     }
 
     @JsonCreator
-    public static CodingMtbSystemicTherapyCategoryCode forValue(String value) throws IOException {
+    public static MtbSystemicTherapyCategoryCodingCode forValue(String value) throws IOException {
         if (value.equals("A")) return A;
         if (value.equals("I")) return I;
         if (value.equals("N")) return N;
         if (value.equals("O")) return O;
         if (value.equals("S")) return S;
-        throw new IOException("Cannot deserialize CodingMtbSystemicTherapyCategoryCode");
+        throw new IOException("Cannot deserialize MtbSystemicTherapyCategoryCodingCode");
     }
 }

src/main/java/dev/pcvolkmer/mv64e/mtb/MtbSystemicTherapyDosageDensityCoding.java

@@ -0,0 +1,30 @@
+package dev.pcvolkmer.mv64e.mtb;
+
+import com.fasterxml.jackson.annotation.*;
+
+public class MtbSystemicTherapyDosageDensityCoding {
+    private MtbSystemicTherapyDosageDensityCodingCode code;
+    private String display;
+    private String system;
+    private String version;
+
+    @JsonProperty("code")
+    public MtbSystemicTherapyDosageDensityCodingCode getCode() { return code; }
+    @JsonProperty("code")
+    public void setCode(MtbSystemicTherapyDosageDensityCodingCode value) { this.code = value; }
+
+    @JsonProperty("display")
+    public String getDisplay() { return display; }
+    @JsonProperty("display")
+    public void setDisplay(String value) { this.display = value; }
+
+    @JsonProperty("system")
+    public String getSystem() { return system; }
+    @JsonProperty("system")
+    public void setSystem(String value) { this.system = value; }
+
+    @JsonProperty("version")
+    public String getVersion() { return version; }
+    @JsonProperty("version")
+    public void setVersion(String value) { this.version = value; }
+}

src/main/java/dev/pcvolkmer/mv64e/mtb/MtbSystemicTherapyDosageDensityCodingCode.java

@@ -0,0 +1,24 @@
+package dev.pcvolkmer.mv64e.mtb;
+
+import java.io.IOException;
+import com.fasterxml.jackson.annotation.*;
+
+public enum MtbSystemicTherapyDosageDensityCodingCode {
+    OVER_50, UNDER_50;
+
+    @JsonValue
+    public String toValue() {
+        switch (this) {
+            case OVER_50: return "over-50%";
+            case UNDER_50: return "under-50%";
+        }
+        return null;
+    }
+
+    @JsonCreator
+    public static MtbSystemicTherapyDosageDensityCodingCode forValue(String value) throws IOException {
+        if (value.equals("over-50%")) return OVER_50;
+        if (value.equals("under-50%")) return UNDER_50;
+        throw new IOException("Cannot deserialize MtbSystemicTherapyDosageDensityCodingCode");
+    }
+}

src/main/java/dev/pcvolkmer/mv64e/mtb/MtbSystemicTherapyRecommendationFulfillmentStatusCoding.java

@@ -0,0 +1,30 @@
+package dev.pcvolkmer.mv64e.mtb;
+
+import com.fasterxml.jackson.annotation.*;
+
+public class MtbSystemicTherapyRecommendationFulfillmentStatusCoding {
+    private MtbSystemicTherapyRecommendationFulfillmentStatusCodingCode code;
+    private String display;
+    private String system;
+    private String version;
+
+    @JsonProperty("code")
+    public MtbSystemicTherapyRecommendationFulfillmentStatusCodingCode getCode() { return code; }
+    @JsonProperty("code")
+    public void setCode(MtbSystemicTherapyRecommendationFulfillmentStatusCodingCode value) { this.code = value; }
+
+    @JsonProperty("display")
+    public String getDisplay() { return display; }
+    @JsonProperty("display")
+    public void setDisplay(String value) { this.display = value; }
+
+    @JsonProperty("system")
+    public String getSystem() { return system; }
+    @JsonProperty("system")
+    public void setSystem(String value) { this.system = value; }
+
+    @JsonProperty("version")
+    public String getVersion() { return version; }
+    @JsonProperty("version")
+    public void setVersion(String value) { this.version = value; }
+}

src/main/java/dev/pcvolkmer/mv64e/mtb/MtbSystemicTherapyRecommendationFulfillmentStatusCodingCode.java

@@ -3,7 +3,7 @@ package dev.pcvolkmer.mv64e.mtb;
 import java.io.IOException;
 import com.fasterxml.jackson.annotation.*;
 
-public enum RecommendationFulfillmentStatusCode {
+public enum MtbSystemicTherapyRecommendationFulfillmentStatusCodingCode {
     COMPLETE, PARTIAL;
 
     @JsonValue
@@ -16,9 +16,9 @@ public enum RecommendationFulfillmentStatusCode {
     }
 
     @JsonCreator
-    public static RecommendationFulfillmentStatusCode forValue(String value) throws IOException {
+    public static MtbSystemicTherapyRecommendationFulfillmentStatusCodingCode forValue(String value) throws IOException {
         if (value.equals("complete")) return COMPLETE;
         if (value.equals("partial")) return PARTIAL;
-        throw new IOException("Cannot deserialize RecommendationFulfillmentStatusCode");
+        throw new IOException("Cannot deserialize MtbSystemicTherapyRecommendationFulfillmentStatusCodingCode");
     }
 }

src/main/java/dev/pcvolkmer/mv64e/mtb/MtbTherapyIntentCoding.java

@@ -2,16 +2,16 @@ package dev.pcvolkmer.mv64e.mtb;
 
 import com.fasterxml.jackson.annotation.*;
 
-public class CodingGeneticCounselingRecommendationReason {
-    private ReasonCode code;
+public class MtbTherapyIntentCoding {
+    private MtbTherapyIntentCodingCode code;
     private String display;
     private String system;
     private String version;
 
     @JsonProperty("code")
-    public ReasonCode getCode() { return code; }
+    public MtbTherapyIntentCodingCode getCode() { return code; }
     @JsonProperty("code")
-    public void setCode(ReasonCode value) { this.code = value; }
+    public void setCode(MtbTherapyIntentCodingCode value) { this.code = value; }
 
     @JsonProperty("display")
     public String getDisplay() { return display; }

src/main/java/dev/pcvolkmer/mv64e/mtb/MtbTherapyIntentCodingCode.java

@@ -3,7 +3,7 @@ package dev.pcvolkmer.mv64e.mtb;
 import java.io.IOException;
 import com.fasterxml.jackson.annotation.*;
 
-public enum IntentCode {
+public enum MtbTherapyIntentCodingCode {
     K, P, S, X;
 
     @JsonValue
@@ -18,11 +18,11 @@ public enum IntentCode {
     }
 
     @JsonCreator
-    public static IntentCode forValue(String value) throws IOException {
+    public static MtbTherapyIntentCodingCode forValue(String value) throws IOException {
         if (value.equals("K")) return K;
         if (value.equals("P")) return P;
         if (value.equals("S")) return S;
         if (value.equals("X")) return X;
-        throw new IOException("Cannot deserialize IntentCode");
+        throw new IOException("Cannot deserialize MtbTherapyIntentCodingCode");
     }
 }

src/main/java/dev/pcvolkmer/mv64e/mtb/MtbTherapyStatusReasonCoding.java

@@ -2,16 +2,16 @@ package dev.pcvolkmer.mv64e.mtb;
 
 import com.fasterxml.jackson.annotation.*;
 
-public class CodingTumorCellContentMethod {
-    private CodingTumorCellContentMethodCode code;
+public class MtbTherapyStatusReasonCoding {
+    private MtbTherapyStatusReasonCodingCode code;
     private String display;
     private String system;
     private String version;
 
     @JsonProperty("code")
-    public CodingTumorCellContentMethodCode getCode() { return code; }
+    public MtbTherapyStatusReasonCodingCode getCode() { return code; }
     @JsonProperty("code")
-    public void setCode(CodingTumorCellContentMethodCode value) { this.code = value; }
+    public void setCode(MtbTherapyStatusReasonCodingCode value) { this.code = value; }
 
     @JsonProperty("display")
     public String getDisplay() { return display; }

src/main/java/dev/pcvolkmer/mv64e/mtb/MtbTherapyStatusReasonCodingCode.java

@@ -3,7 +3,7 @@ package dev.pcvolkmer.mv64e.mtb;
 import java.io.IOException;
 import com.fasterxml.jackson.annotation.*;
 
-public enum CodingMtbTherapyStatusReasonCode {
+public enum MtbTherapyStatusReasonCodingCode {
     BEST_SUPPORTIVE_CARE, CHRONIC_REMISSION, DETERIORATION, LOST_TO_FU, MEDICAL_REASONS, NO_INDICATION, OTHER, OTHER_THERAPY_CHOSEN, PATIENT_DEATH, PATIENT_REFUSAL, PATIENT_WISH, PAYMENT_ENDED, PAYMENT_PENDING, PAYMENT_REFUSED, PROGRESSION, REGULAR_COMPLETION, REGULAR_COMPLETION_WITH_DOSAGE_REDUCTION, REGULAR_COMPLETION_WITH_SUBSTANCE_CHANGE, TOXICITY;
 
     @JsonValue
@@ -33,7 +33,7 @@ public enum CodingMtbTherapyStatusReasonCode {
     }
 
     @JsonCreator
-    public static CodingMtbTherapyStatusReasonCode forValue(String value) throws IOException {
+    public static MtbTherapyStatusReasonCodingCode forValue(String value) throws IOException {
         if (value.equals("best-supportive-care")) return BEST_SUPPORTIVE_CARE;
         if (value.equals("chronic-remission")) return CHRONIC_REMISSION;
         if (value.equals("deterioration")) return DETERIORATION;
@@ -53,6 +53,6 @@ public enum CodingMtbTherapyStatusReasonCode {
         if (value.equals("regular-completion-with-dosage-reduction")) return REGULAR_COMPLETION_WITH_DOSAGE_REDUCTION;
         if (value.equals("regular-completion-with-substance-change")) return REGULAR_COMPLETION_WITH_SUBSTANCE_CHANGE;
         if (value.equals("toxicity")) return TOXICITY;
-        throw new IOException("Cannot deserialize CodingMtbTherapyStatusReasonCode");
+        throw new IOException("Cannot deserialize MtbTherapyStatusReasonCodingCode");
     }
 }

src/main/java/dev/pcvolkmer/mv64e/mtb/MvhMetadata.java

@@ -0,0 +1,32 @@
+package dev.pcvolkmer.mv64e.mtb;
+
+import com.fasterxml.jackson.annotation.*;
+import java.util.List;
+import java.util.Map;
+
+public class MvhMetadata {
+    private ModelProjectConsent modelProjectConsent;
+    private List<Map<String, Object>> researchConsents;
+    private String transferTan;
+    private MvhSubmissionType type;
+
+    @JsonProperty("modelProjectConsent")
+    public ModelProjectConsent getModelProjectConsent() { return modelProjectConsent; }
+    @JsonProperty("modelProjectConsent")
+    public void setModelProjectConsent(ModelProjectConsent value) { this.modelProjectConsent = value; }
+
+    @JsonProperty("researchConsents")
+    public List<Map<String, Object>> getResearchConsents() { return researchConsents; }
+    @JsonProperty("researchConsents")
+    public void setResearchConsents(List<Map<String, Object>> value) { this.researchConsents = value; }
+
+    @JsonProperty("transferTAN")
+    public String getTransferTan() { return transferTan; }
+    @JsonProperty("transferTAN")
+    public void setTransferTan(String value) { this.transferTan = value; }
+
+    @JsonProperty("type")
+    public MvhSubmissionType getType() { return type; }
+    @JsonProperty("type")
+    public void setType(MvhSubmissionType value) { this.type = value; }
+}

src/main/java/dev/pcvolkmer/mv64e/mtb/MvhSubmissionType.java

@@ -0,0 +1,28 @@
+package dev.pcvolkmer.mv64e.mtb;
+
+import java.io.IOException;
+import com.fasterxml.jackson.annotation.*;
+
+public enum MvhSubmissionType {
+    ADDITION, CORRECTION, FOLLOWUP, INITIAL;
+
+    @JsonValue
+    public String toValue() {
+        switch (this) {
+            case ADDITION: return "addition";
+            case CORRECTION: return "correction";
+            case FOLLOWUP: return "followup";
+            case INITIAL: return "initial";
+        }
+        return null;
+    }
+
+    @JsonCreator
+    public static MvhSubmissionType forValue(String value) throws IOException {
+        if (value.equals("addition")) return ADDITION;
+        if (value.equals("correction")) return CORRECTION;
+        if (value.equals("followup")) return FOLLOWUP;
+        if (value.equals("initial")) return INITIAL;
+        throw new IOException("Cannot deserialize MvhSubmissionType");
+    }
+}

src/main/java/dev/pcvolkmer/mv64e/mtb/NgsReportCoding.java

@@ -2,16 +2,16 @@ package dev.pcvolkmer.mv64e.mtb;
 
 import com.fasterxml.jackson.annotation.*;
 
-public class CodingNgsReport {
-    private CodingNgsReportCode code;
+public class NgsReportCoding {
+    private NgsReportCodingCode code;
     private String display;
     private String system;
     private String version;
 
     @JsonProperty("code")
-    public CodingNgsReportCode getCode() { return code; }
+    public NgsReportCodingCode getCode() { return code; }
     @JsonProperty("code")
-    public void setCode(CodingNgsReportCode value) { this.code = value; }
+    public void setCode(NgsReportCodingCode value) { this.code = value; }
 
     @JsonProperty("display")
     public String getDisplay() { return display; }

src/main/java/dev/pcvolkmer/mv64e/mtb/NgsReportCodingCode.java

@@ -3,7 +3,7 @@ package dev.pcvolkmer.mv64e.mtb;
 import java.io.IOException;
 import com.fasterxml.jackson.annotation.*;
 
-public enum CodingNgsReportCode {
+public enum NgsReportCodingCode {
     ARRAY, EXOME, GENOME_LONG_READ, GENOME_SHORT_READ, KARYOTYPING, OTHER, PANEL, SINGLE;
 
     @JsonValue
@@ -22,7 +22,7 @@ public enum CodingNgsReportCode {
     }
 
     @JsonCreator
-    public static CodingNgsReportCode forValue(String value) throws IOException {
+    public static NgsReportCodingCode forValue(String value) throws IOException {
         if (value.equals("array")) return ARRAY;
         if (value.equals("exome")) return EXOME;
         if (value.equals("genome-long-read")) return GENOME_LONG_READ;
@@ -31,6 +31,6 @@ public enum CodingNgsReportCode {
         if (value.equals("other")) return OTHER;
         if (value.equals("panel")) return PANEL;
         if (value.equals("single")) return SINGLE;
-        throw new IOException("Cannot deserialize CodingNgsReportCode");
+        throw new IOException("Cannot deserialize NgsReportCodingCode");
     }
 }