Minor refactor
Checkpoint - load external data