Improve Tracker product management