diff --git a/model-desc/c3dc-model-props.yml b/model-desc/c3dc-model-props.yml
index 57d1557..6b4f3e0 100644
--- a/model-desc/c3dc-model-props.yml
+++ b/model-desc/c3dc-model-props.yml
@@ -1210,80 +1210,82 @@ PropDefinitions:
       - Origin: caDSR
         Code: '13299113'
         Value: Toronto Childhood Cancer Staging
-    Enum:
-      - "Acute lymphoblastic leukemia CNS1"
-      - "Acute lymphoblastic leukemia CNS2"
-      - "Acute lymphoblastic leukemia CNS3"
-      - "Astrocytomas Localized"
-      - "Astrocytomas Metastatic"
-      - "Ependymoma M0"
-      - "Ependymoma M1"
-      - "Ependymoma M2"
-      - "Ependymoma M3"
-      - "Ependymoma M4"
-      - "Hepatoblastoma Localized PRETEXT I"
-      - "Hepatoblastoma Localized PRETEXT II"
-      - "Hepatoblastoma Localized PRETEXT III"
-      - "Hepatoblastoma Localized PRETEXT IV"
-      - "Hepatoblastoma Metastatic PRETEXT I"
-      - "Hepatoblastoma Metastatic PRETEXT II"
-      - "Hepatoblastoma Metastatic PRETEXT III"
-      - "Hepatoblastoma Metastatic PRETEXT IV"
-      - "Hodgkin lymphoma Stage I"
-      - "Hodgkin lymphoma Stage II"
-      - "Hodgkin lymphoma Stage III"
-      - "Hodgkin lymphoma Stage IV"
-      - "Malignant bone tumor Localized"
-      - "Malignant bone tumor Metastatic"
-      - "Medulloblastoma M0"
-      - "Medulloblastoma M1"
-      - "Medulloblastoma M2"
-      - "Medulloblastoma M3"
-      - "Medulloblastoma M4"
-      - "Neuroblastoma Stage L1"
-      - "Neuroblastoma Stage L2"
-      - "Neuroblastoma Stage M"
-      - "Neuroblastoma Stage MS"
-      - "Non-Hodgkin lymphoma Stage I"
-      - "Non-Hodgkin lymphoma Stage II"
-      - "Non-Hodgkin lymphoma Stage III"
-      - "Non-Hodgkin lymphoma Stage IV"
-      - "Non-rhabdomyosarcoma soft tissue sarcoma Stage I"
-      - "Non-rhabdomyosarcoma soft tissue sarcoma Stage II"
-      - "Non-rhabdomyosarcoma soft tissue sarcoma Stage III"
-      - "Non-rhabdomyosarcoma soft tissue sarcoma Stage IV"
-      - "Ovarian germ cell tumor Stage I"
-      - "Ovarian germ cell tumor Stage II"
-      - "Ovarian germ cell tumor Stage III"
-      - "Ovarian germ cell tumor Stage IV"
-      - "Renal tumor (excluding renal cell carcinomas) Stage I"
-      - "Renal tumor (excluding renal cell carcinomas) Stage II"
-      - "Renal tumor (excluding renal cell carcinomas) Stage III"
-      - "Renal tumor (excluding renal cell carcinomas) Stage IV"
-      - "Renal tumor (excluding renal cell carcinomas) Stage y-I"
-      - "Renal tumor (excluding renal cell carcinomas) Stage y-II"
-      - "Renal tumor (excluding renal cell carcinomas) Stage y-III"
-      - "Retinoblastoma Stage 0"
-      - "Retinoblastoma Stage I"
-      - "Retinoblastoma Stage II"
-      - "Retinoblastoma Stage III"
-      - "Retinoblastoma Stage IV"
-      - "Rhabdomyosarcoma Stage I"
-      - "Rhabdomyosarcoma Stage II"
-      - "Rhabdomyosarcoma Stage III"
-      - "Rhabdomyosarcoma Stage IV"
-      - "Testicular germ cell tumor Stage I"
-      - "Testicular germ cell tumor Stage IA"
-      - "Testicular germ cell tumor Stage IB"
-      - "Testicular germ cell tumor Stage II"
-      - "Testicular germ cell tumor Stage IIA"
-      - "Testicular germ cell tumor Stage IIB"
-      - "Testicular germ cell tumor Stage IIC"
-      - "Testicular germ cell tumor Stage III"
-      - "Testicular germ cell tumor Stage IIIA"
-      - "Testicular germ cell tumor Stage IIIB"
-      - "Testicular germ cell tumor Stage IIIC"
-      - "Testicular germ cell tumor Stage IS"
+    Type:
+      value_type: list
+      Enum:
+        - "Acute lymphoblastic leukemia CNS1"
+        - "Acute lymphoblastic leukemia CNS2"
+        - "Acute lymphoblastic leukemia CNS3"
+        - "Astrocytomas Localized"
+        - "Astrocytomas Metastatic"
+        - "Ependymoma M0"
+        - "Ependymoma M1"
+        - "Ependymoma M2"
+        - "Ependymoma M3"
+        - "Ependymoma M4"
+        - "Hepatoblastoma Localized PRETEXT I"
+        - "Hepatoblastoma Localized PRETEXT II"
+        - "Hepatoblastoma Localized PRETEXT III"
+        - "Hepatoblastoma Localized PRETEXT IV"
+        - "Hepatoblastoma Metastatic PRETEXT I"
+        - "Hepatoblastoma Metastatic PRETEXT II"
+        - "Hepatoblastoma Metastatic PRETEXT III"
+        - "Hepatoblastoma Metastatic PRETEXT IV"
+        - "Hodgkin lymphoma Stage I"
+        - "Hodgkin lymphoma Stage II"
+        - "Hodgkin lymphoma Stage III"
+        - "Hodgkin lymphoma Stage IV"
+        - "Malignant bone tumor Localized"
+        - "Malignant bone tumor Metastatic"
+        - "Medulloblastoma M0"
+        - "Medulloblastoma M1"
+        - "Medulloblastoma M2"
+        - "Medulloblastoma M3"
+        - "Medulloblastoma M4"
+        - "Neuroblastoma Stage L1"
+        - "Neuroblastoma Stage L2"
+        - "Neuroblastoma Stage M"
+        - "Neuroblastoma Stage MS"
+        - "Non-Hodgkin lymphoma Stage I"
+        - "Non-Hodgkin lymphoma Stage II"
+        - "Non-Hodgkin lymphoma Stage III"
+        - "Non-Hodgkin lymphoma Stage IV"
+        - "Non-rhabdomyosarcoma soft tissue sarcoma Stage I"
+        - "Non-rhabdomyosarcoma soft tissue sarcoma Stage II"
+        - "Non-rhabdomyosarcoma soft tissue sarcoma Stage III"
+        - "Non-rhabdomyosarcoma soft tissue sarcoma Stage IV"
+        - "Ovarian germ cell tumor Stage I"
+        - "Ovarian germ cell tumor Stage II"
+        - "Ovarian germ cell tumor Stage III"
+        - "Ovarian germ cell tumor Stage IV"
+        - "Renal tumor (excluding renal cell carcinomas) Stage I"
+        - "Renal tumor (excluding renal cell carcinomas) Stage II"
+        - "Renal tumor (excluding renal cell carcinomas) Stage III"
+        - "Renal tumor (excluding renal cell carcinomas) Stage IV"
+        - "Renal tumor (excluding renal cell carcinomas) Stage y-I"
+        - "Renal tumor (excluding renal cell carcinomas) Stage y-II"
+        - "Renal tumor (excluding renal cell carcinomas) Stage y-III"
+        - "Retinoblastoma Stage 0"
+        - "Retinoblastoma Stage I"
+        - "Retinoblastoma Stage II"
+        - "Retinoblastoma Stage III"
+        - "Retinoblastoma Stage IV"
+        - "Rhabdomyosarcoma Stage I"
+        - "Rhabdomyosarcoma Stage II"
+        - "Rhabdomyosarcoma Stage III"
+        - "Rhabdomyosarcoma Stage IV"
+        - "Testicular germ cell tumor Stage I"
+        - "Testicular germ cell tumor Stage IA"
+        - "Testicular germ cell tumor Stage IB"
+        - "Testicular germ cell tumor Stage II"
+        - "Testicular germ cell tumor Stage IIA"
+        - "Testicular germ cell tumor Stage IIB"
+        - "Testicular germ cell tumor Stage IIC"
+        - "Testicular germ cell tumor Stage III"
+        - "Testicular germ cell tumor Stage IIIA"
+        - "Testicular germ cell tumor Stage IIIB"
+        - "Testicular germ cell tumor Stage IIIC"
+        - "Testicular germ cell tumor Stage IS"
     Req: false
     Strict: true
     Private: false
