Event framework changes