Add segment_id to all segment classes