A few interface changes in the Event handler.