Improving the replicatingClient handling