Import now handles corpus units properly