Added support for polygon/polyline