Add EventType definition
Refactor to reference EventType and use HbxIdentifierGroup
Add EventType