- Improve handling of prefixes during import and export