Modified import/export