Added better routers