Added ClientFactory