Adding switch analysis.