added collectionContext param - waypoint requires the value as part of locating the waypoint.