Refactored checkpoints