Updated CWDataReader and CWDataWriter.