Adds preliminary support for VPN connectivity