decoupling route verification, fixing service discovery