Added --export_mode=match_and_parts