Add switch_connect