Added checkpoints and similar stuff