Updated to use new routing service
Merge branch 'authenticated_routing'