@@ -1304,17 +1306,19 @@ PropDefinitions:
       - Origin: caDSR
         Code: '5424231'
         Value: Person Last Known Neoplasm Status
-    Enum:
-      - "Biochemical evidence of disease without structural correlate"
-      - "Distant met recurrence/progression"
-      - "Loco-regional recurrence/progression"
-      - "Never Tumor Free"
-      - "New Tumor Event (remission/relapse)"
-      - "Tumor free"
-      - "Tumor Free at Follow-up"
-      - "Unknown"
-      - "Unknown tumor status"
-      - "With tumor"
+    Type:
+      value_type: list
+      Enum:
+        - "Biochemical evidence of disease without structural correlate"
+        - "Distant met recurrence/progression"
+        - "Loco-regional recurrence/progression"
+        - "Never Tumor Free"
+        - "New Tumor Event (remission/relapse)"
+        - "Tumor free"
+        - "Tumor Free at Follow-up"
+        - "Unknown"
+        - "Unknown tumor status"
+        - "With tumor"
     Req: false
     Strict: true
     Private: false     
@@ -1346,13 +1350,15 @@ PropDefinitions:
       - Origin: caDSR
         Code: '7197400'
         Value: A grouping of topic-variable values based on sponsor defined characteristics.
-    Enum:
-      - "Adverse Event"
-      - "Last Known Disease Status"
-      - "Comorbidity"
-      - "Disease Event"
-      - "Disease Response"
-      - "Other"
+    Type:
+      value_type: list
+      Enum:
+        - "Adverse Event"
+        - "Last Known Disease Status"
+        - "Comorbidity"
+        - "Disease Event"
+        - "Disease Response"
+        - "Other"
     Req: true
     Private: false
     Key: false
@@ -1411,58 +1417,60 @@ PropDefinitions:
       - Origin: caDSR
         Code: '7797710' #caDSR PVs are csv, bam, fastq, txt
         Value: Raw Data File Format
-    Enum:
-      - "bam"
-      - "bam_index"
-      - "bai"
-      - "bcf"
-      - "bed"
-      - "bif"
-      - "bw"
-      - "cns"
-      - "cram"
-      - "cram_index"
-      - "crai"
-      - "csi"
-      - "csv"
-      - "dicom"
-      - "docx"
-      - "fasta"
-      - "fastq"
-      - "gvcf"
-      - "html"
-      - "idat"
-      - "jpg"
-      - "json"
-      - "mrxs"
-      - "maf"
-      - "ndpi"
-      - "nifti"
-      - "pdf"
-      - "ped"
-      - "png"
-      - "py"
-      - "rda"
-      - "rdata"
-      - "rds"
-      - "sas7bdat"
-      - "scn"
-      - "seg"
-      - "svg"
-      - "svs"
-      - "tar"
-      - "tbi"
-      - "tsv"
-      - "tif"
-      - "tiff"
-      - "txt"
-      - "vcf"
-      - "vcf_index"
-      - "vms"
-      - "vmu"
-      - "xls"
-      - "xlsx"
-      - "xml"
+    Type:
+      value_type: list
+      Enum:
+        - "bam"
+        - "bam_index"
+        - "bai"
+        - "bcf"
+        - "bed"
+        - "bif"
+        - "bw"
+        - "cns"
+        - "cram"
+        - "cram_index"
+        - "crai"
+        - "csi"
+        - "csv"
+        - "dicom"
+        - "docx"
+        - "fasta"
+        - "fastq"
+        - "gvcf"
+        - "html"
+        - "idat"
+        - "jpg"
+        - "json"
+        - "mrxs"
+        - "maf"
+        - "ndpi"
+        - "nifti"
+        - "pdf"
+        - "ped"
+        - "png"
+        - "py"
+        - "rda"
+        - "rdata"
+        - "rds"
+        - "sas7bdat"
+        - "scn"
+        - "seg"
+        - "svg"
+        - "svs"
+        - "tar"
+        - "tbi"
+        - "tsv"
+        - "tif"
+        - "tiff"
+        - "txt"
+        - "vcf"
+        - "vcf_index"
+        - "vms"
+        - "vmu"
+        - "xls"
+        - "xlsx"
+        - "xml"
     Req: true
     Strict: true
     Private: false
