Updated import/export