Adding proxy service
Merge branch 'proxyService'