Initial support for polygons, circles and rectangles