diff --git a/Samples/Sample XML/AssessmentRegistration.xml b/Samples/Sample XML/AssessmentRegistration.xml
index dc2daef..6f51c55 100644
--- a/Samples/Sample XML/AssessmentRegistration.xml
+++ b/Samples/Sample XML/AssessmentRegistration.xml
@@ -674,14 +674,14 @@
604827
-
+
255901001
- 2021-08-23
+ 2021-08-23
@@ -690,10 +690,24 @@
-
- 255901
-
+
+ 255901
+
+
+
+
+
+ 255901
+
+
+
+
+ 604827
+
+
+
+
uri://ed-fi.org/AccommodationDescriptor#Test administration accommodation
uri://ed-fi.org/PlatformTypeDescriptor#Computer-based
uri://ed-fi.org/GradeLevelDescriptor#Eleventh grade
@@ -758,6 +772,20 @@
255901
+
+
+
+
+ 255901
+
+
+
+
+ 604830
+
+
+
+
uri://ed-fi.org/AccommodationDescriptor#Test administration accommodation
uri://ed-fi.org/PlatformTypeDescriptor#Computer-based
uri://ed-fi.org/GradeLevelDescriptor#Eleventh grade
@@ -822,6 +850,20 @@
255901
+
+
+
+
+ 255901
+
+
+
+
+ 604886
+
+
+
+
uri://ed-fi.org/AccommodationDescriptor#Test administration accommodation
uri://ed-fi.org/PlatformTypeDescriptor#Computer-based
uri://ed-fi.org/GradeLevelDescriptor#Eleventh grade
@@ -886,6 +928,20 @@
255901
+
+
+
+
+ 255901
+
+
+
+
+ 604896
+
+
+
+
uri://ed-fi.org/AccommodationDescriptor#Test administration accommodation
uri://ed-fi.org/PlatformTypeDescriptor#Computer-based
uri://ed-fi.org/GradeLevelDescriptor#Eleventh grade
@@ -950,6 +1006,20 @@
255901
+
+
+
+
+ 255901
+
+
+
+
+ 604901
+
+
+
+
uri://ed-fi.org/AccommodationDescriptor#Test administration accommodation
uri://ed-fi.org/PlatformTypeDescriptor#Computer-based
uri://ed-fi.org/GradeLevelDescriptor#Eleventh grade
@@ -1014,6 +1084,20 @@
255901
+
+
+
+
+ 255901
+
+
+
+
+ 604924
+
+
+
+
uri://ed-fi.org/AccommodationDescriptor#Test administration accommodation
uri://ed-fi.org/PlatformTypeDescriptor#Computer-based
uri://ed-fi.org/GradeLevelDescriptor#Eleventh grade
@@ -1078,6 +1162,20 @@
255901
+
+
+
+
+ 255901
+
+
+
+
+ 604957
+
+
+
+
uri://ed-fi.org/AccommodationDescriptor#Test administration accommodation
uri://ed-fi.org/PlatformTypeDescriptor#Computer-based
uri://ed-fi.org/GradeLevelDescriptor#Eleventh grade
@@ -1142,6 +1240,20 @@
255901
+
+
+
+
+ 255901
+
+
+
+
+ 604962
+
+
+
+
uri://ed-fi.org/AccommodationDescriptor#Test administration accommodation
uri://ed-fi.org/PlatformTypeDescriptor#Computer-based
uri://ed-fi.org/GradeLevelDescriptor#Eleventh grade
@@ -1206,6 +1318,20 @@
255901
+
+
+
+
+ 255901
+
+
+
+
+ 604987
+
+
+
+
uri://ed-fi.org/AccommodationDescriptor#Test administration accommodation
uri://ed-fi.org/PlatformTypeDescriptor#Computer-based
uri://ed-fi.org/GradeLevelDescriptor#Eleventh grade
@@ -1270,6 +1396,20 @@
255901
+
+
+
+
+ 255901
+
+
+
+
+ 604992
+
+
+
+
uri://ed-fi.org/AccommodationDescriptor#Test administration accommodation
uri://ed-fi.org/PlatformTypeDescriptor#Computer-based
uri://ed-fi.org/GradeLevelDescriptor#Eleventh grade
@@ -1334,6 +1474,20 @@
255901
+
+
+
+
+ 255901
+
+
+
+
+ 605041
+
+
+
+
uri://ed-fi.org/AccommodationDescriptor#Test administration accommodation
uri://ed-fi.org/PlatformTypeDescriptor#Computer-based
uri://ed-fi.org/GradeLevelDescriptor#Eleventh grade
@@ -1398,6 +1552,20 @@
255901
+
+
+
+
+ 255901
+
+
+
+
+ 605062
+
+
+
+
uri://ed-fi.org/AccommodationDescriptor#Test administration accommodation
uri://ed-fi.org/PlatformTypeDescriptor#Computer-based
uri://ed-fi.org/GradeLevelDescriptor#Eleventh grade
@@ -1462,6 +1630,20 @@
255901
+
+
+
+
+ 255901
+
+
+
+
+ 605065
+
+
+
+
uri://ed-fi.org/AccommodationDescriptor#Test administration accommodation
uri://ed-fi.org/PlatformTypeDescriptor#Computer-based
uri://ed-fi.org/GradeLevelDescriptor#Eleventh grade
@@ -1526,6 +1708,20 @@
255901
+
+
+
+
+ 255901
+
+
+
+
+ 605083
+
+
+
+
uri://ed-fi.org/AccommodationDescriptor#Test administration accommodation
uri://ed-fi.org/PlatformTypeDescriptor#Computer-based
uri://ed-fi.org/GradeLevelDescriptor#Eleventh grade
@@ -1590,6 +1786,20 @@
255901
+
+
+
+
+ 255901
+
+
+
+
+ 605093
+
+
+
+
uri://ed-fi.org/AccommodationDescriptor#Test administration accommodation
uri://ed-fi.org/PlatformTypeDescriptor#Computer-based
uri://ed-fi.org/GradeLevelDescriptor#Eleventh grade
@@ -1654,6 +1864,20 @@
255901
+
+
+
+
+ 255901
+
+
+
+
+ 605115
+
+
+
+
uri://ed-fi.org/AccommodationDescriptor#Test administration accommodation
uri://ed-fi.org/PlatformTypeDescriptor#Computer-based
uri://ed-fi.org/GradeLevelDescriptor#Eleventh grade
@@ -1718,6 +1942,20 @@
255901
+
+
+
+
+ 255901
+
+
+
+
+ 605139
+
+
+
+
uri://ed-fi.org/AccommodationDescriptor#Test administration accommodation
uri://ed-fi.org/PlatformTypeDescriptor#Computer-based
uri://ed-fi.org/GradeLevelDescriptor#Eleventh grade
@@ -1782,6 +2020,20 @@
255901
+
+
+
+
+ 255901
+
+
+
+
+ 605146
+
+
+
+
uri://ed-fi.org/AccommodationDescriptor#Test administration accommodation
uri://ed-fi.org/PlatformTypeDescriptor#Computer-based
uri://ed-fi.org/GradeLevelDescriptor#Eleventh grade
@@ -1846,6 +2098,20 @@
255901
+
+
+
+
+ 255901
+
+
+
+
+ 605188
+
+
+
+
uri://ed-fi.org/AccommodationDescriptor#Test administration accommodation
uri://ed-fi.org/PlatformTypeDescriptor#Computer-based
uri://ed-fi.org/GradeLevelDescriptor#Eleventh grade
@@ -1910,6 +2176,20 @@
255901
+
+
+
+
+ 255901
+
+
+
+
+ 605187
+
+
+
+
uri://ed-fi.org/AccommodationDescriptor#Test administration accommodation
uri://ed-fi.org/PlatformTypeDescriptor#Computer-based
uri://ed-fi.org/GradeLevelDescriptor#Eleventh grade
@@ -1974,6 +2254,20 @@
255901
+
+
+
+
+ 255901
+
+
+
+
+ 605225
+
+
+
+
uri://ed-fi.org/AccommodationDescriptor#Test administration accommodation
uri://ed-fi.org/PlatformTypeDescriptor#Computer-based
uri://ed-fi.org/GradeLevelDescriptor#Eleventh grade
@@ -2038,6 +2332,20 @@
255901
+
+
+
+
+ 255901
+
+
+
+
+ 605245
+
+
+
+
uri://ed-fi.org/AccommodationDescriptor#Test administration accommodation
uri://ed-fi.org/PlatformTypeDescriptor#Computer-based
uri://ed-fi.org/GradeLevelDescriptor#Eleventh grade
@@ -2102,6 +2410,20 @@
255901
+
+
+
+
+ 255901
+
+
+
+
+ 605248
+
+
+
+
uri://ed-fi.org/AccommodationDescriptor#Test administration accommodation
uri://ed-fi.org/PlatformTypeDescriptor#Computer-based
uri://ed-fi.org/GradeLevelDescriptor#Eleventh grade
@@ -2166,6 +2488,20 @@
255901
+
+
+
+
+ 255901
+
+
+
+
+ 605253
+
+
+
+
uri://ed-fi.org/AccommodationDescriptor#Test administration accommodation
uri://ed-fi.org/PlatformTypeDescriptor#Computer-based
uri://ed-fi.org/GradeLevelDescriptor#Eleventh grade
@@ -2230,6 +2566,20 @@
255901
+
+
+
+
+ 255901
+
+
+
+
+ 605259
+
+
+
+
uri://ed-fi.org/AccommodationDescriptor#Test administration accommodation
uri://ed-fi.org/PlatformTypeDescriptor#Computer-based
uri://ed-fi.org/GradeLevelDescriptor#Eleventh grade
@@ -2294,6 +2644,20 @@
255901
+
+
+
+
+ 255901
+
+
+
+
+ 605266
+
+
+
+
uri://ed-fi.org/AccommodationDescriptor#Test administration accommodation
uri://ed-fi.org/PlatformTypeDescriptor#Computer-based
uri://ed-fi.org/GradeLevelDescriptor#Eleventh grade
@@ -2358,6 +2722,20 @@
255901
+
+
+
+
+ 255901
+
+
+
+
+ 605273
+
+
+
+
uri://ed-fi.org/AccommodationDescriptor#Test administration accommodation
uri://ed-fi.org/PlatformTypeDescriptor#Computer-based
uri://ed-fi.org/GradeLevelDescriptor#Eleventh grade
@@ -2422,6 +2800,20 @@
255901
+
+
+
+
+ 255901
+
+
+
+
+ 605302
+
+
+
+
uri://ed-fi.org/AccommodationDescriptor#Test administration accommodation
uri://ed-fi.org/PlatformTypeDescriptor#Computer-based
uri://ed-fi.org/GradeLevelDescriptor#Eleventh grade
@@ -2486,6 +2878,20 @@
255901
+
+
+
+
+ 255901
+
+
+
+
+ 605308
+
+
+
+
uri://ed-fi.org/AccommodationDescriptor#Test administration accommodation
uri://ed-fi.org/PlatformTypeDescriptor#Computer-based
uri://ed-fi.org/GradeLevelDescriptor#Eleventh grade
@@ -2550,6 +2956,20 @@
255901
+
+
+
+
+ 255901
+
+
+
+
+ 605313
+
+
+
+
uri://ed-fi.org/AccommodationDescriptor#Test administration accommodation
uri://ed-fi.org/PlatformTypeDescriptor#Computer-based
uri://ed-fi.org/GradeLevelDescriptor#Eleventh grade
@@ -2614,6 +3034,20 @@
255901
+
+
+
+
+ 255901
+
+
+
+
+ 605387
+
+
+
+
uri://ed-fi.org/AccommodationDescriptor#Test administration accommodation
uri://ed-fi.org/PlatformTypeDescriptor#Computer-based
uri://ed-fi.org/GradeLevelDescriptor#Eleventh grade
@@ -2678,6 +3112,20 @@
255901
+
+
+
+
+ 255901
+
+
+
+
+ 605401
+
+
+
+
uri://ed-fi.org/AccommodationDescriptor#Test administration accommodation
uri://ed-fi.org/PlatformTypeDescriptor#Computer-based
uri://ed-fi.org/GradeLevelDescriptor#Eleventh grade
@@ -2742,6 +3190,20 @@
255901
+
+
+
+
+ 255901
+
+
+
+
+ 605417
+
+
+
+
uri://ed-fi.org/AccommodationDescriptor#Test administration accommodation
uri://ed-fi.org/PlatformTypeDescriptor#Computer-based
uri://ed-fi.org/GradeLevelDescriptor#Eleventh grade
@@ -2806,6 +3268,20 @@
255901
+
+
+
+
+ 255901
+
+
+
+
+ 605422
+
+
+
+
uri://ed-fi.org/AccommodationDescriptor#Test administration accommodation
uri://ed-fi.org/PlatformTypeDescriptor#Computer-based
uri://ed-fi.org/GradeLevelDescriptor#Eleventh grade
@@ -2870,6 +3346,20 @@
255901
+
+
+
+
+ 255901
+
+
+
+
+ 605435
+
+
+
+
uri://ed-fi.org/AccommodationDescriptor#Test administration accommodation
uri://ed-fi.org/PlatformTypeDescriptor#Computer-based
uri://ed-fi.org/GradeLevelDescriptor#Eleventh grade
@@ -2934,6 +3424,20 @@
255901
+
+
+
+
+ 255901
+
+
+
+
+ 605457
+
+
+
+
uri://ed-fi.org/AccommodationDescriptor#Test administration accommodation
uri://ed-fi.org/PlatformTypeDescriptor#Computer-based
uri://ed-fi.org/GradeLevelDescriptor#Eleventh grade
@@ -2998,6 +3502,20 @@
255901
+
+
+
+
+ 255901
+
+
+
+
+ 605470
+
+
+
+
uri://ed-fi.org/AccommodationDescriptor#Test administration accommodation
uri://ed-fi.org/PlatformTypeDescriptor#Computer-based
uri://ed-fi.org/GradeLevelDescriptor#Eleventh grade
@@ -3062,6 +3580,20 @@
255901
+
+
+
+
+ 255901
+
+
+
+
+ 605511
+
+
+
+
uri://ed-fi.org/AccommodationDescriptor#Test administration accommodation
uri://ed-fi.org/PlatformTypeDescriptor#Computer-based
uri://ed-fi.org/GradeLevelDescriptor#Eleventh grade
@@ -3126,6 +3658,20 @@
255901
+
+
+
+
+ 255901
+
+
+
+
+ 605531
+
+
+
+
uri://ed-fi.org/AccommodationDescriptor#Test administration accommodation
uri://ed-fi.org/PlatformTypeDescriptor#Computer-based
uri://ed-fi.org/GradeLevelDescriptor#Eleventh grade
@@ -3190,6 +3736,20 @@
255901
+
+
+
+
+ 255901
+
+
+
+
+ 605549
+
+
+
+
uri://ed-fi.org/AccommodationDescriptor#Test administration accommodation
uri://ed-fi.org/PlatformTypeDescriptor#Computer-based
uri://ed-fi.org/GradeLevelDescriptor#Eleventh grade
diff --git a/Schemas/Bulk/Ed-Fi-Core.xsd b/Schemas/Bulk/Ed-Fi-Core.xsd
index 5520074..c51ebf7 100644
--- a/Schemas/Bulk/Ed-Fi-Core.xsd
+++ b/Schemas/Bulk/Ed-Fi-Core.xsd
@@ -4808,9 +4808,9 @@
A reference to the education organization which should receive the results of the assessment.
-
+
- A reference to the accommodations expected for administering the assessment.
+ A reference to the accommodations expected for administering the assessment. Student and education organization references must be consistent with StudentEducationOrganizationAssociation and StudentSchoolAssociation.