Added proxy
Switched to new routing service
Merge branch 'update_proxy' into develop