Fixed export schema issues