[WIP] Optimized bundle tracking