Add support for multi-geometries