Add HbxEnrollmentType support