add more suitable Client class