Added support for multi-polygons