It sounds as if we're missing a table which would takes care of this discrepancy between different types of events, so they can be treated equivalently from a higher level?