improved data import structure