Refactored client to service requests