[improvement] Added atomicity to imports (20m)