More refactoring to reduce track data lookup