[2/2] Added OmniSwitch