Added checkpoints and version checks