improved import feature, fixed bug on data loading