import/export and other enhance