Made polygons wrapper aware