Updated to addSwitch, addHost, and addLink