Move TrackItem to helper class