Segment marshaling modif