Added track/segment tree