Import script improvements