Updates to the data import and processing