Further work on routing api update.