Removed dependency in APIClient over APIQuery