Move client API requests into dedicated service