Solved [FEATURE] Map Waypoint