Rework map to make the point movable