Add ArrowTracker and VoidTracker