Checkpoint: Added switch handling