Wrap injected logic into Client class