I would suggest creating new tagging for non-circular objects (possible both a shape and appropriate dimension tags).