Tracking functionality extended.