Updated import/export logic