Added support for polyline