Modifications to Import/Export methods