@@ -1474,11 +1482,13 @@ PropDefinitions:
     Private: false
   file_category:
     Desc: A freeform description of the file.
-    Enum:
-      - "programmatic source code"
-      - "transformation/mapping"
-      - "output schema"
-      - "input source data"
+    Type:
+      value_type: list
+      Enum:
+        - "programmatic source code"
+        - "transformation/mapping"
+        - "output schema"
+        - "input source data"
     Req: true
     Strict: true
     Private: false
@@ -1590,16 +1600,18 @@ PropDefinitions:
       - Origin: caDSR
         Code: '2200604'
         Value: Person Gender Text Type
-    Enum:
-      - "Female"
-      - "Female Gender"
-      - "Intersex"
-      - "Male"
-      - "Male Gender"
-      - "Not Reported"
-      - "Not Specified"
-      - "Unknown"
-      - "Unspecified" 
+    Type:
+      value_type: list
+      Enum:
+        - "Female"
+        - "Female Gender"
+        - "Intersex"
+        - "Male"
+        - "Male Gender"
+        - "Not Reported"
+        - "Not Specified"
+        - "Unknown"
+        - "Unspecified" 
     Req: true
     Strict: true
     Private: false
@@ -1665,351 +1677,353 @@ PropDefinitions:
       - Origin: caDSR
         Code: '11341616'
         Value: Disease Primary Anatomic Site ICD-O-3 Code
