Improved Tracking data handling