Add waypoint functionality to counters