Replacing all old API client calls.

Injected the new API client and replaced the calls.