[#81556658][#81558196] updated data, changed import script to match (kind of) new format, add additional fields