Added suppor for multiple tunnels