-    Enum:
-      - "Abdomen, NOS"
-      - "Abdominal esophagus"
-      - "Accessory sinus, NOS"
-      - "Acoustic nerve"
-      - "Adrenal gland, NOS"
-      - "Ampulla of Vater"
-      - "Anal canal"
-      - "Anterior 2/3 of tongue, NOS"
-      - "Anterior floor of mouth"
-      - "Anterior mediastinum"
-      - "Anterior surface of epiglottis"
-      - "Anterior wall of bladder"
-      - "Anterior wall of nasopharynx"
-      - "Anus, NOS"
-      - "Aortic body and other paraganglia"
-      - "Appendix"
-      - "Ascending colon"
-      - "Autonomic nervous system, NOS"
-      - "Axillary tail of breast"
-      - "Base of tongue, NOS"
-      - "Biliary tract, NOS"
-      - "Bladder neck"
-      - "Bladder, NOS"
-      - "Blood"
-      - "Body of pancreas"
-      - "Body of penis"
-      - "Body of stomach"
-      - "Bone marrow"
-      - "Bone of limb, NOS"
-      - "Bone, NOS"
-      - "Bones of skull and face and associated joints"
-      - "Border of tongue"
-      - "Brain stem"
-      - "Brain, NOS"
-      - "Branchial cleft"
-      - "Breast, NOS"
-      - "Broad ligament"
-      - "Buccal mucosa"
-      - "Cardia, NOS"
-      - "Carotid body"
-      - "Cauda equina"
-      - "Cecum"
-      - "Central portion of breast"
-      - "Cerebellum, NOS"
-      - "Cerebral meninges"
-      - "Cerebrospinal fluid"
-      - "Cerebrum"
-      - "Cervical esophagus"
-      - "Cervix uteri"
-      - "Cheek mucosa"
-      - "Chest wall, NOS"
-      - "Choroid"
-      - "Ciliary body"
-      - "Clitoris"
-      - "Cloacogenic zone"
-      - "Colon, NOS"
-      - "Commissure of lip"
-      - "Conjunctiva"
-      - "Connective, subcutaneous and other soft tissues of abdomen"
-      - "Connective, subcutaneous and other soft tissues of head, face, and neck"
-      - "Connective, subcutaneous and other soft tissues of lower limb and hip"
-      - "Connective, subcutaneous and other soft tissues of pelvis"
-      - "Connective, subcutaneous and other soft tissues of thorax"
-      - "Connective, subcutaneous and other soft tissues of trunk, NOS"
-      - "Connective, subcutaneous and other soft tissues of upper limb and shoulder"
-      - "Connective, subcutaneous and other soft tissues, NOS"
-      - "Cornea, NOS"
-      - "Corpus uteri"
-      - "Cortex of adrenal gland"
-      - "Cranial fossa, NOS"
-      - "Cranial nerve, NOS"
-      - "Craniopharyngeal duct"
-      - "Descended testis"
-      - "Descending colon"
-      - "Dome of bladder"
-      - "Dorsal surface of tongue, NOS"
-      - "Duodenum"
-      - "Endocervix"
-      - "Endocrine gland, NOS"
-      - "Endometrium"
-      - "Epididymis"
-      - "Esophagus, NOS"
-      - "Ethmoid sinus"
-      - "Exocervix"
-      - "External ear"
-      - "External lip, NOS"
-      - "External lower lip"
-      - "External upper lip"
-      - "Extrahepatic bile duct"
-      - "Eye, NOS"
-      - "Eyelid"
-      - "Fallopian tube"
-      - "Female genital tract, NOS"
-      - "Floor of mouth, NOS"
-      - "Foot, NOS"
-      - "Frontal lobe"
-      - "Frontal sinus"
-      - "Fundus of stomach"
-      - "Fundus uteri"
-      - "Gallbladder"
-      - "Gastric antrum"
-      - "Gastrointestinal tract, NOS"
-      - "Glans penis"
-      - "Glottis"
-      - "Greater curvature of stomach, NOS"
-      - "Gum, NOS"
-      - "Hand, NOS"
-      - "Hard palate"
-      - "Head of pancreas"
-      - "Head, face or neck, NOS"
-      - "Heart"
-      - "Hematopoietic system, NOS"
-      - "Hepatic flexure of colon"
-      - "Hypopharyngeal aspect of aryepiglottic fold"
-      - "Hypopharynx, NOS"
-      - "Ileum"
-      - "Ill-defined sites within respiratory system"
-      - "Intestinal tract, NOS"
-      - "Intra-abdominal lymph nodes"
-      - "Intrahepatic bile duct"
-      - "Intrathoracic lymph nodes"
-      - "Islets of Langerhans"
-      - "Isthmus uteri"
-      - "Jejunum"
-      - "Kidney, NOS"
-      - "Labium majus"
-      - "Labium minus"
-      - "Lacrimal gland"
-      - "Laryngeal cartilage"
-      - "Laryngeal commissure"
-      - "Larynx, NOS"
-      - "Lateral floor of mouth"
-      - "Lateral wall of bladder"
-      - "Lateral wall of nasopharynx"
-      - "Lateral wall of oropharynx"
-      - "Lesser curvature of stomach, NOS"
-      - "Lingual tonsil"
-      - "Lip, NOS"
-      - "Liver"
-      - "Long bones of lower limb and associated joints"
-      - "Long bones of upper limb, scapula and associated joints"
-      - "Lower gum"
-      - "Lower limb, NOS"
-      - "Lower lobe, lung"
-      - "Lower third of esophagus"
-      - "Lower-inner quadrant of breast"
-      - "Lower-outer quadrant of breast"
-      - "Lung, NOS"
-      - "Lymph node, NOS"
-      - "Lymph nodes of axilla or arm"
-      - "Lymph nodes of head, face and neck"
-      - "Lymph nodes of inguinal region or leg"
-      - "Lymph nodes of multiple regions"
-      - "Main bronchus"
-      - "Major salivary gland, NOS"
-      - "Male genital organs, NOS"
-      - "Mandible"
-      - "Maxillary sinus"
-      - "Meckel diverticulum"
-      - "Mediastinum, NOS"
-      - "Medulla of adrenal gland"
-      - "Meninges, NOS"
-      - "Middle ear"
-      - "Middle lobe, lung"
-      - "Middle third of esophagus"
-      - "Mouth, NOS"
-      - "Mucosa of lip, NOS"
-      - "Mucosa of lower lip"
-      - "Mucosa of upper lip"
-      - "Myometrium"
-      - "Nasal cavity"
-      - "Nasopharynx, NOS"
-      - "Nervous system, NOS"
-      - "Nipple"
-      - "Not Reported"
-      - "Occipital lobe"
-      - "Olfactory nerve"
-      - "Optic nerve"
-      - "Orbit, NOS"
-      - "Oropharynx, NOS"
-      - "Other ill-defined sites"
-      - "Other specified parts of female genital organs"
-      - "Other specified parts of male genital organs"
-      - "Other specified parts of pancreas"
-      - "Ovary"
-      - "Overlapping lesion of accessory sinuses"
-      - "Overlapping lesion of biliary tract"
-      - "Overlapping lesion of bladder"
-      - "Overlapping lesion of bones, joints and articular cartilage"
-      - "Overlapping lesion of bones, joints and articular cartilage of limbs"
-      - "Overlapping lesion of brain"
-      - "Overlapping lesion of brain and central nervous system"
-      - "Overlapping lesion of breast"
-      - "Overlapping lesion of cervix uteri"
-      - "Overlapping lesion of colon"
-      - "Overlapping lesion of connective, subcutaneous and other soft tissues"
-      - "Overlapping lesion of corpus uteri"
-      - "Overlapping lesion of digestive system"
-      - "Overlapping lesion of endocrine glands and related structures"
-      - "Overlapping lesion of esophagus"
-      - "Overlapping lesion of eye and adnexa"
-      - "Overlapping lesion of female genital organs"
-      - "Overlapping lesion of floor of mouth"
-      - "Overlapping lesion of heart, mediastinum and pleura"
-      - "Overlapping lesion of hypopharynx"
-      - "Overlapping lesion of ill-defined sites"
-      - "Overlapping lesion of larynx"
-      - "Overlapping lesion of lip"
-      - "Overlapping lesion of lip, oral cavity and pharynx"
-      - "Overlapping lesion of lung"
-      - "Overlapping lesion of major salivary glands"
-      - "Overlapping lesion of male genital organs"
-      - "Overlapping lesion of nasopharynx"
-      - "Overlapping lesion of other and unspecified parts of mouth"
-      - "Overlapping lesion of palate"
-      - "Overlapping lesion of pancreas"
-      - "Overlapping lesion of penis"
-      - "Overlapping lesion of peripheral nerves and autonomic nervous system"
-      - "Overlapping lesion of rectum, anus and anal canal"
-      - "Overlapping lesion of respiratory system and intrathoracic organs"
-      - "Overlapping lesion of retroperitoneum and peritoneum"
-      - "Overlapping lesion of skin"
-      - "Overlapping lesion of small intestine"
-      - "Overlapping lesion of stomach"
-      - "Overlapping lesion of tongue"
-      - "Overlapping lesion of tonsil"
-      - "Overlapping lesion of urinary organs"
-      - "Overlapping lesion of vulva"
-      - "Overlapping lesions of oropharynx"
-      - "Palate, NOS"
-      - "Pancreas, NOS"
-      - "Pancreatic duct"
-      - "Parametrium"
-      - "Parathyroid gland"
-      - "Paraurethral gland"
-      - "Parietal lobe"
-      - "Parotid gland"
-      - "Pelvic bones, sacrum, coccyx and associated joints"
-      - "Pelvic lymph nodes"
-      - "Pelvis, NOS"
-      - "Penis, NOS"
-      - "Perineum, NOS"
-      - "Peripheral nerves and autonomic nervous system of abdomen"
-      - "Peripheral nerves and autonomic nervous system of head, face, and neck"
-      - "Peripheral nerves and autonomic nervous system of lower limb and hip"
-      - "Peripheral nerves and autonomic nervous system of pelvis"
-      - "Peripheral nerves and autonomic nervous system of thorax"
-      - "Peripheral nerves and autonomic nervous system of trunk, NOS"
-      - "Peripheral nerves and autonomic nervous system of upper limb and shoulder"
-      - "Peritoneum, NOS"
-      - "Pharynx, NOS"
-      - "Pineal gland"
-      - "Pituitary gland"
-      - "Placenta"
-      - "Pleura, NOS"
-      - "Postcricoid region"
-      - "Posterior cranial fossa"
-      - "Posterior mediastinum"
-      - "Posterior wall of bladder"
-      - "Posterior wall of hypopharynx"
-      - "Posterior wall of nasopharynx"
-      - "Posterior wall of oropharynx"
-      - "Prepuce"
-      - "Prostate gland"
-      - "Pylorus"
-      - "Pyriform sinus"
-      - "Rectosigmoid junction"
-      - "Rectum, NOS"
-      - "Renal pelvis"
-      - "Reticuloendothelial system, NOS"
-      - "Retina"
-      - "Retromolar area"
-      - "Retroperitoneum"
-      - "Rib, sternum, clavicle and associated joints"
-      - "Round ligament"
-      - "Saliva"
-      - "Scrotum, NOS"
-      - "Short bones of lower limb and associated joints"
-      - "Short bones of upper limb and associated joints"
-      - "Sigmoid colon"
-      - "Skin of lip, NOS"
-      - "Skin of lower limb and hip"
-      - "Skin of other and unspecified parts of face"
-      - "Skin of scalp and neck"
-      - "Skin of trunk"
-      - "Skin of upper limb and shoulder"
-      - "Skin, NOS"
-      - "Small intestine, NOS"
-      - "Soft palate, NOS"
-      - "Specified parts of peritoneum"
-      - "Spermatic cord"
-      - "Sphenoid sinus"
-      - "Spinal cord"
-      - "Spinal meninges"
-      - "Spleen"
-      - "Splenic flexure of colon"
-      - "Stomach, NOS"
-      - "Subglottis"
-      - "Sublingual gland"
-      - "Submandibular gland"
-      - "Superior wall of nasopharynx"
-      - "Supraglottis"
-      - "Tail of pancreas"
-      - "Temporal lobe"
-      - "Testis, NOS"
-      - "Thigh, NOS"
-      - "Thoracic esophagus"
-      - "Thorax, NOS"
-      - "Thymus"
-      - "Thyroid gland"
-      - "Tibia"
-      - "Tongue, NOS"
-      - "Tonsil, NOS"
-      - "Tonsillar fossa"
-      - "Tonsillar pillar"
-      - "Trachea"
-      - "Transverse colon"
-      - "Trigone of bladder"
-      - "Undescended testis"
-      - "Unknown"
-      - "Unknown primary site"
-      - "Upper Gum"
-      - "Upper limb, NOS"
-      - "Upper lobe, lung"
-      - "Upper respiratory tract, NOS"
-      - "Upper third of esophagus"
-      - "Upper-inner quadrant of breast"
-      - "Upper-outer quadrant of breast"
-      - "Urachus"
-      - "Ureter"
-      - "Ureteric orifice"
-      - "Urethra"
-      - "Urinary system, NOS"
-      - "Uterine adnexa"
-      - "Uterus, NOS"
-      - "Uvula"
-      - "Vagina, NOS"
-      - "Vallecula"
-      - "Ventral surface of tongue, NOS"
-      - "Ventricle, NOS"
-      - "Vertebral column"
-      - "Vestibule of mouth"
-      - "Vulva, NOS"
-      - "Waldeyer ring"
+    Type:
+      value_type: list
+      Enum:
+        - "Abdomen, NOS"
+        - "Abdominal esophagus"
+        - "Accessory sinus, NOS"
+        - "Acoustic nerve"
+        - "Adrenal gland, NOS"
+        - "Ampulla of Vater"
+        - "Anal canal"
+        - "Anterior 2/3 of tongue, NOS"
+        - "Anterior floor of mouth"
+        - "Anterior mediastinum"
+        - "Anterior surface of epiglottis"
+        - "Anterior wall of bladder"
+        - "Anterior wall of nasopharynx"
+        - "Anus, NOS"
+        - "Aortic body and other paraganglia"
+        - "Appendix"
+        - "Ascending colon"
+        - "Autonomic nervous system, NOS"
+        - "Axillary tail of breast"
+        - "Base of tongue, NOS"
+        - "Biliary tract, NOS"
+        - "Bladder neck"
+        - "Bladder, NOS"
+        - "Blood"
+        - "Body of pancreas"
+        - "Body of penis"
+        - "Body of stomach"
+        - "Bone marrow"
+        - "Bone of limb, NOS"
+        - "Bone, NOS"
+        - "Bones of skull and face and associated joints"
+        - "Border of tongue"
+        - "Brain stem"
+        - "Brain, NOS"
+        - "Branchial cleft"
+        - "Breast, NOS"
+        - "Broad ligament"
+        - "Buccal mucosa"
+        - "Cardia, NOS"
+        - "Carotid body"
+        - "Cauda equina"
+        - "Cecum"
+        - "Central portion of breast"
+        - "Cerebellum, NOS"
+        - "Cerebral meninges"
+        - "Cerebrospinal fluid"
+        - "Cerebrum"
+        - "Cervical esophagus"
+        - "Cervix uteri"
+        - "Cheek mucosa"
+        - "Chest wall, NOS"
+        - "Choroid"
+        - "Ciliary body"
+        - "Clitoris"
+        - "Cloacogenic zone"
+        - "Colon, NOS"
+        - "Commissure of lip"
+        - "Conjunctiva"
+        - "Connective, subcutaneous and other soft tissues of abdomen"
+        - "Connective, subcutaneous and other soft tissues of head, face, and neck"
+        - "Connective, subcutaneous and other soft tissues of lower limb and hip"
+        - "Connective, subcutaneous and other soft tissues of pelvis"
+        - "Connective, subcutaneous and other soft tissues of thorax"
+        - "Connective, subcutaneous and other soft tissues of trunk, NOS"
+        - "Connective, subcutaneous and other soft tissues of upper limb and shoulder"
+        - "Connective, subcutaneous and other soft tissues, NOS"
+        - "Cornea, NOS"
+        - "Corpus uteri"
+        - "Cortex of adrenal gland"
+        - "Cranial fossa, NOS"
+        - "Cranial nerve, NOS"
+        - "Craniopharyngeal duct"
+        - "Descended testis"
+        - "Descending colon"
+        - "Dome of bladder"
+        - "Dorsal surface of tongue, NOS"
+        - "Duodenum"
+        - "Endocervix"
+        - "Endocrine gland, NOS"
+        - "Endometrium"
+        - "Epididymis"
+        - "Esophagus, NOS"
+        - "Ethmoid sinus"
+        - "Exocervix"
+        - "External ear"
+        - "External lip, NOS"
+        - "External lower lip"
+        - "External upper lip"
+        - "Extrahepatic bile duct"
+        - "Eye, NOS"
+        - "Eyelid"
+        - "Fallopian tube"
+        - "Female genital tract, NOS"
+        - "Floor of mouth, NOS"
+        - "Foot, NOS"
+        - "Frontal lobe"
+        - "Frontal sinus"
+        - "Fundus of stomach"
+        - "Fundus uteri"
+        - "Gallbladder"
+        - "Gastric antrum"
+        - "Gastrointestinal tract, NOS"
+        - "Glans penis"
+        - "Glottis"
+        - "Greater curvature of stomach, NOS"
+        - "Gum, NOS"
+        - "Hand, NOS"
+        - "Hard palate"
+        - "Head of pancreas"
+        - "Head, face or neck, NOS"
+        - "Heart"
+        - "Hematopoietic system, NOS"
+        - "Hepatic flexure of colon"
+        - "Hypopharyngeal aspect of aryepiglottic fold"
+        - "Hypopharynx, NOS"
+        - "Ileum"
+        - "Ill-defined sites within respiratory system"
+        - "Intestinal tract, NOS"
+        - "Intra-abdominal lymph nodes"
+        - "Intrahepatic bile duct"
+        - "Intrathoracic lymph nodes"
+        - "Islets of Langerhans"
+        - "Isthmus uteri"
+        - "Jejunum"
+        - "Kidney, NOS"
+        - "Labium majus"
+        - "Labium minus"
+        - "Lacrimal gland"
+        - "Laryngeal cartilage"
+        - "Laryngeal commissure"
+        - "Larynx, NOS"
+        - "Lateral floor of mouth"
+        - "Lateral wall of bladder"
+        - "Lateral wall of nasopharynx"
+        - "Lateral wall of oropharynx"
+        - "Lesser curvature of stomach, NOS"
+        - "Lingual tonsil"
+        - "Lip, NOS"
+        - "Liver"
+        - "Long bones of lower limb and associated joints"
+        - "Long bones of upper limb, scapula and associated joints"
+        - "Lower gum"
+        - "Lower limb, NOS"
+        - "Lower lobe, lung"
+        - "Lower third of esophagus"
+        - "Lower-inner quadrant of breast"
+        - "Lower-outer quadrant of breast"
+        - "Lung, NOS"
+        - "Lymph node, NOS"
+        - "Lymph nodes of axilla or arm"
+        - "Lymph nodes of head, face and neck"
+        - "Lymph nodes of inguinal region or leg"
+        - "Lymph nodes of multiple regions"
+        - "Main bronchus"
+        - "Major salivary gland, NOS"
+        - "Male genital organs, NOS"
+        - "Mandible"
+        - "Maxillary sinus"
+        - "Meckel diverticulum"
+        - "Mediastinum, NOS"
+        - "Medulla of adrenal gland"
+        - "Meninges, NOS"
+        - "Middle ear"
+        - "Middle lobe, lung"
+        - "Middle third of esophagus"
+        - "Mouth, NOS"
+        - "Mucosa of lip, NOS"
+        - "Mucosa of lower lip"
+        - "Mucosa of upper lip"
+        - "Myometrium"
+        - "Nasal cavity"
+        - "Nasopharynx, NOS"
+        - "Nervous system, NOS"
+        - "Nipple"
+        - "Not Reported"
+        - "Occipital lobe"
+        - "Olfactory nerve"
+        - "Optic nerve"
+        - "Orbit, NOS"
+        - "Oropharynx, NOS"
+        - "Other ill-defined sites"
+        - "Other specified parts of female genital organs"
+        - "Other specified parts of male genital organs"
+        - "Other specified parts of pancreas"
+        - "Ovary"
+        - "Overlapping lesion of accessory sinuses"
+        - "Overlapping lesion of biliary tract"
+        - "Overlapping lesion of bladder"
+        - "Overlapping lesion of bones, joints and articular cartilage"
+        - "Overlapping lesion of bones, joints and articular cartilage of limbs"
+        - "Overlapping lesion of brain"
+        - "Overlapping lesion of brain and central nervous system"
+        - "Overlapping lesion of breast"
+        - "Overlapping lesion of cervix uteri"
+        - "Overlapping lesion of colon"
+        - "Overlapping lesion of connective, subcutaneous and other soft tissues"
+        - "Overlapping lesion of corpus uteri"
+        - "Overlapping lesion of digestive system"
+        - "Overlapping lesion of endocrine glands and related structures"
+        - "Overlapping lesion of esophagus"
+        - "Overlapping lesion of eye and adnexa"
+        - "Overlapping lesion of female genital organs"
+        - "Overlapping lesion of floor of mouth"
+        - "Overlapping lesion of heart, mediastinum and pleura"
+        - "Overlapping lesion of hypopharynx"
+        - "Overlapping lesion of ill-defined sites"
+        - "Overlapping lesion of larynx"
+        - "Overlapping lesion of lip"
+        - "Overlapping lesion of lip, oral cavity and pharynx"
+        - "Overlapping lesion of lung"
+        - "Overlapping lesion of major salivary glands"
+        - "Overlapping lesion of male genital organs"
+        - "Overlapping lesion of nasopharynx"
+        - "Overlapping lesion of other and unspecified parts of mouth"
+        - "Overlapping lesion of palate"
+        - "Overlapping lesion of pancreas"
+        - "Overlapping lesion of penis"
+        - "Overlapping lesion of peripheral nerves and autonomic nervous system"
+        - "Overlapping lesion of rectum, anus and anal canal"
+        - "Overlapping lesion of respiratory system and intrathoracic organs"
+        - "Overlapping lesion of retroperitoneum and peritoneum"
+        - "Overlapping lesion of skin"
+        - "Overlapping lesion of small intestine"
+        - "Overlapping lesion of stomach"
+        - "Overlapping lesion of tongue"
+        - "Overlapping lesion of tonsil"
+        - "Overlapping lesion of urinary organs"
+        - "Overlapping lesion of vulva"
+        - "Overlapping lesions of oropharynx"
+        - "Palate, NOS"
+        - "Pancreas, NOS"
+        - "Pancreatic duct"
+        - "Parametrium"
+        - "Parathyroid gland"
+        - "Paraurethral gland"
+        - "Parietal lobe"
+        - "Parotid gland"
+        - "Pelvic bones, sacrum, coccyx and associated joints"
+        - "Pelvic lymph nodes"
+        - "Pelvis, NOS"
+        - "Penis, NOS"
+        - "Perineum, NOS"
+        - "Peripheral nerves and autonomic nervous system of abdomen"
+        - "Peripheral nerves and autonomic nervous system of head, face, and neck"
+        - "Peripheral nerves and autonomic nervous system of lower limb and hip"
+        - "Peripheral nerves and autonomic nervous system of pelvis"
+        - "Peripheral nerves and autonomic nervous system of thorax"
+        - "Peripheral nerves and autonomic nervous system of trunk, NOS"
+        - "Peripheral nerves and autonomic nervous system of upper limb and shoulder"
+        - "Peritoneum, NOS"
+        - "Pharynx, NOS"
+        - "Pineal gland"
+        - "Pituitary gland"
+        - "Placenta"
+        - "Pleura, NOS"
+        - "Postcricoid region"
+        - "Posterior cranial fossa"
+        - "Posterior mediastinum"
+        - "Posterior wall of bladder"
+        - "Posterior wall of hypopharynx"
+        - "Posterior wall of nasopharynx"
+        - "Posterior wall of oropharynx"
+        - "Prepuce"
+        - "Prostate gland"
+        - "Pylorus"
+        - "Pyriform sinus"
+        - "Rectosigmoid junction"
+        - "Rectum, NOS"
+        - "Renal pelvis"
+        - "Reticuloendothelial system, NOS"
+        - "Retina"
+        - "Retromolar area"
+        - "Retroperitoneum"
+        - "Rib, sternum, clavicle and associated joints"
+        - "Round ligament"
+        - "Saliva"
+        - "Scrotum, NOS"
+        - "Short bones of lower limb and associated joints"
+        - "Short bones of upper limb and associated joints"
+        - "Sigmoid colon"
+        - "Skin of lip, NOS"
+        - "Skin of lower limb and hip"
+        - "Skin of other and unspecified parts of face"
+        - "Skin of scalp and neck"
+        - "Skin of trunk"
+        - "Skin of upper limb and shoulder"
+        - "Skin, NOS"
+        - "Small intestine, NOS"
+        - "Soft palate, NOS"
+        - "Specified parts of peritoneum"
+        - "Spermatic cord"
+        - "Sphenoid sinus"
+        - "Spinal cord"
+        - "Spinal meninges"
+        - "Spleen"
+        - "Splenic flexure of colon"
+        - "Stomach, NOS"
+        - "Subglottis"
+        - "Sublingual gland"
+        - "Submandibular gland"
+        - "Superior wall of nasopharynx"
+        - "Supraglottis"
+        - "Tail of pancreas"
+        - "Temporal lobe"
+        - "Testis, NOS"
+        - "Thigh, NOS"
+        - "Thoracic esophagus"
+        - "Thorax, NOS"
+        - "Thymus"
+        - "Thyroid gland"
+        - "Tibia"
+        - "Tongue, NOS"
+        - "Tonsil, NOS"
+        - "Tonsillar fossa"
+        - "Tonsillar pillar"
+        - "Trachea"
+        - "Transverse colon"
+        - "Trigone of bladder"
+        - "Undescended testis"
+        - "Unknown"
+        - "Unknown primary site"
+        - "Upper Gum"
+        - "Upper limb, NOS"
+        - "Upper lobe, lung"
+        - "Upper respiratory tract, NOS"
+        - "Upper third of esophagus"
+        - "Upper-inner quadrant of breast"
+        - "Upper-outer quadrant of breast"
+        - "Urachus"
+        - "Ureter"
+        - "Ureteric orifice"
+        - "Urethra"
+        - "Urinary system, NOS"
+        - "Uterine adnexa"
+        - "Uterus, NOS"
+        - "Uvula"
+        - "Vagina, NOS"
+        - "Vallecula"
+        - "Ventral surface of tongue, NOS"
+        - "Ventricle, NOS"
+        - "Vertebral column"
+        - "Vestibule of mouth"
+        - "Vulva, NOS"
+        - "Waldeyer ring"
     Req: true
     Strict: true
     Private: false
