diff --git a/inst/csv/OMOP_CDMv5.2_Concept_Level.csv b/inst/csv/OMOP_CDMv5.2_Concept_Level.csv
index 58ca24ac..a51389cb 100644
--- a/inst/csv/OMOP_CDMv5.2_Concept_Level.csv
+++ b/inst/csv/OMOP_CDMv5.2_Concept_Level.csv
@@ -417,7 +417,8 @@ MEASUREMENT,MEASUREMENT_CONCEPT_ID,4301868,Pulse rate,,,,,,,,,,,,,,,,,,,,,,,"848
 MEASUREMENT,MEASUREMENT_CONCEPT_ID,40762636,Body mass index (BMI) [Percentile],,,,,,,,,,,,,,,,,,,,,,,8554,5,Approved UNIT_CONCEPT_IDs for the given MEASUREMENT_CONCEPT_ID
 MEASUREMENT,MEASUREMENT_CONCEPT_ID,40765040,25-Hydroxyvitamin D3+25-Hydroxyvitamin D2 [Mass/volume] in Serum or Plasma,,,,,,,,,,,,,,,,,,,,,,,"8842,8845",5,Approved UNIT_CONCEPT_IDs for the given MEASUREMENT_CONCEPT_ID
 MEASUREMENT,MEASUREMENT_CONCEPT_ID,3024386,Platelet mean volume [Entitic volume] in Blood by Rees-Ecker,,,,,,,,,,,,,,,,,,,,,,,8583,5,Approved UNIT_CONCEPT_IDs for the given MEASUREMENT_CONCEPT_ID
-MEASUREMENT,MEASUREMENT_CONCEPT_ID,3009201,Thyrotropin [Units/volume] in Serum or Plasma,,,,,,,,,,,,,,,,,,,,,,,"44777578,8719,9040,9093",5,Approved UNIT_CONCEPT_IDs for the given MEASUREMENT_CONCEPT_ID
+MEASUREMENT,MEASUREMENT_CONCEPT_ID,3009201,Thyrotropin [Units/volume] in Serum or Plasma,,,,,,,,,,,,,,,,,,,,,,,"44777578,8719,9040,9093,8860
+",5,Approved UNIT_CONCEPT_IDs for the given MEASUREMENT_CONCEPT_ID
 MEASUREMENT,MEASUREMENT_CONCEPT_ID,3024731,MCV [Entitic volume],,,,,,,,,,,,,,,,,,,,,,,8583,5,Approved UNIT_CONCEPT_IDs for the given MEASUREMENT_CONCEPT_ID
 MEASUREMENT,MEASUREMENT_CONCEPT_ID,3050479,Immature granulocytes/100 leukocytes in Blood,,,,,,,,,,,,,,,,,,,,,,,"8554,-1",5,Approved UNIT_CONCEPT_IDs for the given MEASUREMENT_CONCEPT_ID
 MEASUREMENT,MEASUREMENT_CONCEPT_ID,4012479,Low density lipoprotein cholesterol measurement,,,,,,,,,,,,,,,,,,,,,,,"8636,8753,8840",5,Approved UNIT_CONCEPT_IDs for the given MEASUREMENT_CONCEPT_ID
