Updated for the arff only data format.