SegmentComponent classes improved