add "change Switch" support