Update to handle datasets with the class variable in columns other than the last