Goncalo/improvements/polylines