Putting CSW stuff in data flow