@@ -429,7 +430,7 @@ MEASUREMENT,MEASUREMENT_CONCEPT_ID,3010910,Erythrocytes [#/volume] in Body fluid
 MEASUREMENT,MEASUREMENT_CONCEPT_ID,3013290,Carbon dioxide [Partial pressure] in Blood,,,,,,,,,,,,,,,,,,,,,,,8876,5,Approved UNIT_CONCEPT_IDs for the given MEASUREMENT_CONCEPT_ID
 MEASUREMENT,MEASUREMENT_CONCEPT_ID,3027970,Globulin [Mass/volume] in Serum by calculation,,,,,,,,,,,,,,,,,,,,,,,"8636,8713,8950",5,Approved UNIT_CONCEPT_IDs for the given MEASUREMENT_CONCEPT_ID
 MEASUREMENT,MEASUREMENT_CONCEPT_ID,4239408,Heart rate,,,,,,,,,,,,,,,,,,,,,,,"8483,8541,8581",5,Approved UNIT_CONCEPT_IDs for the given MEASUREMENT_CONCEPT_ID
-MEASUREMENT,MEASUREMENT_CONCEPT_ID,3010813,Leukocytes [#/volume] in Blood,,,,,,,,,,,,,,,,,,,,,,,"44777588,8848,8961,9444",5,Approved UNIT_CONCEPT_IDs for the given MEASUREMENT_CONCEPT_ID
+MEASUREMENT,MEASUREMENT_CONCEPT_ID,3010813,Leukocytes [#/volume] in Blood,,,,,,,,,,,,,,,,,,,,,,,"44777588,8848,8961,9444,8647",5,Approved UNIT_CONCEPT_IDs for the given MEASUREMENT_CONCEPT_ID
 MEASUREMENT,MEASUREMENT_CONCEPT_ID,3023103,Potassium [Moles/volume] in Serum or Plasma,,,,,,,,,,,,,,,,,,,,,,,"8753,9557",5,Approved UNIT_CONCEPT_IDs for the given MEASUREMENT_CONCEPT_ID
 MEASUREMENT,MEASUREMENT_CONCEPT_ID,4030871,Red blood cell count,,,,,,,,,,,,,,,,,,,,,,,"8734,8815,8931,9444",5,Approved UNIT_CONCEPT_IDs for the given MEASUREMENT_CONCEPT_ID
 MEASUREMENT,MEASUREMENT_CONCEPT_ID,4154790,Diastolic blood pressure,,,,,,,,,,,,,,,,,,,,,,,8876,5,Approved UNIT_CONCEPT_IDs for the given MEASUREMENT_CONCEPT_ID
@@ -457,7 +458,7 @@ MEASUREMENT,MEASUREMENT_CONCEPT_ID,3013650,Neutrophils [#/volume] in Blood by Au
 MEASUREMENT,MEASUREMENT_CONCEPT_ID,3021886,Globulin [Mass/volume] in Serum,,,,,,,,,,,,,,,,,,,,,,,"8636,8713,8950",5,Approved UNIT_CONCEPT_IDs for the given MEASUREMENT_CONCEPT_ID
 MEASUREMENT,MEASUREMENT_CONCEPT_ID,4254663,Lymphocyte count,,,,,,,,,,,,,,,,,,,,,,,8848,5,Approved UNIT_CONCEPT_IDs for the given MEASUREMENT_CONCEPT_ID
 MEASUREMENT,MEASUREMENT_CONCEPT_ID,3001420,Magnesium [Mass/volume] in Serum or Plasma,,,,,,,,,,,,,,,,,,,,,,,8840,5,Approved UNIT_CONCEPT_IDs for the given MEASUREMENT_CONCEPT_ID
-MEASUREMENT,MEASUREMENT_CONCEPT_ID,3007461,Platelets [#/volume] in Blood,,,,,,,,,,,,,,,,,,,,,,,"8848,8961,9444",5,Approved UNIT_CONCEPT_IDs for the given MEASUREMENT_CONCEPT_ID
+MEASUREMENT,MEASUREMENT_CONCEPT_ID,3007461,Platelets [#/volume] in Blood,,,,,,,,,,,,,,,,,,,,,,,"8848,8961,9444,32706",5,Approved UNIT_CONCEPT_IDs for the given MEASUREMENT_CONCEPT_ID
 MEASUREMENT,MEASUREMENT_CONCEPT_ID,3012030,MCH [Entitic mass] by Automated count,,,,,,,,,,,,,,,,,,,,,,,8564,5,Approved UNIT_CONCEPT_IDs for the given MEASUREMENT_CONCEPT_ID
 MEASUREMENT,MEASUREMENT_CONCEPT_ID,40764999,"Glomerular filtration rate/1.73 sq M.predicted [Volume Rate/Area] in Serum, Plasma or Blood by Creatinine-based formula (CKD-EPI)",,,,,,,,,,,,,,,,,,,,,,,"720870,8795",5,Approved UNIT_CONCEPT_IDs for the given MEASUREMENT_CONCEPT_ID
 MEASUREMENT,MEASUREMENT_CONCEPT_ID,3008893,Testosterone [Mass/volume] in Serum or Plasma,,,,,,,,,,,,,,,,,,,,,,,8817,5,Approved UNIT_CONCEPT_IDs for the given MEASUREMENT_CONCEPT_ID
diff --git a/inst/csv/OMOP_CDMv5.3_Concept_Level.csv b/inst/csv/OMOP_CDMv5.3_Concept_Level.csv
index fe1dc87d..62501f21 100644
--- a/inst/csv/OMOP_CDMv5.3_Concept_Level.csv
+++ b/inst/csv/OMOP_CDMv5.3_Concept_Level.csv
@@ -426,7 +426,7 @@ MEASUREMENT,MEASUREMENT_CONCEPT_ID,4301868,Pulse rate,,,,,,,,,,,,,,,,,,,,,,,"848
 MEASUREMENT,MEASUREMENT_CONCEPT_ID,40762636,Body mass index (BMI) [Percentile],,,,,,,,,,,,,,,,,,,,,,,8554,5,Approved UNIT_CONCEPT_IDs for the given MEASUREMENT_CONCEPT_ID
 MEASUREMENT,MEASUREMENT_CONCEPT_ID,40765040,25-Hydroxyvitamin D3+25-Hydroxyvitamin D2 [Mass/volume] in Serum or Plasma,,,,,,,,,,,,,,,,,,,,,,,"8842,8845",5,Approved UNIT_CONCEPT_IDs for the given MEASUREMENT_CONCEPT_ID
 MEASUREMENT,MEASUREMENT_CONCEPT_ID,3024386,Platelet mean volume [Entitic volume] in Blood by Rees-Ecker,,,,,,,,,,,,,,,,,,,,,,,8583,5,Approved UNIT_CONCEPT_IDs for the given MEASUREMENT_CONCEPT_ID
-MEASUREMENT,MEASUREMENT_CONCEPT_ID,3009201,Thyrotropin [Units/volume] in Serum or Plasma,,,,,,,,,,,,,,,,,,,,,,,"44777578,8719,9040,9093",5,Approved UNIT_CONCEPT_IDs for the given MEASUREMENT_CONCEPT_ID
+MEASUREMENT,MEASUREMENT_CONCEPT_ID,3009201,Thyrotropin [Units/volume] in Serum or Plasma,,,,,,,,,,,,,,,,,,,,,,,"44777578,8719,9040,9093,8860",5,Approved UNIT_CONCEPT_IDs for the given MEASUREMENT_CONCEPT_ID
 MEASUREMENT,MEASUREMENT_CONCEPT_ID,3024731,MCV [Entitic volume],,,,,,,,,,,,,,,,,,,,,,,8583,5,Approved UNIT_CONCEPT_IDs for the given MEASUREMENT_CONCEPT_ID
 MEASUREMENT,MEASUREMENT_CONCEPT_ID,3050479,Immature granulocytes/100 leukocytes in Blood,,,,,,,,,,,,,,,,,,,,,,,"8554,-1",5,Approved UNIT_CONCEPT_IDs for the given MEASUREMENT_CONCEPT_ID
 MEASUREMENT,MEASUREMENT_CONCEPT_ID,4012479,Low density lipoprotein cholesterol measurement,,,,,,,,,,,,,,,,,,,,,,,"8636,8753,8840",5,Approved UNIT_CONCEPT_IDs for the given MEASUREMENT_CONCEPT_ID
@@ -438,7 +438,7 @@ MEASUREMENT,MEASUREMENT_CONCEPT_ID,3010910,Erythrocytes [#/volume] in Body fluid
 MEASUREMENT,MEASUREMENT_CONCEPT_ID,3013290,Carbon dioxide [Partial pressure] in Blood,,,,,,,,,,,,,,,,,,,,,,,8876,5,Approved UNIT_CONCEPT_IDs for the given MEASUREMENT_CONCEPT_ID
 MEASUREMENT,MEASUREMENT_CONCEPT_ID,3027970,Globulin [Mass/volume] in Serum by calculation,,,,,,,,,,,,,,,,,,,,,,,"8636,8713,8950",5,Approved UNIT_CONCEPT_IDs for the given MEASUREMENT_CONCEPT_ID
 MEASUREMENT,MEASUREMENT_CONCEPT_ID,4239408,Heart rate,,,,,,,,,,,,,,,,,,,,,,,"8483,8541,8581",5,Approved UNIT_CONCEPT_IDs for the given MEASUREMENT_CONCEPT_ID
-MEASUREMENT,MEASUREMENT_CONCEPT_ID,3010813,Leukocytes [#/volume] in Blood,,,,,,,,,,,,,,,,,,,,,,,"44777588,8848,8961,9444",5,Approved UNIT_CONCEPT_IDs for the given MEASUREMENT_CONCEPT_ID
+MEASUREMENT,MEASUREMENT_CONCEPT_ID,3010813,Leukocytes [#/volume] in Blood,,,,,,,,,,,,,,,,,,,,,,,"44777588,8848,8961,9444,8647",5,Approved UNIT_CONCEPT_IDs for the given MEASUREMENT_CONCEPT_ID
 MEASUREMENT,MEASUREMENT_CONCEPT_ID,3023103,Potassium [Moles/volume] in Serum or Plasma,,,,,,,,,,,,,,,,,,,,,,,"8753,9557",5,Approved UNIT_CONCEPT_IDs for the given MEASUREMENT_CONCEPT_ID
 MEASUREMENT,MEASUREMENT_CONCEPT_ID,4030871,Red blood cell count,,,,,,,,,,,,,,,,,,,,,,,"8734,8815,8931,9444",5,Approved UNIT_CONCEPT_IDs for the given MEASUREMENT_CONCEPT_ID
 MEASUREMENT,MEASUREMENT_CONCEPT_ID,4154790,Diastolic blood pressure,,,,,,,,,,,,,,,,,,,,,,,8876,5,Approved UNIT_CONCEPT_IDs for the given MEASUREMENT_CONCEPT_ID
@@ -466,7 +466,7 @@ MEASUREMENT,MEASUREMENT_CONCEPT_ID,3013650,Neutrophils [#/volume] in Blood by Au
 MEASUREMENT,MEASUREMENT_CONCEPT_ID,3021886,Globulin [Mass/volume] in Serum,,,,,,,,,,,,,,,,,,,,,,,"8636,8713,8950",5,Approved UNIT_CONCEPT_IDs for the given MEASUREMENT_CONCEPT_ID
 MEASUREMENT,MEASUREMENT_CONCEPT_ID,4254663,Lymphocyte count,,,,,,,,,,,,,,,,,,,,,,,8848,5,Approved UNIT_CONCEPT_IDs for the given MEASUREMENT_CONCEPT_ID
 MEASUREMENT,MEASUREMENT_CONCEPT_ID,3001420,Magnesium [Mass/volume] in Serum or Plasma,,,,,,,,,,,,,,,,,,,,,,,8840,5,Approved UNIT_CONCEPT_IDs for the given MEASUREMENT_CONCEPT_ID
-MEASUREMENT,MEASUREMENT_CONCEPT_ID,3007461,Platelets [#/volume] in Blood,,,,,,,,,,,,,,,,,,,,,,,"8848,8961,9444",5,Approved UNIT_CONCEPT_IDs for the given MEASUREMENT_CONCEPT_ID
+MEASUREMENT,MEASUREMENT_CONCEPT_ID,3007461,Platelets [#/volume] in Blood,,,,,,,,,,,,,,,,,,,,,,,"8848,8961,9444,32706",5,Approved UNIT_CONCEPT_IDs for the given MEASUREMENT_CONCEPT_ID
 MEASUREMENT,MEASUREMENT_CONCEPT_ID,3012030,MCH [Entitic mass] by Automated count,,,,,,,,,,,,,,,,,,,,,,,8564,5,Approved UNIT_CONCEPT_IDs for the given MEASUREMENT_CONCEPT_ID
 MEASUREMENT,MEASUREMENT_CONCEPT_ID,40764999,"Glomerular filtration rate/1.73 sq M.predicted [Volume Rate/Area] in Serum, Plasma or Blood by Creatinine-based formula (CKD-EPI)",,,,,,,,,,,,,,,,,,,,,,,"720870,8795",5,Approved UNIT_CONCEPT_IDs for the given MEASUREMENT_CONCEPT_ID
 MEASUREMENT,MEASUREMENT_CONCEPT_ID,3008893,Testosterone [Mass/volume] in Serum or Plasma,,,,,,,,,,,,,,,,,,,,,,,8817,5,Approved UNIT_CONCEPT_IDs for the given MEASUREMENT_CONCEPT_ID
diff --git a/inst/csv/OMOP_CDMv5.4_Concept_Level.csv b/inst/csv/OMOP_CDMv5.4_Concept_Level.csv
index 8a1e9e7b..8c1c84de 100644
--- a/inst/csv/OMOP_CDMv5.4_Concept_Level.csv
+++ b/inst/csv/OMOP_CDMv5.4_Concept_Level.csv
@@ -426,7 +426,7 @@ MEASUREMENT,MEASUREMENT_CONCEPT_ID,4301868,Pulse rate,,,,,,,,,,,,,,,,,,,,,,,"848
 MEASUREMENT,MEASUREMENT_CONCEPT_ID,40762636,Body mass index (BMI) [Percentile],,,,,,,,,,,,,,,,,,,,,,,8554,5,Approved UNIT_CONCEPT_IDs for the given MEASUREMENT_CONCEPT_ID
 MEASUREMENT,MEASUREMENT_CONCEPT_ID,40765040,25-Hydroxyvitamin D3+25-Hydroxyvitamin D2 [Mass/volume] in Serum or Plasma,,,,,,,,,,,,,,,,,,,,,,,"8842,8845",5,Approved UNIT_CONCEPT_IDs for the given MEASUREMENT_CONCEPT_ID
 MEASUREMENT,MEASUREMENT_CONCEPT_ID,3024386,Platelet mean volume [Entitic volume] in Blood by Rees-Ecker,,,,,,,,,,,,,,,,,,,,,,,8583,5,Approved UNIT_CONCEPT_IDs for the given MEASUREMENT_CONCEPT_ID
-MEASUREMENT,MEASUREMENT_CONCEPT_ID,3009201,Thyrotropin [Units/volume] in Serum or Plasma,,,,,,,,,,,,,,,,,,,,,,,"44777578,8719,9040,9093",5,Approved UNIT_CONCEPT_IDs for the given MEASUREMENT_CONCEPT_ID
+MEASUREMENT,MEASUREMENT_CONCEPT_ID,3009201,Thyrotropin [Units/volume] in Serum or Plasma,,,,,,,,,,,,,,,,,,,,,,,"44777578,8719,9040,9093,8860",5,Approved UNIT_CONCEPT_IDs for the given MEASUREMENT_CONCEPT_ID
 MEASUREMENT,MEASUREMENT_CONCEPT_ID,3024731,MCV [Entitic volume],,,,,,,,,,,,,,,,,,,,,,,8583,5,Approved UNIT_CONCEPT_IDs for the given MEASUREMENT_CONCEPT_ID
 MEASUREMENT,MEASUREMENT_CONCEPT_ID,3050479,Immature granulocytes/100 leukocytes in Blood,,,,,,,,,,,,,,,,,,,,,,,"8554,-1",5,Approved UNIT_CONCEPT_IDs for the given MEASUREMENT_CONCEPT_ID
 MEASUREMENT,MEASUREMENT_CONCEPT_ID,4012479,Low density lipoprotein cholesterol measurement,,,,,,,,,,,,,,,,,,,,,,,"8636,8753,8840",5,Approved UNIT_CONCEPT_IDs for the given MEASUREMENT_CONCEPT_ID
@@ -438,7 +438,7 @@ MEASUREMENT,MEASUREMENT_CONCEPT_ID,3010910,Erythrocytes [#/volume] in Body fluid
 MEASUREMENT,MEASUREMENT_CONCEPT_ID,3013290,Carbon dioxide [Partial pressure] in Blood,,,,,,,,,,,,,,,,,,,,,,,8876,5,Approved UNIT_CONCEPT_IDs for the given MEASUREMENT_CONCEPT_ID
 MEASUREMENT,MEASUREMENT_CONCEPT_ID,3027970,Globulin [Mass/volume] in Serum by calculation,,,,,,,,,,,,,,,,,,,,,,,"8636,8713,8950",5,Approved UNIT_CONCEPT_IDs for the given MEASUREMENT_CONCEPT_ID
 MEASUREMENT,MEASUREMENT_CONCEPT_ID,4239408,Heart rate,,,,,,,,,,,,,,,,,,,,,,,"8483,8541,8581",5,Approved UNIT_CONCEPT_IDs for the given MEASUREMENT_CONCEPT_ID
-MEASUREMENT,MEASUREMENT_CONCEPT_ID,3010813,Leukocytes [#/volume] in Blood,,,,,,,,,,,,,,,,,,,,,,,"44777588,8848,8961,9444",5,Approved UNIT_CONCEPT_IDs for the given MEASUREMENT_CONCEPT_ID
+MEASUREMENT,MEASUREMENT_CONCEPT_ID,3010813,Leukocytes [#/volume] in Blood,,,,,,,,,,,,,,,,,,,,,,,"44777588,8848,8961,9444,8647",5,Approved UNIT_CONCEPT_IDs for the given MEASUREMENT_CONCEPT_ID
 MEASUREMENT,MEASUREMENT_CONCEPT_ID,3023103,Potassium [Moles/volume] in Serum or Plasma,,,,,,,,,,,,,,,,,,,,,,,"8753,9557",5,Approved UNIT_CONCEPT_IDs for the given MEASUREMENT_CONCEPT_ID
 MEASUREMENT,MEASUREMENT_CONCEPT_ID,4030871,Red blood cell count,,,,,,,,,,,,,,,,,,,,,,,"8734,8815,8931,9444",5,Approved UNIT_CONCEPT_IDs for the given MEASUREMENT_CONCEPT_ID
 MEASUREMENT,MEASUREMENT_CONCEPT_ID,4154790,Diastolic blood pressure,,,,,,,,,,,,,,,,,,,,,,,8876,5,Approved UNIT_CONCEPT_IDs for the given MEASUREMENT_CONCEPT_ID
@@ -466,7 +466,7 @@ MEASUREMENT,MEASUREMENT_CONCEPT_ID,3013650,Neutrophils [#/volume] in Blood by Au
 MEASUREMENT,MEASUREMENT_CONCEPT_ID,3021886,Globulin [Mass/volume] in Serum,,,,,,,,,,,,,,,,,,,,,,,"8636,8713,8950",5,Approved UNIT_CONCEPT_IDs for the given MEASUREMENT_CONCEPT_ID
 MEASUREMENT,MEASUREMENT_CONCEPT_ID,4254663,Lymphocyte count,,,,,,,,,,,,,,,,,,,,,,,8848,5,Approved UNIT_CONCEPT_IDs for the given MEASUREMENT_CONCEPT_ID
 MEASUREMENT,MEASUREMENT_CONCEPT_ID,3001420,Magnesium [Mass/volume] in Serum or Plasma,,,,,,,,,,,,,,,,,,,,,,,8840,5,Approved UNIT_CONCEPT_IDs for the given MEASUREMENT_CONCEPT_ID
-MEASUREMENT,MEASUREMENT_CONCEPT_ID,3007461,Platelets [#/volume] in Blood,,,,,,,,,,,,,,,,,,,,,,,"8848,8961,9444",5,Approved UNIT_CONCEPT_IDs for the given MEASUREMENT_CONCEPT_ID
+MEASUREMENT,MEASUREMENT_CONCEPT_ID,3007461,Platelets [#/volume] in Blood,,,,,,,,,,,,,,,,,,,,,,,"8848,8961,9444,32706",5,Approved UNIT_CONCEPT_IDs for the given MEASUREMENT_CONCEPT_ID
 MEASUREMENT,MEASUREMENT_CONCEPT_ID,3012030,MCH [Entitic mass] by Automated count,,,,,,,,,,,,,,,,,,,,,,,8564,5,Approved UNIT_CONCEPT_IDs for the given MEASUREMENT_CONCEPT_ID
 MEASUREMENT,MEASUREMENT_CONCEPT_ID,40764999,"Glomerular filtration rate/1.73 sq M.predicted [Volume Rate/Area] in Serum, Plasma or Blood by Creatinine-based formula (CKD-EPI)",,,,,,,,,,,,,,,,,,,,,,,"720870,8795",5,Approved UNIT_CONCEPT_IDs for the given MEASUREMENT_CONCEPT_ID
 MEASUREMENT,MEASUREMENT_CONCEPT_ID,3008893,Testosterone [Mass/volume] in Serum or Plasma,,,,,,,,,,,,,,,,,,,,,,,8817,5,Approved UNIT_CONCEPT_IDs for the given MEASUREMENT_CONCEPT_ID