Refactored EventReport