Working new implementation of data loader