import / export have been improved