Changed waypoints to type Waypoint