diff --git a/Samples/Sample XML/StudentDiscipline.xml b/Samples/Sample XML/StudentDiscipline.xml
index 467640d..bc44d10 100644
--- a/Samples/Sample XML/StudentDiscipline.xml	
+++ b/Samples/Sample XML/StudentDiscipline.xml	
@@ -788,6 +788,7 @@
 		<Behavior>uri://ed-fi.org/BehaviorDescriptor#State Offense</Behavior>
 		<BehaviorDetailedDescription>Robbery</BehaviorDetailedDescription>
 		<DisciplineIncidentParticipationCode>uri://ed-fi.org/DisciplineIncidentParticipationCodeDescriptor#Perpetrator</DisciplineIncidentParticipationCode>
+		<Weapon>uri://ed-fi.org/WeaponDescriptor#Knife</Weapon>
 	</StudentDisciplineIncidentBehaviorAssociation>
 	<StudentDisciplineIncidentBehaviorAssociation>
 		<StudentReference>
@@ -878,6 +879,7 @@
 		<DisciplineIncidentReference ref="DISC_19_255901001"/>
 		<Behavior>uri://ed-fi.org/BehaviorDescriptor#State Offense</Behavior>
 		<DisciplineIncidentParticipationCode>uri://ed-fi.org/DisciplineIncidentParticipationCodeDescriptor#Perpetrator</DisciplineIncidentParticipationCode>
+		<Weapon>uri://ed-fi.org/WeaponDescriptor#Club</Weapon>
 	</StudentDisciplineIncidentBehaviorAssociation>
 	<StudentDisciplineIncidentBehaviorAssociation>
 		<StudentReference>
@@ -888,6 +890,7 @@
 		<DisciplineIncidentReference ref="DISC_20_255901001"/>
 		<Behavior>uri://ed-fi.org/BehaviorDescriptor#State Offense</Behavior>
 		<DisciplineIncidentParticipationCode>uri://ed-fi.org/DisciplineIncidentParticipationCodeDescriptor#Perpetrator</DisciplineIncidentParticipationCode>
+		<Weapon>uri://ed-fi.org/WeaponDescriptor#Other</Weapon>
 	</StudentDisciplineIncidentBehaviorAssociation>
 	<StudentDisciplineIncidentBehaviorAssociation>
 		<StudentReference>
@@ -898,6 +901,7 @@
 		<DisciplineIncidentReference ref="DISC_21_255901001"/>
 		<Behavior>uri://ed-fi.org/BehaviorDescriptor#State Offense</Behavior>
 		<DisciplineIncidentParticipationCode>uri://ed-fi.org/DisciplineIncidentParticipationCodeDescriptor#Perpetrator</DisciplineIncidentParticipationCode>
+		<Weapon>uri://ed-fi.org/WeaponDescriptor#Knife</Weapon>
 	</StudentDisciplineIncidentBehaviorAssociation>
 	<StudentDisciplineIncidentBehaviorAssociation>
 		<StudentReference>
@@ -908,6 +912,7 @@
 		<DisciplineIncidentReference ref="DISC_8_255901001"/>
 		<Behavior>uri://ed-fi.org/BehaviorDescriptor#State Offense</Behavior>
 		<DisciplineIncidentParticipationCode>uri://ed-fi.org/DisciplineIncidentParticipationCodeDescriptor#Perpetrator</DisciplineIncidentParticipationCode>
+		<Weapon>uri://ed-fi.org/WeaponDescriptor#Other</Weapon>
 	</StudentDisciplineIncidentBehaviorAssociation>
 	<StudentDisciplineIncidentBehaviorAssociation>
 		<StudentReference>
@@ -918,6 +923,7 @@
 		<DisciplineIncidentReference ref="DISC_9_255901001"/>
 		<Behavior>uri://ed-fi.org/BehaviorDescriptor#State Offense</Behavior>
 		<DisciplineIncidentParticipationCode>uri://ed-fi.org/DisciplineIncidentParticipationCodeDescriptor#Perpetrator</DisciplineIncidentParticipationCode>
+		<Weapon>uri://ed-fi.org/WeaponDescriptor#Handgun</Weapon>
 	</StudentDisciplineIncidentBehaviorAssociation>
 	<StudentDisciplineIncidentBehaviorAssociation>
 		<StudentReference>
@@ -928,6 +934,7 @@
 		<DisciplineIncidentReference ref="DISC_3_255901044"/>
 		<Behavior>uri://ed-fi.org/BehaviorDescriptor#School Violation</Behavior>
 		<DisciplineIncidentParticipationCode>uri://ed-fi.org/DisciplineIncidentParticipationCodeDescriptor#Perpetrator</DisciplineIncidentParticipationCode>
+		<Weapon>uri://ed-fi.org/WeaponDescriptor#Knife</Weapon>
 	</StudentDisciplineIncidentBehaviorAssociation>
 	<StudentDisciplineIncidentBehaviorAssociation>
 		<StudentReference>
diff --git a/Schemas/Bulk/Ed-Fi-Core.xsd b/Schemas/Bulk/Ed-Fi-Core.xsd
index 1f3c893..5520074 100644
--- a/Schemas/Bulk/Ed-Fi-Core.xsd
+++ b/Schemas/Bulk/Ed-Fi-Core.xsd
@@ -8865,6 +8865,14 @@
               </xs:appinfo>
             </xs:annotation>
           </xs:element>
+          <xs:element name="Weapon" type="WeaponDescriptorReferenceType" minOccurs="0" maxOccurs="unbounded">
+            <xs:annotation>
+              <xs:documentation>Identifies the type(s) of weapon used by the student during a discipline incident. The Federal Gun-Free Schools Act requires states to report the number of students expelled for bringing firearms to school by type of firearm.</xs:documentation>
+              <xs:appinfo>
+                <ann:Descriptor>WeaponDescriptor</ann:Descriptor>
+              </xs:appinfo>
+            </xs:annotation>
+          </xs:element>
         </xs:sequence>
       </xs:extension>
     </xs:complexContent>