Client & client route improvement