Checkpoint: Added control flags