Refactor of DefaultAPIClient