3 files changed, 4 insertions, 5 deletions
diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/patientcriterion.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/patientcriterion.scala
index b5696f7..1004c5b 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/patientcriterion.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/patientcriterion.scala
@@ -15,12 +15,12 @@ object patientcriterion {
     case JsObject(fields) =>
       val eligibilityStatus = fields
         .get("eligibilityStatus")
-        .map(_.convertTo[Option[LabelValue]])
+        .map(_.convertTo[LabelValue])
         .getOrElse(orig.eligibilityStatus)
 
       val verifiedEligibilityStatus = fields
         .get("verifiedEligibilityStatus")
-        .map(_.convertTo[Option[LabelValue]])
+        .map(_.convertTo[LabelValue])
         .getOrElse(orig.verifiedEligibilityStatus)
 
       orig.copy(
diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/patientdefiningcriteria.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/patientdefiningcriteria.scala
index 0b4fbae..a67115c 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/patientdefiningcriteria.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/patientdefiningcriteria.scala
@@ -5,7 +5,6 @@ import xyz.driver.formats.json.labels._
 import xyz.driver.pdsuidomain.entities.PatientLabel
 
 object patientdefiningcriteria {
-  import DefaultJsonProtocol._
   import common._
 
   implicit val patientLabelDefiningCriteriaWriter: RootJsonWriter[PatientLabel] = new RootJsonWriter[PatientLabel] {
diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/patientlabel.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/patientlabel.scala
index d944e42..6499318 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/patientlabel.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/patientlabel.scala
@@ -17,12 +17,12 @@ object patientlabel {
     case JsObject(fields) =>
       val primaryValue = fields
         .get("primaryValue")
-        .map(_.convertTo[Option[LabelValue]])
+        .map(_.convertTo[LabelValue])
         .getOrElse(orig.primaryValue)
 
       val verifiedPrimaryValue = fields
         .get("verifiedPrimaryValue")
-        .map(_.convertTo[Option[LabelValue]])
+        .map(_.convertTo[LabelValue])
         .getOrElse(orig.verifiedPrimaryValue)
 
       orig.copy(