Added Tracking class