Updated Geom Circle and Line implementation.