Updated the Client retrieval method.