Added Point and SegmentPoint