Modified waivers_import and import_content