Merge "Use enum class for EventEntry"