Improved encapsulation of Line, Circle, and Polygon