Added ConnectionFactory on the client