Added ability to find a client