More work on import script