Refactor to use more Segment, less Data