Add better access to Waypoint data