Added VPN support