Minor issues in schemas wd32-wip2 if you're in the area:

EiClasses.xsd:
registeredParty is still a global element

EiEnrollment.xsd:

EnrollingEntityEnumeratedType - we got rid of "Enrolling" due to ambiguity. Suggest changing to "EnrolleeEnumeratedType"

entityID (of type Power::MridType) doesn't show in my model; I've added it. It's a local declaration in line 18 of EiEnrollment.xsd.