Change GenericEvent to Core definition