improve Api client