Updated data imports, and enrollment scripts