Use API instead of data_loader