Before adding event aggregation