Adapt to the new table for event (removed eventId)