Optimized bundle tracking