@@ -2030,17 +2044,19 @@ PropDefinitions:
       - Origin: caDSR
         Code: '2785839'
         Value: Specimen Histologic Grade Grading System Name Histologic Grade
-    Enum:
-      - "G1"
-      - "G2"
-      - "G3"
-      - "G4"
-      - "GB"
-      - "GX"
-      - "High Grade"
-      - "Intermediate Grade"
-      - "Low Grade"
-      - "Not Applicable"
+    Type:
+      value_type: list
+      Enum:
+        - "G1"
+        - "G2"
+        - "G3"
+        - "G4"
+        - "GB"
+        - "GX"
+        - "High Grade"
+        - "Intermediate Grade"
+        - "Low Grade"
+        - "Not Applicable"
     Req: false  # 02/22/2022 adeforge, not required? correct: 28feb22 pdunn
     Strict: true
     Private: false
@@ -2051,42 +2067,44 @@ PropDefinitions:
       - Origin: caDSR
         Code: '3440328'
         Value: Neoplasm American Joint Committee on Cancer Clinical Primary Tumor T Stage
-    Enum:
-      - "T0"
-      - "T1"
-      - "T1a"
-      - "T1a1"
-      - "T1a2"
-      - "T1b"
-      - "T1b1"
-      - "T1b2"
-      - "T1c"
-      - "T1mi"
-      - "T2"
-      - "T2a"
-      - "T2a1"
-      - "T2a2"
-      - "T2b"
-      - "T2c"
-      - "T2d"
-      - "T3"
-      - "T3a"
-      - "T3b"
-      - "T3c"
-      - "T3d"
-      - "T4"
-      - "T4a"
-      - "T4b"
-      - "T4c"
-      - "T4d"
-      - "T4e"
-      - "T5"
-      - "Ta"
-      - "Tis"
-      - "Tis (DCIS)"
-      - "Tis (LCIS)"
-      - "Tis (Paget's)"
-      - "TX"
+    Type:
+      value_type: list
+      Enum:
+        - "T0"
+        - "T1"
+        - "T1a"
+        - "T1a1"
+        - "T1a2"
+        - "T1b"
+        - "T1b1"
+        - "T1b2"
+        - "T1c"
+        - "T1mi"
+        - "T2"
+        - "T2a"
+        - "T2a1"
+        - "T2a2"
+        - "T2b"
+        - "T2c"
+        - "T2d"
+        - "T3"
+        - "T3a"
+        - "T3b"
+        - "T3c"
+        - "T3d"
+        - "T4"
+        - "T4a"
+        - "T4b"
+        - "T4c"
+        - "T4d"
+        - "T4e"
+        - "T5"
+        - "Ta"
+        - "Tis"
+        - "Tis (DCIS)"
+        - "Tis (LCIS)"
+        - "Tis (Paget's)"
+        - "TX"
     Req: false  # 02/22/2022 adeforge, not required? correct: 28feb22 pdunn
     Strict: true
     Private: false
