Updated plot methods for CircularAnnulus and EllipticalAnnulus