Tracking, matching table updated with iterators instead of IDs