Add tracking data to HANDLERS