More changes to the event system