Changed how inject of custom RestClient is done