Add device loader to fix batchload race condition.