Better way to defer visit tracking