Navigation App - Defining Waypoints

I have a long trip (1000 miles) planned and have planned an itinerary based on both Super and Rapid charger stops. Is there a way of entering waypoints other than only SuperCharger locations to cater for the (mercifully few) Rapid charging stops instead of having to navigate to the first Rapid and then, once arrived, start again to get to the next? Like TomTom's 'Avanced Planning' facility. I have pre-programmed each stop and destination as a Favourite. MW