Some refactoring of Checkpoints