Prepare the implementation of the new class based router that will come in 5.3.0