Fixed polyline and added Polygon