Rearrange methods in data loader