Added Circle, Polygon, and Rectangle shapes