Added more possible parameters in the new routing.