Updated Geometry Service