Refactored Event to use enum for EventType instead of hardcoded String