Add thread_segments as needed