Refactors resourceClient. [f:15m]