Merge pull request #7 from pcvolkmer/preview_datamodel_21

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/Age.java

@@ -2,7 +2,7 @@ package dev.pcvolkmer.mv64e.mtb;
 
 import com.fasterxml.jackson.annotation.*;
 
-public class ValueWithUnit {
+public class Age {
     private Unit unit;
     private double value;
 

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

@@ -0,0 +1,30 @@
+package dev.pcvolkmer.mv64e.mtb;
+
+import com.fasterxml.jackson.annotation.*;
+
+public class AtcUnregisteredMedicationCoding {
+    private String code;
+    private String display;
+    private RequestedMedicationSystem system;
+    private String version;
+
+    @JsonProperty("code")
+    public String getCode() { return code; }
+    @JsonProperty("code")
+    public void setCode(String value) { this.code = value; }
+
+    @JsonProperty("display")
+    public String getDisplay() { return display; }
+    @JsonProperty("display")
+    public void setDisplay(String value) { this.display = value; }
+
+    @JsonProperty("system")
+    public RequestedMedicationSystem getSystem() { return system; }
+    @JsonProperty("system")
+    public void setSystem(RequestedMedicationSystem 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/BaseVariantLocalizationCoding.java

@@ -0,0 +1,30 @@
+package dev.pcvolkmer.mv64e.mtb;
+
+import com.fasterxml.jackson.annotation.*;
+
+public class BaseVariantLocalizationCoding {
+    private BaseVariantLocalizationCodingCode code;
+    private String display;
+    private String system;
+    private String version;
+
+    @JsonProperty("code")
+    public BaseVariantLocalizationCodingCode getCode() { return code; }
+    @JsonProperty("code")
+    public void setCode(BaseVariantLocalizationCodingCode 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/BaseVariantLocalizationCodingCode.java

@@ -0,0 +1,30 @@
+package dev.pcvolkmer.mv64e.mtb;
+
+import java.io.IOException;
+import com.fasterxml.jackson.annotation.*;
+
+public enum BaseVariantLocalizationCodingCode {
+    CODING_REGION, INTERGENIC, INTRONIC, REGULATORY_REGION, SPLICING_REGION;
+
+    @JsonValue
+    public String toValue() {
+        switch (this) {
+            case CODING_REGION: return "coding-region";
+            case INTERGENIC: return "intergenic";
+            case INTRONIC: return "intronic";
+            case REGULATORY_REGION: return "regulatory-region";
+            case SPLICING_REGION: return "splicing-region";
+        }
+        return null;
+    }
+
+    @JsonCreator
+    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 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/Chromosome.java

@@ -3,7 +3,7 @@ package dev.pcvolkmer.mv64e.mtb;
 import java.io.IOException;
 import com.fasterxml.jackson.annotation.*;
 
-public enum ChromosomeCode {
+public enum Chromosome {
     CHR1, CHR10, CHR11, CHR12, CHR13, CHR14, CHR15, CHR16, CHR17, CHR18, CHR19, CHR2, CHR20, CHR21, CHR22, CHR3, CHR4, CHR5, CHR6, CHR7, CHR8, CHR9, CHR_X, CHR_Y;
 
     @JsonValue
@@ -38,7 +38,7 @@ public enum ChromosomeCode {
     }
 
     @JsonCreator
-    public static ChromosomeCode forValue(String value) throws IOException {
+    public static Chromosome forValue(String value) throws IOException {
         if (value.equals("chr1")) return CHR1;
         if (value.equals("chr10")) return CHR10;
         if (value.equals("chr11")) return CHR11;
@@ -63,6 +63,6 @@ public enum ChromosomeCode {
         if (value.equals("chr9")) return CHR9;
         if (value.equals("chrX")) return CHR_X;
         if (value.equals("chrY")) return CHR_Y;
-        throw new IOException("Cannot deserialize ChromosomeCode");
+        throw new IOException("Cannot deserialize Chromosome");
     }
 }

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

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

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

@@ -2,13 +2,15 @@ package dev.pcvolkmer.mv64e.mtb;
 
 import com.fasterxml.jackson.annotation.*;
 import java.util.Date;
+import java.util.List;
 
 public class Claim {
     private String id;
     private Date issuedOn;
-    private Patient patient;
-    private Recommendation recommendation;
-    private Coding stage;
+    private Reference patient;
+    private Reference recommendation;
+    private List<AtcUnregisteredMedicationCoding> requestedMedication;
+    private ClaimStageCoding stage;
 
     @JsonProperty("id")
     public String getId() { return id; }
@@ -23,17 +25,22 @@ public class Claim {
     public void setIssuedOn(Date value) { this.issuedOn = value; }
 
     @JsonProperty("patient")
-    public Patient getPatient() { return patient; }
+    public Reference getPatient() { return patient; }
     @JsonProperty("patient")
-    public void setPatient(Patient value) { this.patient = value; }
+    public void setPatient(Reference value) { this.patient = value; }
 
     @JsonProperty("recommendation")
-    public Recommendation getRecommendation() { return recommendation; }
+    public Reference getRecommendation() { return recommendation; }
     @JsonProperty("recommendation")
-    public void setRecommendation(Recommendation value) { this.recommendation = value; }
+    public void setRecommendation(Reference value) { this.recommendation = value; }
+
+    @JsonProperty("requestedMedication")
+    public List<AtcUnregisteredMedicationCoding> getRequestedMedication() { return requestedMedication; }
+    @JsonProperty("requestedMedication")
+    public void setRequestedMedication(List<AtcUnregisteredMedicationCoding> value) { this.requestedMedication = value; }
 
     @JsonProperty("stage")
-    public Coding getStage() { return stage; }
+    public ClaimStageCoding getStage() { return stage; }
     @JsonProperty("stage")
-    public void setStage(Coding value) { this.stage = value; }
+    public void setStage(ClaimStageCoding value) { this.stage = value; }
 }

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

@@ -4,17 +4,17 @@ import com.fasterxml.jackson.annotation.*;
 import java.util.Date;
 
 public class ClaimResponse {
-    private ClaimResponseClaim claim;
+    private Reference claim;
     private String id;
     private Date issuedOn;
-    private Patient patient;
-    private CodingClaimResponseStatus status;
-    private CodingClaimResponseStatusReason statusReason;
+    private Reference patient;
+    private ClaimResponseStatusCoding status;
+    private ClaimResponseStatusReasonCoding statusReason;
 
     @JsonProperty("claim")
-    public ClaimResponseClaim getClaim() { return claim; }
+    public Reference getClaim() { return claim; }
     @JsonProperty("claim")
-    public void setClaim(ClaimResponseClaim value) { this.claim = value; }
+    public void setClaim(Reference value) { this.claim = value; }
 
     @JsonProperty("id")
     public String getId() { return id; }
@@ -29,17 +29,17 @@ public class ClaimResponse {
     public void setIssuedOn(Date value) { this.issuedOn = value; }
 
     @JsonProperty("patient")
-    public Patient getPatient() { return patient; }
+    public Reference getPatient() { return patient; }
     @JsonProperty("patient")
-    public void setPatient(Patient value) { this.patient = value; }
+    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/ClaimResponseClaim.java

@@ -1,18 +0,0 @@
-package dev.pcvolkmer.mv64e.mtb;
-
-import com.fasterxml.jackson.annotation.*;
-
-public class ClaimResponseClaim {
-    private String id;
-    private ClaimResponseClaimType type;
-
-    @JsonProperty("id")
-    public String getId() { return id; }
-    @JsonProperty("id")
-    public void setId(String value) { this.id = value; }
-
-    @JsonProperty("type")
-    public ClaimResponseClaimType getType() { return type; }
-    @JsonProperty("type")
-    public void setType(ClaimResponseClaimType value) { this.type = value; }
-}

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

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

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 ClaimResponseStatus {
+public enum ClaimResponseStatusCodingCode {
     ACCEPTED, REJECTED, UNKNOWN;
 
     @JsonValue
@@ -17,15 +17,10 @@ public enum ClaimResponseStatus {
     }
 
     @JsonCreator
-    public static ClaimResponseStatus forValue(String value) throws IOException {
-        switch (value) {
-            case "accepted":
-                return ACCEPTED;
-            case "rejected":
-                return REJECTED;
-            case "unknown":
-                return UNKNOWN;
-        }
-        throw new IOException("Cannot deserialize ClaimResponseStatus");
+    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 ClaimResponseStatusCodingCode");
     }
 }

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

@@ -0,0 +1,30 @@
+package dev.pcvolkmer.mv64e.mtb;
+
+import com.fasterxml.jackson.annotation.*;
+
+public class ClaimResponseStatusReasonCoding {
+    private ClaimResponseStatusReasonCodingCode code;
+    private String display;
+    private String system;
+    private String version;
+
+    @JsonProperty("code")
+    public ClaimResponseStatusReasonCodingCode getCode() { return code; }
+    @JsonProperty("code")
+    public void setCode(ClaimResponseStatusReasonCodingCode 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/ClaimResponseStatusReasonCodingCode.java

@@ -3,7 +3,7 @@ package dev.pcvolkmer.mv64e.mtb;
 import java.io.IOException;
 import com.fasterxml.jackson.annotation.*;
 
-public enum ClaimResponseStatusReason {
+public enum ClaimResponseStatusReasonCodingCode {
     APPROVAL_REVOCATION, FORMAL_REASONS, INCLUSION_IN_STUDY, INSUFFICIENT_EVIDENCE, OTHER, OTHER_THERAPY_RECOMMENDED, STANDARD_THERAPY_NOT_EXHAUSTED, UNKNOWN;
 
     @JsonValue
@@ -22,25 +22,15 @@ public enum ClaimResponseStatusReason {
     }
 
     @JsonCreator
-    public static ClaimResponseStatusReason forValue(String value) throws IOException {
-        switch (value) {
-            case "approval-revocation":
-                return APPROVAL_REVOCATION;
-            case "formal-reasons":
-                return FORMAL_REASONS;
-            case "inclusion-in-study":
-                return INCLUSION_IN_STUDY;
-            case "insufficient-evidence":
-                return INSUFFICIENT_EVIDENCE;
-            case "other":
-                return OTHER;
-            case "other-therapy-recommended":
-                return OTHER_THERAPY_RECOMMENDED;
-            case "standard-therapy-not-exhausted":
-                return STANDARD_THERAPY_NOT_EXHAUSTED;
-            case "unknown":
-                return UNKNOWN;
-        }
-        throw new IOException("Cannot deserialize ClaimResponseStatusReason");
+    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;
+        if (value.equals("insufficient-evidence")) return INSUFFICIENT_EVIDENCE;
+        if (value.equals("other")) return OTHER;
+        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 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 CodingLevelOfEvidenceAddendum {
-    private AddendumCode code;
+public class ClaimStageCoding {
+    private ClaimStageCodingCode code;
     private String display;
     private String system;
     private String version;
 
     @JsonProperty("code")
-    public AddendumCode getCode() { return code; }
+    public ClaimStageCodingCode getCode() { return code; }
     @JsonProperty("code")
-    public void setCode(AddendumCode 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

@@ -0,0 +1,28 @@
+package dev.pcvolkmer.mv64e.mtb;
+
+import java.io.IOException;
+import com.fasterxml.jackson.annotation.*;
+
+public enum ClaimStageCodingCode {
+    FOLLOW_UP_CLAIM, INITIAL_CLAIM, REVOCATION, UNKNOWN;
+
+    @JsonValue
+    public String toValue() {
+        switch (this) {
+            case FOLLOW_UP_CLAIM: return "follow-up-claim";
+            case INITIAL_CLAIM: return "initial-claim";
+            case REVOCATION: return "revocation";
+            case UNKNOWN: return "unknown";
+        }
+        return null;
+    }
+
+    @JsonCreator
+    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 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 CodingProteinExpressionIcScore {
-    private ICScoreCode code;
+public class ClinVarCoding {
+    private ClinVarCodingCode code;
     private String display;
     private String system;
     private String version;
 
     @JsonProperty("code")
-    public ICScoreCode getCode() { return code; }
+    public ClinVarCodingCode getCode() { return code; }
     @JsonProperty("code")
-    public void setCode(ICScoreCode 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

@@ -4,25 +4,26 @@ import com.fasterxml.jackson.annotation.*;
 import java.util.List;
 
 public class Cnv {
-    private CodingChromosome chromosome;
+    private Chromosome chromosome;
     private Double cnA;
     private Double cnB;
-    private List<CodingGene> copyNumberNeutralLoH;
+    private List<Coding> copyNumberNeutralLoH;
     private EndRange endRange;
+    private List<VariantExternalId> externalIds;
     private String id;
-    private Reference indication;
-    private Patient patient;
+    private List<BaseVariantLocalizationCoding> localization;
+    private Reference patient;
     private Double relativeCopyNumber;
-    private List<CodingGene> reportedAffectedGenes;
+    private List<Coding> reportedAffectedGenes;
     private String reportedFocality;
     private StartRange startRange;
     private Long totalCopyNumber;
-    private CodingCnvType type;
+    private CnvCoding type;
 
     @JsonProperty("chromosome")
-    public CodingChromosome getChromosome() { return chromosome; }
+    public Chromosome getChromosome() { return chromosome; }
     @JsonProperty("chromosome")
-    public void setChromosome(CodingChromosome value) { this.chromosome = value; }
+    public void setChromosome(Chromosome value) { this.chromosome = value; }
 
     @JsonProperty("cnA")
     public Double getCnA() { return cnA; }
@@ -35,29 +36,34 @@ public class Cnv {
     public void setCnB(Double value) { this.cnB = value; }
 
     @JsonProperty("copyNumberNeutralLoH")
-    public List<CodingGene> getCopyNumberNeutralLoH() { return copyNumberNeutralLoH; }
+    public List<Coding> getCopyNumberNeutralLoH() { return copyNumberNeutralLoH; }
     @JsonProperty("copyNumberNeutralLoH")
-    public void setCopyNumberNeutralLoH(List<CodingGene> value) { this.copyNumberNeutralLoH = value; }
+    public void setCopyNumberNeutralLoH(List<Coding> value) { this.copyNumberNeutralLoH = value; }
 
     @JsonProperty("endRange")
     public EndRange getEndRange() { return endRange; }
     @JsonProperty("endRange")
     public void setEndRange(EndRange value) { this.endRange = value; }
 
+    @JsonProperty("externalIds")
+    public List<VariantExternalId> getExternalIds() { return externalIds; }
+    @JsonProperty("externalIds")
+    public void setExternalIds(List<VariantExternalId> value) { this.externalIds = value; }
+
     @JsonProperty("id")
     public String getId() { return id; }
     @JsonProperty("id")
     public void setId(String value) { this.id = value; }
 
-    @JsonProperty("indication")
-    public Reference getIndication() { return indication; }
-    @JsonProperty("indication")
-    public void setIndication(Reference value) { this.indication = value; }
+    @JsonProperty("localization")
+    public List<BaseVariantLocalizationCoding> getLocalization() { return localization; }
+    @JsonProperty("localization")
+    public void setLocalization(List<BaseVariantLocalizationCoding> value) { this.localization = value; }
 
     @JsonProperty("patient")
-    public Patient getPatient() { return patient; }
+    public Reference getPatient() { return patient; }
     @JsonProperty("patient")
-    public void setPatient(Patient value) { this.patient = value; }
+    public void setPatient(Reference value) { this.patient = value; }
 
     @JsonProperty("relativeCopyNumber")
     public Double getRelativeCopyNumber() { return relativeCopyNumber; }
@@ -65,9 +71,9 @@ public class Cnv {
     public void setRelativeCopyNumber(Double value) { this.relativeCopyNumber = value; }
 
     @JsonProperty("reportedAffectedGenes")
-    public List<CodingGene> getReportedAffectedGenes() { return reportedAffectedGenes; }
+    public List<Coding> getReportedAffectedGenes() { return reportedAffectedGenes; }
     @JsonProperty("reportedAffectedGenes")
-    public void setReportedAffectedGenes(List<CodingGene> value) { this.reportedAffectedGenes = value; }
+    public void setReportedAffectedGenes(List<Coding> value) { this.reportedAffectedGenes = value; }
 
     @JsonProperty("reportedFocality")
     public String getReportedFocality() { return reportedFocality; }
@@ -85,7 +91,7 @@ public class Cnv {
     public void setTotalCopyNumber(Long value) { this.totalCopyNumber = value; }
 
     @JsonProperty("type")
-    public CodingCnvType getType() { return type; }
+    public CnvCoding getType() { return type; }
     @JsonProperty("type")
-    public void setType(CodingCnvType 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 CodingGender {
-    private Gender code;
+public class CnvCoding {
+    private CnvCodingCode code;
     private String display;
     private String system;
     private String version;
 
     @JsonProperty("code")
-    public Gender getCode() { return code; }
+    public CnvCodingCode getCode() { return code; }
     @JsonProperty("code")
-    public void setCode(Gender 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 CNVType {
+public enum CnvCodingCode {
     HIGH_LEVEL_GAIN, LOSS, LOW_LEVEL_GAIN;
 
     @JsonValue
@@ -17,15 +17,10 @@ public enum CNVType {
     }
 
     @JsonCreator
-    public static CNVType forValue(String value) throws IOException {
-        switch (value) {
-            case "high-level-gain":
-                return HIGH_LEVEL_GAIN;
-            case "loss":
-                return LOSS;
-            case "low-level-gain":
-                return LOW_LEVEL_GAIN;
-        }
-        throw new IOException("Cannot deserialize CNVType");
+    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 CnvCodingCode");
     }
 }

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

@@ -1,24 +0,0 @@
-package dev.pcvolkmer.mv64e.mtb;
-
-import com.fasterxml.jackson.annotation.*;
-
-public class CodingCarePlanStatusReason {
-    private String code;
-    private String display;
-    private String system;
-
-    @JsonProperty("code")
-    public String getCode() { return code; }
-    @JsonProperty("code")
-    public void setCode(String 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; }
-}

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

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

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

@@ -1,24 +0,0 @@
-package dev.pcvolkmer.mv64e.mtb;
-
-import com.fasterxml.jackson.annotation.*;
-
-public class CodingClaimResponseStatus {
-    private ClaimResponseStatus code;
-    private String display;
-    private String system;
-
-    @JsonProperty("code")
-    public ClaimResponseStatus getCode() { return code; }
-    @JsonProperty("code")
-    public void setCode(ClaimResponseStatus 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; }
-}

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

@@ -1,24 +0,0 @@
-package dev.pcvolkmer.mv64e.mtb;
-
-import com.fasterxml.jackson.annotation.*;
-
-public class CodingClaimResponseStatusReason {
-    private ClaimResponseStatusReason code;
-    private String display;
-    private String system;
-
-    @JsonProperty("code")
-    public ClaimResponseStatusReason getCode() { return code; }
-    @JsonProperty("code")
-    public void setCode(ClaimResponseStatusReason 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; }
-}

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

@@ -1,24 +0,0 @@
-package dev.pcvolkmer.mv64e.mtb;
-
-import com.fasterxml.jackson.annotation.*;
-
-public class CodingCnvType {
-    private CNVType code;
-    private String display;
-    private String system;
-
-    @JsonProperty("code")
-    public CNVType getCode() { return code; }
-    @JsonProperty("code")
-    public void setCode(CNVType 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; }
-}

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

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

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

@@ -1,30 +0,0 @@
-package dev.pcvolkmer.mv64e.mtb;
-
-import com.fasterxml.jackson.annotation.*;
-
-public class CodingProteinExpressionResult {
-    private ProteinExpressionResultCode code;
-    private String display;
-    private String system;
-    private String version;
-
-    @JsonProperty("code")
-    public ProteinExpressionResultCode getCode() { return code; }
-    @JsonProperty("code")
-    public void setCode(ProteinExpressionResultCode 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/CodingTherapyRecommendationPriority.java

@@ -1,24 +0,0 @@
-package dev.pcvolkmer.mv64e.mtb;
-
-import com.fasterxml.jackson.annotation.*;
-
-public class CodingTherapyRecommendationPriority {
-    private TherapyRecommendationPriority code;
-    private String display;
-    private String system;
-
-    @JsonProperty("code")
-    public TherapyRecommendationPriority getCode() { return code; }
-    @JsonProperty("code")
-    public void setCode(TherapyRecommendationPriority 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; }
-}

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

@@ -1,24 +0,0 @@
-package dev.pcvolkmer.mv64e.mtb;
-
-import com.fasterxml.jackson.annotation.*;
-
-public class CodingTherapyStatus {
-    private TherapyStatus code;
-    private String display;
-    private String system;
-
-    @JsonProperty("code")
-    public TherapyStatus getCode() { return code; }
-    @JsonProperty("code")
-    public void setCode(TherapyStatus 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; }
-}

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

@@ -1,30 +0,0 @@
-package dev.pcvolkmer.mv64e.mtb;
-
-import com.fasterxml.jackson.annotation.*;
-
-public class CodingTherapyStatusReason {
-    private StatusReasonCode code;
-    private String display;
-    private String system;
-    private String version;
-
-    @JsonProperty("code")
-    public StatusReasonCode getCode() { return code; }
-    @JsonProperty("code")
-    public void setCode(StatusReasonCode 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/CodingTumorCellContentMethod.java

@@ -1,24 +0,0 @@
-package dev.pcvolkmer.mv64e.mtb;
-
-import com.fasterxml.jackson.annotation.*;
-
-public class CodingTumorCellContentMethod {
-    private TumorCellContentMethod code;
-    private String display;
-    private String system;
-
-    @JsonProperty("code")
-    public TumorCellContentMethod getCode() { return code; }
-    @JsonProperty("code")
-    public void setCode(TumorCellContentMethod 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; }
-}

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

@@ -1,24 +0,0 @@
-package dev.pcvolkmer.mv64e.mtb;
-
-import com.fasterxml.jackson.annotation.*;
-
-public class CodingTumorSpecimenCollectionLocalization {
-    private TumorSpecimenCollectionLocalization code;
-    private String display;
-    private String system;
-
-    @JsonProperty("code")
-    public TumorSpecimenCollectionLocalization getCode() { return code; }
-    @JsonProperty("code")
-    public void setCode(TumorSpecimenCollectionLocalization 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; }
-}

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

@@ -1,24 +0,0 @@
-package dev.pcvolkmer.mv64e.mtb;
-
-import com.fasterxml.jackson.annotation.*;
-
-public class CodingTumorSpecimenCollectionMethod {
-    private TumorSpecimenCollectionMethod code;
-    private String display;
-    private String system;
-
-    @JsonProperty("code")
-    public TumorSpecimenCollectionMethod getCode() { return code; }
-    @JsonProperty("code")
-    public void setCode(TumorSpecimenCollectionMethod 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; }
-}

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

@@ -1,24 +0,0 @@
-package dev.pcvolkmer.mv64e.mtb;
-
-import com.fasterxml.jackson.annotation.*;
-
-public class CodingTumorSpecimenType {
-    private TumorSpecimenType code;
-    private String display;
-    private String system;
-
-    @JsonProperty("code")
-    public TumorSpecimenType getCode() { return code; }
-    @JsonProperty("code")
-    public void setCode(TumorSpecimenType 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; }
-}

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

@@ -1,24 +0,0 @@
-package dev.pcvolkmer.mv64e.mtb;
-
-import com.fasterxml.jackson.annotation.*;
-
-public class CodingTumorSpread {
-    private StageCode code;
-    private String display;
-    private String system;
-
-    @JsonProperty("code")
-    public StageCode getCode() { return code; }
-    @JsonProperty("code")
-    public void setCode(StageCode 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; }
-}

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

@@ -5,23 +5,21 @@ import java.util.Date;
 
 public class Collection {
     private Date date;
-    private CodingTumorSpecimenCollectionLocalization localization;
-    private CodingTumorSpecimenCollectionMethod method;
+    private TumorSpecimenCollectionLocalizationCoding localization;
+    private TumorSpecimenCollectionMethodCoding method;
 
     @JsonProperty("date")
-    @JsonFormat(pattern = "yyyy-MM-dd")
     public Date getDate() { return date; }
     @JsonProperty("date")
-    @JsonFormat(pattern = "yyyy-MM-dd")
     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/Diagnosis.java

@@ -1,18 +0,0 @@
-package dev.pcvolkmer.mv64e.mtb;
-
-import com.fasterxml.jackson.annotation.*;
-
-public class Diagnosis {
-    private String id;
-    private String type;
-
-    @JsonProperty("id")
-    public String getId() { return id; }
-    @JsonProperty("id")
-    public void setId(String value) { this.id = value; }
-
-    @JsonProperty("type")
-    public String getType() { return type; }
-    @JsonProperty("type")
-    public void setType(String value) { this.type = value; }
-}

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

@@ -1,13 +1,22 @@
 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<BaseVariantLocalizationCoding> localization;
+    private Reference patient;
     private long reportedNumReads;
 
+    @JsonProperty("externalIds")
+    public List<VariantExternalId> getExternalIds() { return externalIds; }
+    @JsonProperty("externalIds")
+    public void setExternalIds(List<VariantExternalId> value) { this.externalIds = value; }
+
     @JsonProperty("fusionPartner3prime")
     public DnaFusionFusionPartner3Prime getFusionPartner3Prime() { return fusionPartner3Prime; }
     @JsonProperty("fusionPartner3prime")
@@ -23,6 +32,16 @@ public class DNAFusion {
     @JsonProperty("id")
     public void setId(String value) { this.id = value; }
 
+    @JsonProperty("localization")
+    public List<BaseVariantLocalizationCoding> getLocalization() { return localization; }
+    @JsonProperty("localization")
+    public void setLocalization(List<BaseVariantLocalizationCoding> value) { this.localization = value; }
+
+    @JsonProperty("patient")
+    public Reference getPatient() { return patient; }
+    @JsonProperty("patient")
+    public void setPatient(Reference value) { this.patient = value; }
+
     @JsonProperty("reportedNumReads")
     public long getReportedNumReads() { return reportedNumReads; }
     @JsonProperty("reportedNumReads")

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

@@ -3,19 +3,19 @@ package dev.pcvolkmer.mv64e.mtb;
 import com.fasterxml.jackson.annotation.*;
 
 public class DnaFusionFusionPartner3Prime {
-    private CodingChromosome chromosome;
-    private CodingGene gene;
+    private Chromosome chromosome;
+    private Coding gene;
     private double position;
 
     @JsonProperty("chromosome")
-    public CodingChromosome getChromosome() { return chromosome; }
+    public Chromosome getChromosome() { return chromosome; }
     @JsonProperty("chromosome")
-    public void setChromosome(CodingChromosome value) { this.chromosome = value; }
+    public void setChromosome(Chromosome value) { this.chromosome = value; }
 
     @JsonProperty("gene")
-    public CodingGene getGene() { return gene; }
+    public Coding getGene() { return gene; }
     @JsonProperty("gene")
-    public void setGene(CodingGene value) { this.gene = value; }
+    public void setGene(Coding value) { this.gene = value; }
 
     @JsonProperty("position")
     public double getPosition() { return position; }

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

@@ -3,19 +3,19 @@ package dev.pcvolkmer.mv64e.mtb;
 import com.fasterxml.jackson.annotation.*;
 
 public class DnaFusionFusionPartner5Prime {
-    private CodingChromosome chromosome;
-    private Gene gene;
+    private Chromosome chromosome;
+    private Coding gene;
     private double position;
 
     @JsonProperty("chromosome")
-    public CodingChromosome getChromosome() { return chromosome; }
+    public Chromosome getChromosome() { return chromosome; }
     @JsonProperty("chromosome")
-    public void setChromosome(CodingChromosome value) { this.chromosome = value; }
+    public void setChromosome(Chromosome value) { this.chromosome = value; }
 
     @JsonProperty("gene")
-    public Gene getGene() { return gene; }
+    public Coding getGene() { return gene; }
     @JsonProperty("gene")
-    public void setGene(Gene value) { this.gene = value; }
+    public void setGene(Coding value) { this.gene = value; }
 
     @JsonProperty("position")
     public double getPosition() { return position; }

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

@@ -1,22 +0,0 @@
-package dev.pcvolkmer.mv64e.mtb;
-
-import java.io.IOException;
-import com.fasterxml.jackson.annotation.*;
-
-public enum EXTIdSystem {
-    HTTPS_PUBMED_NCBI_NLM_NIH_GOV;
-
-    @JsonValue
-    public String toValue() {
-        switch (this) {
-            case HTTPS_PUBMED_NCBI_NLM_NIH_GOV: return "https://pubmed.ncbi.nlm.nih.gov/";
-        }
-        return null;
-    }
-
-    @JsonCreator
-    public static EXTIdSystem forValue(String value) throws IOException {
-        if (value.equals("https://pubmed.ncbi.nlm.nih.gov/")) return HTTPS_PUBMED_NCBI_NLM_NIH_GOV;
-        throw new IOException("Cannot deserialize EXTIdSystem");
-    }
-}

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

@@ -1,37 +0,0 @@
-package dev.pcvolkmer.mv64e.mtb;
-
-import java.io.IOException;
-import com.fasterxml.jackson.annotation.*;
-
-public enum EcogCode {
-    CODE_0, CODE_1, CODE_2, CODE_3, CODE_4;
-
-    @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";
-        }
-        return null;
-    }
-
-    @JsonCreator
-    public static EcogCode forValue(String value) throws IOException {
-        switch (value) {
-            case "0":
-                return CODE_0;
-            case "1":
-                return CODE_1;
-            case "2":
-                return CODE_2;
-            case "3":
-                return CODE_3;
-            case "4":
-                return CODE_4;
-        }
-        throw new IOException("Cannot deserialize EcogCode");
-    }
-}

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 CodingTumorGrade {
-    private TumorGradeCode code;
+public class EcogCoding {
+    private EcogCodingCode code;
     private String display;
     private String system;
     private String version;
 
     @JsonProperty("code")
-    public TumorGradeCode getCode() { return code; }
+    public EcogCodingCode getCode() { return code; }
     @JsonProperty("code")
-    public void setCode(TumorGradeCode 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/ExternalId.java

@@ -1,18 +0,0 @@
-package dev.pcvolkmer.mv64e.mtb;
-
-import com.fasterxml.jackson.annotation.*;
-
-public class ExternalId {
-    private String system;
-    private String value;
-
-    @JsonProperty("system")
-    public String getSystem() { return system; }
-    @JsonProperty("system")
-    public void setSystem(String value) { this.system = value; }
-
-    @JsonProperty("value")
-    public String getValue() { return value; }
-    @JsonProperty("value")
-    public void setValue(String value) { this.value = value; }
-}

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

@@ -0,0 +1,28 @@
+package dev.pcvolkmer.mv64e.mtb;
+
+import java.io.IOException;
+import com.fasterxml.jackson.annotation.*;
+
+public enum ExternalIdSystem {
+    CANCER_SANGER_AC_UK_COSMIC, ENSEMBL_ORG, NCBI_NLM_NIH_GOV_ENTREZ, NCBI_NLM_NIH_GOV_SNP;
+
+    @JsonValue
+    public String toValue() {
+        switch (this) {
+            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 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

@@ -0,0 +1,33 @@
+package dev.pcvolkmer.mv64e.mtb;
+
+import com.fasterxml.jackson.annotation.*;
+import java.util.Date;
+
+public class FollowUp {
+    private Date date;
+    private Date lastContactDate;
+    private Reference patient;
+    private FollowUpPatientStatusCoding patientStatus;
+
+    @JsonProperty("date")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    public Date getDate() { return date; }
+    @JsonProperty("date")
+    @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 FollowUpPatientStatusCoding getPatientStatus() { return patientStatus; }
+    @JsonProperty("patientStatus")
+    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

@@ -0,0 +1,22 @@
+package dev.pcvolkmer.mv64e.mtb;
+
+import java.io.IOException;
+import com.fasterxml.jackson.annotation.*;
+
+public enum FollowUpPatientStatusCodingCode {
+    LOST_TO_FU;
+
+    @JsonValue
+    public String toValue() {
+        switch (this) {
+            case LOST_TO_FU: return "lost-to-fu";
+        }
+        return null;
+    }
+
+    @JsonCreator
+    public static FollowUpPatientStatusCodingCode forValue(String value) throws IOException {
+        if (value.equals("lost-to-fu")) return LOST_TO_FU;
+        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 RecistCode code;
+public class GenderCoding {
+    private GenderCodingCode code;
     private String display;
     private String system;
     private String version;
 
     @JsonProperty("code")
-    public RecistCode getCode() { return code; }
+    public GenderCodingCode getCode() { return code; }
     @JsonProperty("code")
-    public void setCode(RecistCode 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 Gender {
+public enum GenderCodingCode {
     FEMALE, MALE, OTHER, UNKNOWN;
 
     @JsonValue
@@ -18,17 +18,11 @@ public enum Gender {
     }
 
     @JsonCreator
-    public static Gender forValue(String value) throws IOException {
-        switch (value) {
-            case "female":
-                return FEMALE;
-            case "male":
-                return MALE;
-            case "other":
-                return OTHER;
-            case "unknown":
-                return UNKNOWN;
-        }
-        throw new IOException("Cannot deserialize Gender");
+    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 GenderCodingCode");
     }
 }

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

@@ -1,18 +0,0 @@
-package dev.pcvolkmer.mv64e.mtb;
-
-import com.fasterxml.jackson.annotation.*;
-
-public class Gene {
-    private String ensemblId;
-    private String hgncId;
-
-    @JsonProperty("ensemblId")
-    public String getEnsemblId() { return ensemblId; }
-    @JsonProperty("ensemblId")
-    public void setEnsemblId(String value) { this.ensemblId = value; }
-
-    @JsonProperty("hgncId")
-    public String getHgncId() { return hgncId; }
-    @JsonProperty("hgncId")
-    public void setHgncId(String value) { this.hgncId = value; }
-}

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

@@ -0,0 +1,24 @@
+package dev.pcvolkmer.mv64e.mtb;
+
+import com.fasterxml.jackson.annotation.*;
+
+public class GeneAlterationReference {
+    private String display;
+    private Coding gene;
+    private Reference variant;
+
+    @JsonProperty("display")
+    public String getDisplay() { return display; }
+    @JsonProperty("display")
+    public void setDisplay(String value) { this.display = value; }
+
+    @JsonProperty("gene")
+    public Coding getGene() { return gene; }
+    @JsonProperty("gene")
+    public void setGene(Coding value) { this.gene = value; }
+
+    @JsonProperty("variant")
+    public Reference getVariant() { return variant; }
+    @JsonProperty("variant")
+    public void setVariant(Reference value) { this.variant = value; }
+}

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

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

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

@@ -6,8 +6,8 @@ import java.util.Date;
 public class GeneticCounselingRecommendation {
     private String id;
     private Date issuedOn;
-    private Patient patient;
-    private Coding reason;
+    private Reference patient;
+    private GeneticCounselingRecommendationReasonCoding reason;
 
     @JsonProperty("id")
     public String getId() { return id; }
@@ -15,17 +15,19 @@ public class GeneticCounselingRecommendation {
     public void setId(String value) { this.id = value; }
 
     @JsonProperty("issuedOn")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     public Date getIssuedOn() { return issuedOn; }
     @JsonProperty("issuedOn")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     public void setIssuedOn(Date value) { this.issuedOn = value; }
 
     @JsonProperty("patient")
-    public Patient getPatient() { return patient; }
+    public Reference getPatient() { return patient; }
     @JsonProperty("patient")
-    public void setPatient(Patient value) { this.patient = value; }
+    public void setPatient(Reference value) { this.patient = value; }
 
     @JsonProperty("reason")
-    public Coding getReason() { return reason; }
+    public GeneticCounselingRecommendationReasonCoding getReason() { return reason; }
     @JsonProperty("reason")
-    public void setReason(Coding 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

@@ -0,0 +1,30 @@
+package dev.pcvolkmer.mv64e.mtb;
+
+import java.io.IOException;
+import com.fasterxml.jackson.annotation.*;
+
+public enum GeneticCounselingRecommendationReasonCodingCode {
+    FAMILY_ANAMNESIS, OTHER, SECONDARY_TUMOR, SELF_ANAMNESIS, UNKNOWN;
+
+    @JsonValue
+    public String toValue() {
+        switch (this) {
+            case FAMILY_ANAMNESIS: return "family-anamnesis";
+            case OTHER: return "other";
+            case SECONDARY_TUMOR: return "secondary-tumor";
+            case SELF_ANAMNESIS: return "self-anamnesis";
+            case UNKNOWN: return "unknown";
+        }
+        return null;
+    }
+
+    @JsonCreator
+    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 GeneticCounselingRecommendationReasonCodingCode");
+    }
+}

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

@@ -0,0 +1,13 @@
+package dev.pcvolkmer.mv64e.mtb;
+
+import com.fasterxml.jackson.annotation.*;
+import java.util.List;
+
+public class Grading {
+    private List<TumorGrading> history;
+
+    @JsonProperty("history")
+    public List<TumorGrading> getHistory() { return history; }
+    @JsonProperty("history")
+    public void setHistory(List<TumorGrading> value) { this.history = value; }
+}

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

@@ -1,49 +0,0 @@
-package dev.pcvolkmer.mv64e.mtb;
-
-import java.io.IOException;
-import com.fasterxml.jackson.annotation.*;
-
-public enum GradingCode {
-    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 GradingCode forValue(String value) throws IOException {
-        switch (value) {
-            case "m1A":
-                return M1_A;
-            case "m1B":
-                return M1_B;
-            case "m1C":
-                return M1_C;
-            case "m2A":
-                return M2_A;
-            case "m2B":
-                return M2_B;
-            case "m2C":
-                return M2_C;
-            case "m3":
-                return M3;
-            case "m4":
-                return M4;
-            case "undefined":
-                return UNDEFINED;
-        }
-        throw new IOException("Cannot deserialize GradingCode");
-    }
-}

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

@@ -3,22 +3,16 @@ package dev.pcvolkmer.mv64e.mtb;
 import com.fasterxml.jackson.annotation.*;
 
 public class HealthInsurance {
-    private String display;
-    private ExternalId extId;
-    private Type type;
+    private Reference reference;
+    private HealthInsuranceCoding type;
 
-    @JsonProperty("display")
-    public String getDisplay() { return display; }
-    @JsonProperty("display")
-    public void setDisplay(String value) { this.display = value; }
-
-    @JsonProperty("extId")
-    public ExternalId getExtId() { return extId; }
-    @JsonProperty("extId")
-    public void setExtId(ExternalId value) { this.extId = value; }
+    @JsonProperty("reference")
+    public Reference getReference() { return reference; }
+    @JsonProperty("reference")
+    public void setReference(Reference value) { this.reference = value; }
 
     @JsonProperty("type")
-    public Type getType() { return type; }
+    public HealthInsuranceCoding getType() { return type; }
     @JsonProperty("type")
-    public void setType(Type value) { this.type = value; }
+    public void setType(HealthInsuranceCoding value) { this.type = value; }
 }

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

@@ -0,0 +1,30 @@
+package dev.pcvolkmer.mv64e.mtb;
+
+import com.fasterxml.jackson.annotation.*;
+
+public class HealthInsuranceCoding {
+    private HealthInsuranceCodingCode code;
+    private String display;
+    private String system;
+    private String version;
+
+    @JsonProperty("code")
+    public HealthInsuranceCodingCode getCode() { return code; }
+    @JsonProperty("code")
+    public void setCode(HealthInsuranceCodingCode 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/HealthInsuranceCodingCode.java

@@ -0,0 +1,40 @@
+package dev.pcvolkmer.mv64e.mtb;
+
+import java.io.IOException;
+import com.fasterxml.jackson.annotation.*;
+
+public enum HealthInsuranceCodingCode {
+    BEI, BG, GKV, GPV, PKV, PPV, SEL, SKT, SOZ, UNK;
+
+    @JsonValue
+    public String toValue() {
+        switch (this) {
+            case BEI: return "BEI";
+            case BG: return "BG";
+            case GKV: return "GKV";
+            case GPV: return "GPV";
+            case PKV: return "PKV";
+            case PPV: return "PPV";
+            case SEL: return "SEL";
+            case SKT: return "SKT";
+            case SOZ: return "SOZ";
+            case UNK: return "UNK";
+        }
+        return null;
+    }
+
+    @JsonCreator
+    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;
+        if (value.equals("GPV")) return GPV;
+        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 HealthInsuranceCodingCode");
+    }
+}

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

@@ -0,0 +1,33 @@
+package dev.pcvolkmer.mv64e.mtb;
+
+import com.fasterxml.jackson.annotation.*;
+import java.util.Date;
+
+public class HistologyReevaluationRequest {
+    private String id;
+    private Date issuedOn;
+    private Reference patient;
+    private Reference specimen;
+
+    @JsonProperty("id")
+    public String getId() { return id; }
+    @JsonProperty("id")
+    public void setId(String value) { this.id = value; }
+
+    @JsonProperty("issuedOn")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    public Date getIssuedOn() { return issuedOn; }
+    @JsonProperty("issuedOn")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    public void setIssuedOn(Date value) { this.issuedOn = value; }
+
+    @JsonProperty("patient")
+    public Reference getPatient() { return patient; }
+    @JsonProperty("patient")
+    public void setPatient(Reference value) { this.patient = value; }
+
+    @JsonProperty("specimen")
+    public Reference getSpecimen() { return specimen; }
+    @JsonProperty("specimen")
+    public void setSpecimen(Reference value) { this.specimen = value; }
+}

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

@@ -6,9 +6,9 @@ import java.util.Date;
 public class HistologyReport {
     private String id;
     private Date issuedOn;
-    private Patient patient;
+    private Reference patient;
     private HistologyReportResults results;
-    private HistologyReportSpecimen specimen;
+    private Reference specimen;
 
     @JsonProperty("id")
     public String getId() { return id; }
@@ -23,9 +23,9 @@ public class HistologyReport {
     public void setIssuedOn(Date value) { this.issuedOn = value; }
 
     @JsonProperty("patient")
-    public Patient getPatient() { return patient; }
+    public Reference getPatient() { return patient; }
     @JsonProperty("patient")
-    public void setPatient(Patient value) { this.patient = value; }
+    public void setPatient(Reference value) { this.patient = value; }
 
     @JsonProperty("results")
     public HistologyReportResults getResults() { return results; }
@@ -33,7 +33,7 @@ public class HistologyReport {
     public void setResults(HistologyReportResults value) { this.results = value; }
 
     @JsonProperty("specimen")
-    public HistologyReportSpecimen getSpecimen() { return specimen; }
+    public Reference getSpecimen() { return specimen; }
     @JsonProperty("specimen")
-    public void setSpecimen(HistologyReportSpecimen value) { this.specimen = value; }
+    public void setSpecimen(Reference value) { this.specimen = value; }
 }

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

@@ -1,18 +0,0 @@
-package dev.pcvolkmer.mv64e.mtb;
-
-import com.fasterxml.jackson.annotation.*;
-
-public class HistologyReportSpecimen {
-    private String id;
-    private SpecimenType type;
-
-    @JsonProperty("id")
-    public String getId() { return id; }
-    @JsonProperty("id")
-    public void setId(String value) { this.id = value; }
-
-    @JsonProperty("type")
-    public SpecimenType getType() { return type; }
-    @JsonProperty("type")
-    public void setType(SpecimenType value) { this.type = value; }
-}

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

@@ -3,9 +3,9 @@ package dev.pcvolkmer.mv64e.mtb;
 import com.fasterxml.jackson.annotation.*;
 import java.util.Date;
 
-public class StageHistory {
+public class History {
     private Date date;
-    private CodingTumorSpread stage;
+    private MtbDiagnosisCoding value;
 
     @JsonProperty("date")
     @JsonFormat(pattern = "yyyy-MM-dd")
@@ -14,8 +14,8 @@ public class StageHistory {
     @JsonFormat(pattern = "yyyy-MM-dd")
     public void setDate(Date value) { this.date = value; }
 
-    @JsonProperty("stage")
-    public CodingTumorSpread getStage() { return stage; }
-    @JsonProperty("stage")
-    public void setStage(CodingTumorSpread value) { this.stage = value; }
+    @JsonProperty("value")
+    public MtbDiagnosisCoding getValue() { return value; }
+    @JsonProperty("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 Coding 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 Coding getInterpretation() { return interpretation; }
+    public HrdScoreInterpretationCoding getInterpretation() { return interpretation; }
     @JsonProperty("interpretation")
-    public void setInterpretation(Coding 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/IHCReport.java

@@ -1,58 +0,0 @@
-package dev.pcvolkmer.mv64e.mtb;
-
-import com.fasterxml.jackson.annotation.*;
-import java.util.Date;
-import java.util.List;
-
-public class IHCReport {
-    private ExternalId blockId;
-    private Date date;
-    private String id;
-    private ExternalId journalId;
-    private List<MSIMmrResult> msiMmrResults;
-    private Reference patient;
-    private List<ProteinExpressionResult> proteinExpressionResults;
-    private Reference specimen;
-
-    @JsonProperty("blockId")
-    public ExternalId getBlockId() { return blockId; }
-    @JsonProperty("blockId")
-    public void setBlockId(ExternalId value) { this.blockId = value; }
-
-    @JsonProperty("date")
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    public Date getDate() { return date; }
-    @JsonProperty("date")
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    public void setDate(Date value) { this.date = value; }
-
-    @JsonProperty("id")
-    public String getId() { return id; }
-    @JsonProperty("id")
-    public void setId(String value) { this.id = value; }
-
-    @JsonProperty("journalId")
-    public ExternalId getJournalId() { return journalId; }
-    @JsonProperty("journalId")
-    public void setJournalId(ExternalId value) { this.journalId = value; }
-
-    @JsonProperty("msiMmrResults")
-    public List<MSIMmrResult> getMsiMmrResults() { return msiMmrResults; }
-    @JsonProperty("msiMmrResults")
-    public void setMsiMmrResults(List<MSIMmrResult> value) { this.msiMmrResults = value; }
-
-    @JsonProperty("patient")
-    public Reference getPatient() { return patient; }
-    @JsonProperty("patient")
-    public void setPatient(Reference value) { this.patient = value; }
-
-    @JsonProperty("proteinExpressionResults")
-    public List<ProteinExpressionResult> getProteinExpressionResults() { return proteinExpressionResults; }
-    @JsonProperty("proteinExpressionResults")
-    public void setProteinExpressionResults(List<ProteinExpressionResult> value) { this.proteinExpressionResults = value; }
-
-    @JsonProperty("specimen")
-    public Reference getSpecimen() { return specimen; }
-    @JsonProperty("specimen")
-    public void setSpecimen(Reference value) { this.specimen = value; }
-}

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

@@ -0,0 +1,52 @@
+package dev.pcvolkmer.mv64e.mtb;
+
+import com.fasterxml.jackson.annotation.*;
+import java.util.Date;
+import java.util.List;
+
+public class IhcReport {
+    private List<String> blockIds;
+    private String id;
+    private Date issuedOn;
+    private String journalId;
+    private Reference patient;
+    private IhcReportResults results;
+    private Reference specimen;
+
+    @JsonProperty("blockIds")
+    public List<String> getBlockIds() { return blockIds; }
+    @JsonProperty("blockIds")
+    public void setBlockIds(List<String> value) { this.blockIds = value; }
+
+    @JsonProperty("id")
+    public String getId() { return id; }
+    @JsonProperty("id")
+    public void setId(String value) { this.id = value; }
+
+    @JsonProperty("issuedOn")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    public Date getIssuedOn() { return issuedOn; }
+    @JsonProperty("issuedOn")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    public void setIssuedOn(Date value) { this.issuedOn = value; }
+
+    @JsonProperty("journalId")
+    public String getJournalId() { return journalId; }
+    @JsonProperty("journalId")
+    public void setJournalId(String value) { this.journalId = value; }
+
+    @JsonProperty("patient")
+    public Reference getPatient() { return patient; }
+    @JsonProperty("patient")
+    public void setPatient(Reference value) { this.patient = value; }
+
+    @JsonProperty("results")
+    public IhcReportResults getResults() { return results; }
+    @JsonProperty("results")
+    public void setResults(IhcReportResults value) { this.results = value; }
+
+    @JsonProperty("specimen")
+    public Reference getSpecimen() { return specimen; }
+    @JsonProperty("specimen")
+    public void setSpecimen(Reference value) { this.specimen = value; }
+}

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

@@ -0,0 +1,19 @@
+package dev.pcvolkmer.mv64e.mtb;
+
+import com.fasterxml.jackson.annotation.*;
+import java.util.List;
+
+public class IhcReportResults {
+    private List<MSIMmr> msiMmr;
+    private List<ProteinExpression> proteinExpression;
+
+    @JsonProperty("msiMmr")
+    public List<MSIMmr> getMsiMmr() { return msiMmr; }
+    @JsonProperty("msiMmr")
+    public void setMsiMmr(List<MSIMmr> value) { this.msiMmr = value; }
+
+    @JsonProperty("proteinExpression")
+    public List<ProteinExpression> getProteinExpression() { return proteinExpression; }
+    @JsonProperty("proteinExpression")
+    public void setProteinExpression(List<ProteinExpression> value) { this.proteinExpression = value; }
+}

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

@@ -0,0 +1,26 @@
+package dev.pcvolkmer.mv64e.mtb;
+
+import java.io.IOException;
+import com.fasterxml.jackson.annotation.*;
+
+public enum InterpretationCodingCode {
+    HIGH, INTERMEDIATE, LOW;
+
+    @JsonValue
+    public String toValue() {
+        switch (this) {
+            case HIGH: return "high";
+            case INTERMEDIATE: return "intermediate";
+            case LOW: return "low";
+        }
+        return null;
+    }
+
+    @JsonCreator
+    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 InterpretationCodingCode");
+    }
+}

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

@@ -4,22 +4,22 @@ import com.fasterxml.jackson.annotation.*;
 import java.util.List;
 
 public class LevelOfEvidence {
-    private List<CodingLevelOfEvidenceAddendum> addendums;
-    private CodingLevelOfEvidenceGrading grading;
-    private List<ReferencePublication> publications;
+    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<ReferencePublication> getPublications() { return publications; }
+    public List<PublicationReference> getPublications() { return publications; }
     @JsonProperty("publications")
-    public void setPublications(List<ReferencePublication> value) { this.publications = value; }
+    public void setPublications(List<PublicationReference> value) { this.publications = value; }
 }

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

@@ -0,0 +1,30 @@
+package dev.pcvolkmer.mv64e.mtb;
+
+import com.fasterxml.jackson.annotation.*;
+
+public class LevelOfEvidenceAddendumCoding {
+    private LevelOfEvidenceAddendumCodingCode code;
+    private String display;
+    private String system;
+    private String version;
+
+    @JsonProperty("code")
+    public LevelOfEvidenceAddendumCodingCode getCode() { return code; }
+    @JsonProperty("code")
+    public void setCode(LevelOfEvidenceAddendumCodingCode 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/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/LevelOfEvidenceGradingCoding.java

@@ -0,0 +1,30 @@
+package dev.pcvolkmer.mv64e.mtb;
+
+import com.fasterxml.jackson.annotation.*;
+
+public class LevelOfEvidenceGradingCoding {
+    private LevelOfEvidenceGradingCodingCode code;
+    private String display;
+    private String system;
+    private String version;
+
+    @JsonProperty("code")
+    public LevelOfEvidenceGradingCodingCode getCode() { return code; }
+    @JsonProperty("code")
+    public void setCode(LevelOfEvidenceGradingCodingCode 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/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

@@ -2,19 +2,19 @@ package dev.pcvolkmer.mv64e.mtb;
 
 import com.fasterxml.jackson.annotation.*;
 
-public class MSIMmrResult {
-    private CodingProteinExpressionIcScore icScore;
+public class MSIMmr {
+    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 MSIMmrResult {
     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 MSIMmrResult {
     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/MTBCarePlan.java

@@ -1,74 +0,0 @@
-package dev.pcvolkmer.mv64e.mtb;
-
-import com.fasterxml.jackson.annotation.*;
-import java.util.Date;
-import java.util.List;
-
-public class MTBCarePlan {
-    private String diagnosis;
-    private GeneticCounselingRecommendation geneticCounselingRecommendation;
-    private String id;
-    private Reference indication;
-    private Date issuedOn;
-    private List<MTBMedicationRecommendation> medicationRecommendations;
-    private NoTargetFinding noTargetFinding;
-    private String notes;
-    private Patient patient;
-    private CodingCarePlanStatusReason statusReason;
-    private List<StudyEnrollmentRecommendation> studyEnrollmentRecommendations;
-
-    @JsonProperty("diagnosis")
-    public String getDiagnosis() { return diagnosis; }
-    @JsonProperty("diagnosis")
-    public void setDiagnosis(String value) { this.diagnosis = value; }
-
-    @JsonProperty("geneticCounselingRecommendation")
-    public GeneticCounselingRecommendation getGeneticCounselingRecommendation() { return geneticCounselingRecommendation; }
-    @JsonProperty("geneticCounselingRecommendation")
-    public void setGeneticCounselingRecommendation(GeneticCounselingRecommendation value) { this.geneticCounselingRecommendation = value; }
-
-    @JsonProperty("id")
-    public String getId() { return id; }
-    @JsonProperty("id")
-    public void setId(String value) { this.id = value; }
-
-    @JsonProperty("indication")
-    public Reference getIndication() { return indication; }
-    @JsonProperty("indication")
-    public void setIndication(Reference value) { this.indication = value; }
-
-    @JsonProperty("issuedOn")
-    public Date getIssuedOn() { return issuedOn; }
-    @JsonProperty("issuedOn")
-    public void setIssuedOn(Date value) { this.issuedOn = value; }
-
-    @JsonProperty("medicationRecommendations")
-    public List<MTBMedicationRecommendation> getMedicationRecommendations() { return medicationRecommendations; }
-    @JsonProperty("medicationRecommendations")
-    public void setMedicationRecommendations(List<MTBMedicationRecommendation> value) { this.medicationRecommendations = value; }
-
-    @JsonProperty("noTargetFinding")
-    public NoTargetFinding getNoTargetFinding() { return noTargetFinding; }
-    @JsonProperty("noTargetFinding")
-    public void setNoTargetFinding(NoTargetFinding value) { this.noTargetFinding = value; }
-
-    @JsonProperty("notes")
-    public String getNotes() { return notes; }
-    @JsonProperty("notes")
-    public void setNotes(String value) { this.notes = value; }
-
-    @JsonProperty("patient")
-    public Patient getPatient() { return patient; }
-    @JsonProperty("patient")
-    public void setPatient(Patient value) { this.patient = value; }
-
-    @JsonProperty("statusReason")
-    public CodingCarePlanStatusReason getStatusReason() { return statusReason; }
-    @JsonProperty("statusReason")
-    public void setStatusReason(CodingCarePlanStatusReason value) { this.statusReason = value; }
-
-    @JsonProperty("studyEnrollmentRecommendations")
-    public List<StudyEnrollmentRecommendation> getStudyEnrollmentRecommendations() { return studyEnrollmentRecommendations; }
-    @JsonProperty("studyEnrollmentRecommendations")
-    public void setStudyEnrollmentRecommendations(List<StudyEnrollmentRecommendation> value) { this.studyEnrollmentRecommendations = value; }
-}

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

@@ -1,80 +0,0 @@
-package dev.pcvolkmer.mv64e.mtb;
-
-import com.fasterxml.jackson.annotation.*;
-import java.util.Date;
-import java.util.List;
-
-public class MTBDiagnosis {
-    private Coding code;
-    private Coding guidelineTreatmentStatus;
-    private List<String> histologyResults;
-    private Coding icdO3T;
-    private String id;
-    private Patient patient;
-    private Date recordedOn;
-    private List<StageHistory> stageHistory;
-    private Coding topography;
-    private CodingTumorGrade tumorGrade;
-    private Coding whoGrade;
-    private Coding whoGrading;
-
-    @JsonProperty("code")
-    public Coding getCode() { return code; }
-    @JsonProperty("code")
-    public void setCode(Coding value) { this.code = value; }
-
-    @JsonProperty("guidelineTreatmentStatus")
-    public Coding getGuidelineTreatmentStatus() { return guidelineTreatmentStatus; }
-    @JsonProperty("guidelineTreatmentStatus")
-    public void setGuidelineTreatmentStatus(Coding value) { this.guidelineTreatmentStatus = value; }
-
-    @JsonProperty("histologyResults")
-    public List<String> getHistologyResults() { return histologyResults; }
-    @JsonProperty("histologyResults")
-    public void setHistologyResults(List<String> value) { this.histologyResults = value; }
-
-    @JsonProperty("icdO3T")
-    public Coding getIcdO3T() { return icdO3T; }
-    @JsonProperty("icdO3T")
-    public void setIcdO3T(Coding value) { this.icdO3T = value; }
-
-    @JsonProperty("id")
-    public String getId() { return id; }
-    @JsonProperty("id")
-    public void setId(String value) { this.id = value; }
-
-    @JsonProperty("patient")
-    public Patient getPatient() { return patient; }
-    @JsonProperty("patient")
-    public void setPatient(Patient value) { this.patient = value; }
-
-    @JsonProperty("recordedOn")
-    public Date getRecordedOn() { return recordedOn; }
-    @JsonProperty("recordedOn")
-    public void setRecordedOn(Date value) { this.recordedOn = value; }
-
-    @JsonProperty("stageHistory")
-    public List<StageHistory> getStageHistory() { return stageHistory; }
-    @JsonProperty("stageHistory")
-    public void setStageHistory(List<StageHistory> value) { this.stageHistory = value; }
-
-    @JsonProperty("topography")
-    public Coding getTopography() { return topography; }
-    @JsonProperty("topography")
-    public void setTopography(Coding value) { this.topography = value; }
-
-    @JsonProperty("tumorGrade")
-    public CodingTumorGrade getTumorGrade() { return tumorGrade; }
-    @JsonProperty("tumorGrade")
-    public void setTumorGrade(CodingTumorGrade value) { this.tumorGrade = value; }
-
-    @JsonProperty("whoGrade")
-    public Coding getWhoGrade() { return whoGrade; }
-    @JsonProperty("whoGrade")
-    public void setWhoGrade(Coding value) { this.whoGrade = value; }
-
-    @JsonProperty("whoGrading")
-    public Coding getWhoGrading() { return whoGrading; }
-    @JsonProperty("whoGrading")
-    public void setWhoGrading(Coding value) { this.whoGrading = value; }
-}

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

@@ -1,24 +0,0 @@
-package dev.pcvolkmer.mv64e.mtb;
-
-import com.fasterxml.jackson.annotation.*;
-
-public class MTBEpisode {
-    private String id;
-    private Patient patient;
-    private PeriodLocalDate period;
-
-    @JsonProperty("id")
-    public String getId() { return id; }
-    @JsonProperty("id")
-    public void setId(String value) { this.id = value; }
-
-    @JsonProperty("patient")
-    public Patient getPatient() { return patient; }
-    @JsonProperty("patient")
-    public void setPatient(Patient value) { this.patient = value; }
-
-    @JsonProperty("period")
-    public PeriodLocalDate getPeriod() { return period; }
-    @JsonProperty("period")
-    public void setPeriod(PeriodLocalDate value) { this.period = value; }
-}

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

@@ -1,62 +0,0 @@
-package dev.pcvolkmer.mv64e.mtb;
-
-import com.fasterxml.jackson.annotation.*;
-import java.util.Date;
-import java.util.List;
-
-public class MTBMedicationRecommendation {
-    private String id;
-    private Reference indication;
-    private Date issuedOn;
-    private LevelOfEvidence levelOfEvidence;
-    private List<Coding> medication;
-    private String ngsReport;
-    private Patient patient;
-    private CodingTherapyRecommendationPriority priority;
-    private List<Reference> supportingVariants;
-
-    @JsonProperty("id")
-    public String getId() { return id; }
-    @JsonProperty("id")
-    public void setId(String value) { this.id = value; }
-
-    @JsonProperty("indication")
-    public Reference getIndication() { return indication; }
-    @JsonProperty("indication")
-    public void setIndication(Reference value) { this.indication = value; }
-
-    @JsonProperty("issuedOn")
-    public Date getIssuedOn() { return issuedOn; }
-    @JsonProperty("issuedOn")
-    public void setIssuedOn(Date value) { this.issuedOn = value; }
-
-    @JsonProperty("levelOfEvidence")
-    public LevelOfEvidence getLevelOfEvidence() { return levelOfEvidence; }
-    @JsonProperty("levelOfEvidence")
-    public void setLevelOfEvidence(LevelOfEvidence value) { this.levelOfEvidence = value; }
-
-    @JsonProperty("medication")
-    public List<Coding> getMedication() { return medication; }
-    @JsonProperty("medication")
-    public void setMedication(List<Coding> value) { this.medication = value; }
-
-    @JsonProperty("ngsReport")
-    public String getNgsReport() { return ngsReport; }
-    @JsonProperty("ngsReport")
-    public void setNgsReport(String value) { this.ngsReport = value; }
-
-    @JsonProperty("patient")
-    public Patient getPatient() { return patient; }
-    @JsonProperty("patient")
-    public void setPatient(Patient value) { this.patient = value; }
-
-    @JsonProperty("priority")
-    public CodingTherapyRecommendationPriority getPriority() { return priority; }
-    @JsonProperty("priority")
-    public void setPriority(CodingTherapyRecommendationPriority value) { this.priority = value; }
-
-    @JsonProperty("supportingVariants")
-    public List<Reference> getSupportingVariants() { return supportingVariants; }
-    @JsonProperty("supportingVariants")
-    public void setSupportingVariants(List<Reference> value) { this.supportingVariants = value; }
-}

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

@@ -1,80 +0,0 @@
-package dev.pcvolkmer.mv64e.mtb;
-
-import com.fasterxml.jackson.annotation.*;
-import java.util.Date;
-import java.util.List;
-
-public class MTBMedicationTherapy {
-    private Reference basedOn;
-    private String diagnosis;
-    private String id;
-    private Reference indication;
-    private List<Coding> medication;
-    private String notes;
-    private Patient patient;
-    private PeriodLocalDate period;
-    private Date recordedOn;
-    private CodingTherapyStatus status;
-    private CodingTherapyStatusReason statusReason;
-    private Long therapyLine;
-
-    @JsonProperty("basedOn")
-    public Reference getBasedOn() { return basedOn; }
-    @JsonProperty("basedOn")
-    public void setBasedOn(Reference value) { this.basedOn = value; }
-
-    @JsonProperty("diagnosis")
-    public String getDiagnosis() { return diagnosis; }
-    @JsonProperty("diagnosis")
-    public void setDiagnosis(String value) { this.diagnosis = value; }
-
-    @JsonProperty("id")
-    public String getId() { return id; }
-    @JsonProperty("id")
-    public void setId(String value) { this.id = value; }
-
-    @JsonProperty("indication")
-    public Reference getIndication() { return indication; }
-    @JsonProperty("indication")
-    public void setIndication(Reference value) { this.indication = value; }
-
-    @JsonProperty("medication")
-    public List<Coding> getMedication() { return medication; }
-    @JsonProperty("medication")
-    public void setMedication(List<Coding> value) { this.medication = value; }
-
-    @JsonProperty("notes")
-    public String getNotes() { return notes; }
-    @JsonProperty("notes")
-    public void setNotes(String value) { this.notes = value; }
-
-    @JsonProperty("patient")
-    public Patient getPatient() { return patient; }
-    @JsonProperty("patient")
-    public void setPatient(Patient value) { this.patient = value; }
-
-    @JsonProperty("period")
-    public PeriodLocalDate getPeriod() { return period; }
-    @JsonProperty("period")
-    public void setPeriod(PeriodLocalDate value) { this.period = value; }
-
-    @JsonProperty("recordedOn")
-    public Date getRecordedOn() { return recordedOn; }
-    @JsonProperty("recordedOn")
-    public void setRecordedOn(Date value) { this.recordedOn = value; }
-
-    @JsonProperty("status")
-    public CodingTherapyStatus getStatus() { return status; }
-    @JsonProperty("status")
-    public void setStatus(CodingTherapyStatus value) { this.status = value; }
-
-    @JsonProperty("statusReason")
-    public CodingTherapyStatusReason getStatusReason() { return statusReason; }
-    @JsonProperty("statusReason")
-    public void setStatusReason(CodingTherapyStatusReason value) { this.statusReason = value; }
-
-    @JsonProperty("therapyLine")
-    public Long getTherapyLine() { return therapyLine; }
-    @JsonProperty("therapyLine")
-    public void setTherapyLine(Long value) { this.therapyLine = 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

@@ -0,0 +1,30 @@
+package dev.pcvolkmer.mv64e.mtb;
+
+import com.fasterxml.jackson.annotation.*;
+
+public class MolecularDiagnosticReportCoding {
+    private MolecularDiagnosticReportCodingCode code;
+    private String display;
+    private String system;
+    private String version;
+
+    @JsonProperty("code")
+    public MolecularDiagnosticReportCodingCode getCode() { return code; }
+    @JsonProperty("code")
+    public void setCode(MolecularDiagnosticReportCodingCode 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/MolecularDiagnosticReportCodingCode.java

@@ -0,0 +1,44 @@
+package dev.pcvolkmer.mv64e.mtb;
+
+import java.io.IOException;
+import com.fasterxml.jackson.annotation.*;
+
+public enum MolecularDiagnosticReportCodingCode {
+    ARRAY, EXOME, FISH, FUSION_PANEL, GENE_PANEL, GENOME_LONG_READ, GENOME_SHORT_READ, KARYOTYPING, OTHER, PANEL, PCR, SINGLE;
+
+    @JsonValue
+    public String toValue() {
+        switch (this) {
+            case ARRAY: return "array";
+            case EXOME: return "exome";
+            case FISH: return "FISH";
+            case FUSION_PANEL: return "fusion-panel";
+            case GENE_PANEL: return "gene-panel";
+            case GENOME_LONG_READ: return "genome-long-read";
+            case GENOME_SHORT_READ: return "genome-short-read";
+            case KARYOTYPING: return "karyotyping";
+            case OTHER: return "other";
+            case PANEL: return "panel";
+            case PCR: return "PCR";
+            case SINGLE: return "single";
+        }
+        return null;
+    }
+
+    @JsonCreator
+    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;
+        if (value.equals("fusion-panel")) return FUSION_PANEL;
+        if (value.equals("gene-panel")) return GENE_PANEL;
+        if (value.equals("genome-long-read")) return GENOME_LONG_READ;
+        if (value.equals("genome-short-read")) return GENOME_SHORT_READ;
+        if (value.equals("karyotyping")) return KARYOTYPING;
+        if (value.equals("other")) return OTHER;
+        if (value.equals("panel")) return PANEL;
+        if (value.equals("PCR")) return PCR;
+        if (value.equals("single")) return SINGLE;
+        throw new IOException("Cannot deserialize MolecularDiagnosticReportCodingCode");
+    }
+}

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

@@ -1,13 +0,0 @@
-package dev.pcvolkmer.mv64e.mtb;
-
-import com.fasterxml.jackson.annotation.*;
-import java.util.List;
-
-public class MolecularTherapy {
-    private List<MTBMedicationTherapy> history;
-
-    @JsonProperty("history")
-    public List<MTBMedicationTherapy> getHistory() { return history; }
-    @JsonProperty("history")
-    public void setHistory(List<MTBMedicationTherapy> value) { this.history = value; }
-}

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

@@ -4,31 +4,29 @@ 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 MTBEpisode episode;
-    private List<EpisodeOfCare> episodesOfCare;
-    private List<GeneticCounselingRecommendation> geneticCounsellingRequests;
-    private List<OncoProdecure> guidelineProcedures;
-    private List<MTBMedicationTherapy> guidelineTherapies;
+    private List<MtbDiagnosis> diagnoses;
+    private List<MtbEpisodeOfCare> episodesOfCare;
+    private List<FollowUp> followUps;
+    private List<OncoProcedure> guidelineProcedures;
+    private List<MtbSystemicTherapy> guidelineTherapies;
     private List<HistologyReport> histologyReports;
-    private List<IHCReport> ihcReports;
-    private List<MolecularTherapy> molecularTherapies;
+    private List<IhcReport> ihcReports;
+    private MvhMetadata metadata;
     private List<SomaticNgsReport> ngsReports;
-    private MtbPatient patient;
+    private Patient patient;
     private List<PerformanceStatus> performanceStatus;
-    private List<MTBMedicationRecommendation> recommendations;
+    private List<PriorDiagnosticReport> priorDiagnosticReports;
     private List<Response> responses;
     private List<TumorSpecimen> specimens;
-    private List<StudyEnrollmentRecommendation> studyInclusionRequests;
-    private List<Therapy> therapies;
+    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; }
@@ -41,34 +39,29 @@ 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; }
-
-    @JsonProperty("episode")
-    public MTBEpisode getEpisode() { return episode; }
-    @JsonProperty("episode")
-    public void setEpisode(MTBEpisode value) { this.episode = value; }
+    public void setDiagnoses(List<MtbDiagnosis> value) { this.diagnoses = value; }
 
     @JsonProperty("episodesOfCare")
-    public List<EpisodeOfCare> getEpisodesOfCare() { return episodesOfCare; }
+    public List<MtbEpisodeOfCare> getEpisodesOfCare() { return episodesOfCare; }
     @JsonProperty("episodesOfCare")
-    public void setEpisodesOfCare(List<EpisodeOfCare> value) { this.episodesOfCare = value; }
+    public void setEpisodesOfCare(List<MtbEpisodeOfCare> value) { this.episodesOfCare = value; }
 
-    @JsonProperty("geneticCounsellingRequests")
-    public List<GeneticCounselingRecommendation> getGeneticCounsellingRequests() { return geneticCounsellingRequests; }
-    @JsonProperty("geneticCounsellingRequests")
-    public void setGeneticCounsellingRequests(List<GeneticCounselingRecommendation> value) { this.geneticCounsellingRequests = value; }
+    @JsonProperty("followUps")
+    public List<FollowUp> getFollowUps() { return followUps; }
+    @JsonProperty("followUps")
+    public void setFollowUps(List<FollowUp> value) { this.followUps = value; }
 
     @JsonProperty("guidelineProcedures")
-    public List<OncoProdecure> getGuidelineProcedures() { return guidelineProcedures; }
+    public List<OncoProcedure> getGuidelineProcedures() { return guidelineProcedures; }
     @JsonProperty("guidelineProcedures")
-    public void setGuidelineProcedures(List<OncoProdecure> value) { this.guidelineProcedures = value; }
+    public void setGuidelineProcedures(List<OncoProcedure> value) { this.guidelineProcedures = value; }
 
     @JsonProperty("guidelineTherapies")
-    public List<MTBMedicationTherapy> getGuidelineTherapies() { return guidelineTherapies; }
+    public List<MtbSystemicTherapy> getGuidelineTherapies() { return guidelineTherapies; }
     @JsonProperty("guidelineTherapies")
-    public void setGuidelineTherapies(List<MTBMedicationTherapy> value) { this.guidelineTherapies = value; }
+    public void setGuidelineTherapies(List<MtbSystemicTherapy> value) { this.guidelineTherapies = value; }
 
     @JsonProperty("histologyReports")
     public List<HistologyReport> getHistologyReports() { return histologyReports; }
@@ -76,14 +69,14 @@ 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("molecularTherapies")
-    public List<MolecularTherapy> getMolecularTherapies() { return molecularTherapies; }
-    @JsonProperty("molecularTherapies")
-    public void setMolecularTherapies(List<MolecularTherapy> value) { this.molecularTherapies = value; }
+    @JsonProperty("metadata")
+    public MvhMetadata getMetadata() { return metadata; }
+    @JsonProperty("metadata")
+    public void setMetadata(MvhMetadata value) { this.metadata = value; }
 
     @JsonProperty("ngsReports")
     public List<SomaticNgsReport> getNgsReports() { return ngsReports; }
@@ -91,19 +84,19 @@ public class Mtb {
     public void setNgsReports(List<SomaticNgsReport> value) { this.ngsReports = value; }
 
     @JsonProperty("patient")
-    public MtbPatient getPatient() { return patient; }
+    public Patient getPatient() { return patient; }
     @JsonProperty("patient")
-    public void setPatient(MtbPatient value) { this.patient = value; }
+    public void setPatient(Patient value) { this.patient = value; }
 
     @JsonProperty("performanceStatus")
     public List<PerformanceStatus> getPerformanceStatus() { return performanceStatus; }
     @JsonProperty("performanceStatus")
     public void setPerformanceStatus(List<PerformanceStatus> value) { this.performanceStatus = value; }
 
-    @JsonProperty("recommendations")
-    public List<MTBMedicationRecommendation> getRecommendations() { return recommendations; }
-    @JsonProperty("recommendations")
-    public void setRecommendations(List<MTBMedicationRecommendation> value) { this.recommendations = value; }
+    @JsonProperty("priorDiagnosticReports")
+    public List<PriorDiagnosticReport> getPriorDiagnosticReports() { return priorDiagnosticReports; }
+    @JsonProperty("priorDiagnosticReports")
+    public void setPriorDiagnosticReports(List<PriorDiagnosticReport> value) { this.priorDiagnosticReports = value; }
 
     @JsonProperty("responses")
     public List<Response> getResponses() { return responses; }
@@ -115,13 +108,8 @@ public class Mtb {
     @JsonProperty("specimens")
     public void setSpecimens(List<TumorSpecimen> value) { this.specimens = value; }
 
-    @JsonProperty("studyInclusionRequests")
-    public List<StudyEnrollmentRecommendation> getStudyInclusionRequests() { return studyInclusionRequests; }
-    @JsonProperty("studyInclusionRequests")
-    public void setStudyInclusionRequests(List<StudyEnrollmentRecommendation> value) { this.studyInclusionRequests = value; }
-
-    @JsonProperty("therapies")
-    public List<Therapy> getTherapies() { return therapies; }
-    @JsonProperty("therapies")
-    public void setTherapies(List<Therapy> value) { this.therapies = value; }
+    @JsonProperty("systemicTherapies")
+    public List<SystemicTherapy> getSystemicTherapies() { return systemicTherapies; }
+    @JsonProperty("systemicTherapies")
+    public void setSystemicTherapies(List<SystemicTherapy> value) { this.systemicTherapies = value; }
 }

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

@@ -0,0 +1,88 @@
+package dev.pcvolkmer.mv64e.mtb;
+
+import com.fasterxml.jackson.annotation.*;
+import java.util.Date;
+import java.util.List;
+
+public class MtbCarePlan {
+    private GeneticCounselingRecommendation geneticCounselingRecommendation;
+    private List<HistologyReevaluationRequest> histologyReevaluationRequests;
+    private String id;
+    private Date issuedOn;
+    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 MtbCarePlanRecommendationsMissingReasonCoding recommendationsMissingReason;
+    private List<MtbStudyEnrollmentRecommendation> studyEnrollmentRecommendations;
+
+    @JsonProperty("geneticCounselingRecommendation")
+    public GeneticCounselingRecommendation getGeneticCounselingRecommendation() { return geneticCounselingRecommendation; }
+    @JsonProperty("geneticCounselingRecommendation")
+    public void setGeneticCounselingRecommendation(GeneticCounselingRecommendation value) { this.geneticCounselingRecommendation = value; }
+
+    @JsonProperty("histologyReevaluationRequests")
+    public List<HistologyReevaluationRequest> getHistologyReevaluationRequests() { return histologyReevaluationRequests; }
+    @JsonProperty("histologyReevaluationRequests")
+    public void setHistologyReevaluationRequests(List<HistologyReevaluationRequest> value) { this.histologyReevaluationRequests = value; }
+
+    @JsonProperty("id")
+    public String getId() { return id; }
+    @JsonProperty("id")
+    public void setId(String value) { this.id = value; }
+
+    @JsonProperty("issuedOn")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    public Date getIssuedOn() { return issuedOn; }
+    @JsonProperty("issuedOn")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    public void setIssuedOn(Date value) { this.issuedOn = value; }
+
+    @JsonProperty("medicationRecommendations")
+    public List<MtbMedicationRecommendation> getMedicationRecommendations() { return medicationRecommendations; }
+    @JsonProperty("medicationRecommendations")
+    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; }
+    @JsonProperty("notes")
+    public void setNotes(List<String> value) { this.notes = value; }
+
+    @JsonProperty("patient")
+    public Reference getPatient() { return patient; }
+    @JsonProperty("patient")
+    public void setPatient(Reference value) { this.patient = value; }
+
+    @JsonProperty("procedureRecommendations")
+    public List<ProcedureRecommendation> getProcedureRecommendations() { return procedureRecommendations; }
+    @JsonProperty("procedureRecommendations")
+    public void setProcedureRecommendations(List<ProcedureRecommendation> value) { this.procedureRecommendations = value; }
+
+    @JsonProperty("reason")
+    public Reference getReason() { return reason; }
+    @JsonProperty("reason")
+    public void setReason(Reference value) { this.reason = value; }
+
+    @JsonProperty("rebiopsyRequests")
+    public List<RebiopsyRequest> getRebiopsyRequests() { return rebiopsyRequests; }
+    @JsonProperty("rebiopsyRequests")
+    public void setRebiopsyRequests(List<RebiopsyRequest> value) { this.rebiopsyRequests = 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; }
+    @JsonProperty("studyEnrollmentRecommendations")
+    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

@@ -0,0 +1,82 @@
+package dev.pcvolkmer.mv64e.mtb;
+
+import com.fasterxml.jackson.annotation.*;
+import java.util.Date;
+import java.util.List;
+
+public class MtbDiagnosis {
+    private Coding code;
+    private List<Coding> germlineCodes;
+    private Grading grading;
+    private MtbDiagnosisGuidelineTreatmentStatusCoding guidelineTreatmentStatus;
+    private List<Reference> histology;
+    private String id;
+    private List<String> notes;
+    private Reference patient;
+    private Date recordedOn;
+    private Staging staging;
+    private Coding topography;
+    private Type type;
+
+    @JsonProperty("code")
+    public Coding getCode() { return code; }
+    @JsonProperty("code")
+    public void setCode(Coding value) { this.code = value; }
+
+    @JsonProperty("germlineCodes")
+    public List<Coding> getGermlineCodes() { return germlineCodes; }
+    @JsonProperty("germlineCodes")
+    public void setGermlineCodes(List<Coding> value) { this.germlineCodes = value; }
+
+    @JsonProperty("grading")
+    public Grading getGrading() { return grading; }
+    @JsonProperty("grading")
+    public void setGrading(Grading value) { this.grading = value; }
+
+    @JsonProperty("guidelineTreatmentStatus")
+    public MtbDiagnosisGuidelineTreatmentStatusCoding getGuidelineTreatmentStatus() { return guidelineTreatmentStatus; }
+    @JsonProperty("guidelineTreatmentStatus")
+    public void setGuidelineTreatmentStatus(MtbDiagnosisGuidelineTreatmentStatusCoding value) { this.guidelineTreatmentStatus = value; }
+
+    @JsonProperty("histology")
+    public List<Reference> getHistology() { return histology; }
+    @JsonProperty("histology")
+    public void setHistology(List<Reference> value) { this.histology = value; }
+
+    @JsonProperty("id")
+    public String getId() { return id; }
+    @JsonProperty("id")
+    public void setId(String value) { this.id = value; }
+
+    @JsonProperty("notes")
+    public List<String> getNotes() { return notes; }
+    @JsonProperty("notes")
+    public void setNotes(List<String> value) { this.notes = value; }
+
+    @JsonProperty("patient")
+    public Reference getPatient() { return patient; }
+    @JsonProperty("patient")
+    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")
+    public Staging getStaging() { return staging; }
+    @JsonProperty("staging")
+    public void setStaging(Staging value) { this.staging = value; }
+
+    @JsonProperty("topography")
+    public Coding getTopography() { return topography; }
+    @JsonProperty("topography")
+    public void setTopography(Coding value) { this.topography = value; }
+
+    @JsonProperty("type")
+    public Type getType() { return type; }
+    @JsonProperty("type")
+    public void setType(Type value) { this.type = value; }
+}

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 CodingEcog {
-    private EcogCode code;
+public class MtbDiagnosisCoding {
+    private ValueCode code;
     private String display;
     private String system;
     private String version;
 
     @JsonProperty("code")
-    public EcogCode getCode() { return code; }
+    public ValueCode getCode() { return code; }
     @JsonProperty("code")
-    public void setCode(EcogCode value) { this.code = value; }
+    public void setCode(ValueCode value) { this.code = value; }
 
     @JsonProperty("display")
     public String getDisplay() { return display; }