Updated data_names and data_values