Enhance tracking