[FIX] Batch loading logic