Upgraded to ServiceRestClient approach