Routing arguments improvement