Added Line and Segment inner classes