Improvements to the BestValuesTracker