Added Rect and Ellipse