Improve import, export and editor