More pre-processing for import data