Switch: extend opt-in-switch