Data import script improvements