[NTG-context] Adjust the tracking