Enhance Segment class