Use new routing provider