Added support for 3D spindle measurements and 2D cell measurements