Added polygons/polylines, but not tested yet.