Add fields to EventTracker