Indeed like @SchlesiM nicely explained above, when waypoint types are introduced, many workflows will be simplified, so we can review them after that feature is finished.