Improved tracker handling