Updated waypoints analytics method