Support new routing scheme.