@@ -2097,31 +2115,33 @@ PropDefinitions:
       - Origin: caDSR
         Code: '3440330'
         Value: Neoplasm American Joint Committee on Cancer Clinical Regional Lymph Node N Stage
-    Enum:
-      - "N0"
-      - "N0 (i-)"
-      - "N0 (i+)"
-      - "N0 (mol-)"
-      - "N0 (mol+)"
-      - "N1"
-      - "N1a"
-      - "N1b"
-      - "N1bI"
-      - "N1bII"
-      - "N1bIII"
-      - "N1bIV"
-      - "N1c"
-      - "N1mi"
-      - "N2"
-      - "N2a"
-      - "N2b"
-      - "N2c"
-      - "N3"
-      - "N3a"
-      - "N3b"
-      - "N3c"
-      - "N4"
-      - "NX"
+    Type:
+      value_type: list
+      Enum:
+        - "N0"
+        - "N0 (i-)"
+        - "N0 (i+)"
+        - "N0 (mol-)"
+        - "N0 (mol+)"
+        - "N1"
+        - "N1a"
+        - "N1b"
+        - "N1bI"
+        - "N1bII"
+        - "N1bIII"
+        - "N1bIV"
+        - "N1c"
+        - "N1mi"
+        - "N2"
+        - "N2a"
+        - "N2b"
+        - "N2c"
+        - "N3"
+        - "N3a"
+        - "N3b"
+        - "N3c"
+        - "N4"
+        - "NX"
     Req: false  # 02/22/2022 adeforge, not required? correct: 28feb22 pdunn
     Strict: true
     Private: false
