Updated data loading code.