Updated CDataArray2D to be generic