Change EventCategory from enum to class