Moved requests back into APIClient