How about instead of Tunnel=yes/no, Tunnel=string, defaulting to null, so there could be multiple Tunnel types.
How about instead of Tunnel=yes/no, Tunnel=string, defaulting to null, so there could be multiple Tunnel types.