Improvement: map initial point is set dynamically