Add Multipoint type, fix z/m type  detection