Enhancing tracking functionality