Switch to client factory