Added circle and ellipse to Polygons.