Added EventRegistry for types where an event is called