Add support for polygons