Refactoring PDAPIClient