Adding track segment support.