Add switch java & new db tunnels