More work on data import script