Fixed some lines that referred to dataset-specific columns, so that they now take column names from data_options argument