Improved tracking & name resolution