updated ClientSwitcherPlugin