TrackingHandler updated