Added client_service