more updates for routing refactor