Improve data import scripts