Some changes in data paths for the experiments