Updated CDataArray to generic