Import/Expord improvements

Import/Expord improvements