Added functionality for tracker.