import script improvements