Implicit integration now handles switches