Checkpoint: Introduce prepare and completion phase