Add Automatic Checkpointing