Added Ellipse and Poly4