Major update of Track object