Add better support for polygons