Better prefix handling, but now we have broken routes???