Added ability to reuse client