Replace Client with our own