Improve the import format