Added OmniSwitch