Add onEventFired callback; add descriptor matching to Event objects