Support for arbitrary text waypoints