Updated switcher plugin