@@ -2132,14 +2152,16 @@ PropDefinitions:
       - Origin: caDSR
         Code: '3440331'
         Value: Neoplasm American Joint Committee on Cancer Clinical Distant Metastasis M Stage
-    Enum:
-      - "cM0 (i+)"
-      - "M0"
-      - "M1"
-      - "M1a"
-      - "M1b"
-      - "M1c"
-      - "MX"
+    Type:
+      value_type: list
+      Enum:
+        - "cM0 (i+)"
+        - "M0"
+        - "M1"
+        - "M1a"
+        - "M1b"
+        - "M1c"
+        - "MX"
     Req: false  # 02/22/2022 adeforge, not required? correct: 28feb22 pdunn
     Strict: true
     Private: false
@@ -2151,16 +2173,18 @@ PropDefinitions:
       - Origin: caDSR
         Code: '12217251'
         Value: Disease Phase Timepoint Category
-    Enum:
-      - 'Initial Diagnosis'
-      - 'Disease Progression'
-      - 'Refractory'
-      - 'Recurrent Disease'
-      - 'Disease Relapse/Progression'
-      - 'Complete Remission'
-      - 'Post-treatment'
-      - 'Unknown'
-      - 'Not Reported'
+    Type:
+      value_type: list
+      Enum:
+        - 'Initial Diagnosis'
+        - 'Disease Progression'
+        - 'Refractory'
+        - 'Recurrent Disease'
+        - 'Disease Relapse/Progression'
+        - 'Complete Remission'
+        - 'Post-treatment'
+        - 'Unknown'
+        - 'Not Reported'
     Req: true
     Strict: true
     Private: false
