Use a bit more optimized way of routing