Add the right kind of client factory