Add back Omniswitch