added waypoint collection in data set