Add switch and connection manager