@@ -2171,13 +2195,15 @@ PropDefinitions:
       - Origin: caDSR
         Code: '12922545'
         Value: Tumor Classification Type
-    Enum:
-      - 'Primary'
-      - 'Regional'
-      - 'Metastatic'
-      - 'Unknown'
-      - 'Not Reported'
-      - 'Not Applicable'
+    Type:
+      value_type: list
+      Enum:
+        - 'Primary'
+        - 'Regional'
+        - 'Metastatic'
+        - 'Unknown'
+        - 'Not Reported'
+        - 'Not Applicable'
     Req: true
     Strict: true
     Private: false
@@ -2201,15 +2227,17 @@ PropDefinitions:
       - Origin: caDSR
         Code: '5432687'
         Value: Tissue Sample Description Category
-    Enum:
-      - 'Abnormal'
-      - 'Non-neoplastic'
-      - 'Normal'
-      - 'Peritumoral'
-      - 'Tumor'
-      - 'Unavailable'
-      - 'Unknown'
-      - 'Unspecified'
+    Type:
+      value_type: list
+      Enum:
+        - 'Abnormal'
+        - 'Non-neoplastic'
+        - 'Normal'
+        - 'Peritumoral'
+        - 'Tumor'
+        - 'Unavailable'
+        - 'Unknown'
+        - 'Unspecified'
     Req: true
     Strict: true
     Private: false