Improving Checkpoint system