Updated data_path