diff --git a/modules/classes/patient_and_specimen.yaml b/modules/classes/patient_and_specimen.yaml
index 64fc3c1..36ecfd6 100644
--- a/modules/classes/patient_and_specimen.yaml
+++ b/modules/classes/patient_and_specimen.yaml
@@ -1,5 +1,12 @@
 classes:
  
+  Patient:
+    annotations:
+      requiresComponent: ''
+      required: false
+    slots:
+    - Component
+
   CohortCoreTemplate:
     is_a: Patient
     annotations:
@@ -7,14 +14,15 @@ classes:
       required: false
     slots:
     - ParticipantID
+    - TimepointLabel
     - Age
     - Sex
-    - BMI
     - Race
     - Ethnicity
     - VitalStatus
     - Height
     - Weight
+    - BMI
     - Gravidity
     - Parity
     - AgeAtMenarche
@@ -29,21 +37,15 @@ classes:
     - PackYearsSmoked
     - AlcoholUse
     - NumberofDrinksPerWeek
+    - ContraceptiveUse
     - AntibioticUse
     - SampleCollectionCenter
     - SampleCollectionYear
     - ERStatus
     - PRStatus
     - HER2Status
+    - SurgeryReason
 
-  Patient:
-    annotations:
-      requiresComponent: ''
-      required: false
-    slots:
-    - Component
-    - ParticipantID
-    - TimepointLabel
 
   PatientExtended:
     is_a: Patient