Updated data loader