#10321 Improve the map with the edges. Refactor using new points api entry