Segment support & legacy migration

Should this method return an Optional<Segment> instead of a nullable value?