DataTrack class moved to separate file