Segment support & legacy migration

Is this needed?