Improved track fetching