More work on the async router pipeline