Refactoring draft routes to flows